Skip to content
This repository has been archived by the owner on Sep 6, 2021. It is now read-only.

FOR REVIEW: Update to jQuery 2.0.1, LESS 1.3.3 and Bootstrap 2.3.1 #4054

Merged
merged 37 commits into from
Jun 4, 2013
Merged

FOR REVIEW: Update to jQuery 2.0.1, LESS 1.3.3 and Bootstrap 2.3.1 #4054

merged 37 commits into from
Jun 4, 2013

Commits on May 26, 2013

  1. Updated bootstrap to 2.3.1 and less to 1.3.3 (needed for bootstrap)

    @WebsiteDeveloper
    WebsiteDeveloper committed May 26, 2013
    Configuration menu
    Copy the full SHA
    ff8d55c View commit details
    Browse the repository at this point in the history

  2. Fixed Context Menu

    @WebsiteDeveloper
    WebsiteDeveloper committed May 26, 2013
    Configuration menu
    Copy the full SHA
    54394b0 View commit details
    Browse the repository at this point in the history

  3. Three more migration fixes

    @WebsiteDeveloper
    WebsiteDeveloper committed May 26, 2013
    Configuration menu
    Copy the full SHA
    6c23c49 View commit details
    Browse the repository at this point in the history

  4. Fixed a few UI issues and removed unused responsive files

    @WebsiteDeveloper
    WebsiteDeveloper committed May 26, 2013
    Configuration menu
    Copy the full SHA
    de6c29d View commit details
    Browse the repository at this point in the history

  5. Fixed missed log statement

    @WebsiteDeveloper
    WebsiteDeveloper committed May 26, 2013
    Configuration menu
    Copy the full SHA
    b276e04 View commit details
    Browse the repository at this point in the history

  6. Fix scroller-shadow

    @WebsiteDeveloper
    WebsiteDeveloper committed May 26, 2013
    Configuration menu
    Copy the full SHA
    ceb6297 View commit details
    Browse the repository at this point in the history

  7. Fix install extensions unit tests

    @WebsiteDeveloper
    WebsiteDeveloper committed May 26, 2013
    Configuration menu
    Copy the full SHA
    c21ab02 View commit details
    Browse the repository at this point in the history

  8. Fixed find and JSLint UI

    @WebsiteDeveloper
    WebsiteDeveloper committed May 26, 2013
    Configuration menu
    Copy the full SHA
    b34eb06 View commit details
    Browse the repository at this point in the history

  9. Fixed modal layout issues

    @WebsiteDeveloper
    WebsiteDeveloper committed May 26, 2013
    Configuration menu
    Copy the full SHA
    ceca9bc View commit details
    Browse the repository at this point in the history

  10. Fix for menu positioning 

    explicitly set margin-top to 0
    @WebsiteDeveloper
    WebsiteDeveloper committed May 26, 2013
    Configuration menu
    Copy the full SHA
    ad63c37 View commit details
    Browse the repository at this point in the history

  11. Parsed LESS to CSS and load the css file 

    I added this because somehow the relative path of the WebPlatform logo
isn't found.
    @WebsiteDeveloper
    WebsiteDeveloper committed May 26, 2013
    Configuration menu
    Copy the full SHA
    c58b5e6 View commit details
    Browse the repository at this point in the history

  12. Moved dropdown menu styles to fix recent projects UI

    @WebsiteDeveloper
    WebsiteDeveloper committed May 26, 2013
    Configuration menu
    Copy the full SHA
    026f9dd View commit details
    Browse the repository at this point in the history

  13. Added data-button-id to the dialog templates

    @WebsiteDeveloper
    WebsiteDeveloper committed May 26, 2013
    Configuration menu
    Copy the full SHA
    9c6a57e View commit details
    Browse the repository at this point in the history

  14. Fixes for ContextMenus and Dialogs 

    + one UI fix
    @WebsiteDeveloper
    WebsiteDeveloper committed May 26, 2013
    Configuration menu
    Copy the full SHA
    43d5435 View commit details
    Browse the repository at this point in the history

Commits on May 30, 2013

  1. Merge branch 'WebsiteDeveloper-bootstrap' into jQueryLESSBootstrap 

    Conflicts:
	src/htmlContent/about-dialog.html
	src/htmlContent/project-settings-dialog.html
	src/htmlContent/update-dialog.html
	src/styles/brackets.less
    @dangoor
    dangoor committed May 30, 2013
    Configuration menu
    Copy the full SHA
    180ad2a View commit details
    Browse the repository at this point in the history

  2. Merge branch 'dangoor/jquery-deprecations' into jQueryLESSBootstrap

    @dangoor
    dangoor committed May 30, 2013
    Configuration menu
    Copy the full SHA
    93b629d View commit details
    Browse the repository at this point in the history

  3. Update to jQuery 2.0.1

    @dangoor
    dangoor committed May 30, 2013
    Configuration menu
    Copy the full SHA
    1978f85 View commit details
    Browse the repository at this point in the history

  4. Update to jQuery 2.0.1

    @dangoor
    dangoor committed May 30, 2013
    Configuration menu
    Copy the full SHA
    1cb9550 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'dangoor/jQuery-2.0' into jQueryLESSBootstrap

    @dangoor
    dangoor committed May 30, 2013
    Configuration menu
    Copy the full SHA
    d8b9421 View commit details
    Browse the repository at this point in the history

  6. switch from .andSelf to .addBack

    @dangoor
    dangoor committed May 30, 2013
    Configuration menu
    Copy the full SHA
    fd77d76 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'dangoor/jQuery-2.0' into jQueryLESSBootstrap 

    Conflicts:
	src/thirdparty/jstree_pre1.0_fix_1/jquery.jstree.js
    @dangoor
    dangoor committed May 30, 2013
    Configuration menu
    Copy the full SHA
    3da4dcb View commit details
    Browse the repository at this point in the history

  8. Fixes after review

    @WebsiteDeveloper
    WebsiteDeveloper committed May 30, 2013
    Configuration menu
    Copy the full SHA
    c04cf47 View commit details
    Browse the repository at this point in the history

Commits on May 31, 2013

  1. Merge branch 'WebsiteDeveloper-bootstrap' into jQueryLESSBootstrap

    @dangoor
    dangoor committed May 31, 2013
    Configuration menu
    Copy the full SHA
    ec69402 View commit details
    Browse the repository at this point in the history

  2. this line apparently had a bad merge

    @dangoor
    dangoor committed May 31, 2013
    Configuration menu
    Copy the full SHA
    2e777df View commit details
    Browse the repository at this point in the history

  3. Update twipsy-mod to use tooltip styles and work with jQuery 2.0

    @gruehle
    gruehle committed May 31, 2013
    Configuration menu
    Copy the full SHA
    72f652f View commit details
    Browse the repository at this point in the history

  4. Use .val() instead of .attr('value')

    @gruehle
    gruehle committed May 31, 2013
    Configuration menu
    Copy the full SHA
    6cc7b77 View commit details
    Browse the repository at this point in the history

  5. Fix most of the inline color editor unit tests. One is still failing.

    @gruehle
    gruehle committed May 31, 2013
    Configuration menu
    Copy the full SHA
    bb5a7f1 View commit details
    Browse the repository at this point in the history

Commits on Jun 2, 2013

  1. Merge with master

    @gruehle
    gruehle committed Jun 2, 2013
    Configuration menu
    Copy the full SHA
    79f799a View commit details
    Browse the repository at this point in the history

Commits on Jun 3, 2013

  1. Fix the extension manager tests. 

    Required an update to jQuery Mockjax 1.5.2, and quoting in a selector string used
in one of the tests.
    @dangoor
    dangoor committed Jun 3, 2013
    Configuration menu
    Copy the full SHA
    305a196 View commit details
    Browse the repository at this point in the history

  2. Fix deprecated isRejected() calls in UrlCodeHints.

    @dangoor
    dangoor committed Jun 3, 2013
    Configuration menu
    Copy the full SHA
    c1bdc00 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into jQueryLESSBootstrap

    @dangoor
    dangoor committed Jun 3, 2013
    Configuration menu
    Copy the full SHA
    30e3c12 View commit details
    Browse the repository at this point in the history

  4. Fix Inline Color Editor use of .attr vs. .val. 

    As documented in the [jQuery 1.9 upgrade guide](http://jquery.com/upgrade-guide/1.9/#attr-versus-prop-),
the recommended way to update input values is via .val() not .attr().
    @dangoor
    dangoor committed Jun 3, 2013
    Configuration menu
    Copy the full SHA
    435c3e9 View commit details
    Browse the repository at this point in the history

  5. Convert .attr to .prop for "disabled" (and one case of "val"). 

    Per the jQuery 1.9 upgrade guide.
    @dangoor
    dangoor committed Jun 3, 2013
    Configuration menu
    Copy the full SHA
    0f747ca View commit details
    Browse the repository at this point in the history

  6. Code cleanup

    @gruehle
    gruehle committed Jun 3, 2013
    Configuration menu
    Copy the full SHA
    81eff5f View commit details
    Browse the repository at this point in the history

Commits on Jun 4, 2013

  1. Remove data-dismiss

    @gruehle
    gruehle committed Jun 4, 2013
    Configuration menu
    Copy the full SHA
    d454d87 View commit details
    Browse the repository at this point in the history

  2. Remove redundant dropdown("toggle") calls

    @gruehle
    gruehle committed Jun 4, 2013
    Configuration menu
    Copy the full SHA
    c3acbd6 View commit details
    Browse the repository at this point in the history

  3. Use updated version of $.support.transition

    @gruehle
    gruehle committed Jun 4, 2013
    Configuration menu
    Copy the full SHA
    26e12d6 View commit details
    Browse the repository at this point in the history