| Commit message (Collapse) | Author | Age | ||
|---|---|---|---|---|
| ... | ||||
| | * | | temporary commenting a timeline bug preventing nested selection | Valerio Virgillito | 2012-05-04 | |
| | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | |||
| | * | | Merge branch 'tag-2.0' of github.com:mencio/ninja-internal into data-id | Valerio Virgillito | 2012-05-03 | |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/components/tools-properties/tag-properties.reel/tag-properties.html Signed-off-by: Valerio Virgillito <valerio@motorola.com> | |||
| | | * \ | Merge branch 'refs/heads/master' into tag-2.0 | Valerio Virgillito | 2012-05-03 | |
| | | |\ \ | ||||
| | | * \ \ | Merge branch 'refs/heads/master' into tag-2.0 | Valerio Virgillito | 2012-05-03 | |
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/controllers/elements/element-controller.js Signed-off-by: Valerio Virgillito <valerio@motorola.com> | |||
| | | * | | | | Refactor creating elements. Removed makeNJElement and separated the model ↵ | Valerio Virgillito | 2012-05-03 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | creation Signed-off-by: Valerio Virgillito <valerio@motorola.com> | |||
| | | * | | | | code cleanup | Valerio Virgillito | 2012-05-02 | |
| | | | |_|/ | | |/| | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | |||
| | * | | | | Removing unused components references | Valerio Virgillito | 2012-05-03 | |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | |||
| | * | | | | Fixing the lock button css | Valerio Virgillito | 2012-05-03 | |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | |||
| | * | | | | finishing to replace all id with data-montage-id | Valerio Virgillito | 2012-05-03 | |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | |||
| | * | | | | Merge branch 'refs/heads/master' into data-id | Valerio Virgillito | 2012-05-03 | |
| | |\ \ \ \ | | | |_|/ | | |/| | | ||||
| | | * | | | Merge pull request #192 from ananyasen/Codeview-improvements | Valerio Virgillito | 2012-05-03 | |
| | | |\ \ \ | | | | | | | | | | | | | submitting project : Code Editor Improvements [Phase 1] | |||
| | | | * \ \ | Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvements | Ananya Sen | 2012-05-03 | |
| | | | |\ \ \ | | | | | |/ | | | | |/| | ||||
| | | | * | | | Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvements | Ananya Sen | 2012-05-01 | |
| | | | |\ \ \ | | | | | |/ | | | | |/| | ||||
| | | | * | | | Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvements | Ananya Sen | 2012-04-26 | |
| | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/controllers/document-controller.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | |||
| | | | * \ \ \ | Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvements | Ananya Sen | 2012-04-23 | |
| | | | |\ \ \ \ | ||||
| | | | * | | | | | - collapse panels for code view, restore for design view | Ananya Sen | 2012-04-18 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - apply theme selection to all code view documents Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | |||
| | * | | | | | | | Merge branch 'refs/heads/master' into data-id | Valerio Virgillito | 2012-05-03 | |
| | |\| | | | | | | ||||
| | | * | | | | | | Merge pull request #191 from imix23ways/TimelineUber | Valerio Virgillito | 2012-05-03 | |
| | | |\ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | | | Timeline uber | |||
| | | | * | | | | | Timeline: bug fix: disable bread crumb setlevel. | Jon Reid | 2012-04-30 | |
| | | | | | | | | | ||||
| | | | * | | | | | Timeline: Change serialization parameters for some component properties. | Jon Reid | 2012-04-30 | |
| | | | | | | | | | ||||
| | | | * | | | | | Timeline: Replace id with data-montage-id in all reels. | Jon Reid | 2012-04-27 | |
| | | | | |_|_|/ | | | |/| | | | ||||
| | | * / | | | | Dom Manipulation | Kruti Shah | 2012-05-03 | |
| | | |/ / / / | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> | |||
| | * | | | | | Merge branch 'Color' of https://github.com/joseeight/ninja-internal into data-id | Valerio Virgillito | 2012-05-03 | |
| | |\ \ \ \ \ | ||||
| | | * | | | | | Changing ID to Montage-ID for Color Panel | Jose Antonio Marquez | 2012-05-03 | |
| | | |/ / / / | ||||
| | * / / / / | Updating id to data-montage-id (and associated CSS, if necessary) in some of ↵ | Nivesh Rajbhandari | 2012-04-30 | |
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | our custom ui controls (such as hottest, slider, etc.), materials panels and three-d section of the PI. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | |||
| * | | | | | Computed Style Panel - Add data-montage ids | Eric Guzman | 2012-05-10 | |
| | | | | | | ||||
| * | | | | | Style Declaration - Improved updating of styles using binding. | Eric Guzman | 2012-05-10 | |
| | | | | | | ||||
| * | | | | | CSS Panel - Rule List refactor | Eric Guzman | 2012-05-10 | |
| | | | | | | | | | | | | | | | | | | | | | Improved adding, updating, and sorting of rules in rule list. | |||
| * | | | | | CSS Panel - Added update of new rules to rule list | Eric Guzman | 2012-05-08 | |
| | | | | | | ||||
| * | | | | | CSS Panel - Create non-tree declaration (optimized). And add updating ↵ | Eric Guzman | 2012-05-08 | |
| | | | | | | | | | | | | | | | | | | | | | functionality. | |||
| * | | | | | Style sheets - Added default stylesheet selection | Eric Guzman | 2012-05-08 | |
| | | | | | | ||||
| * | | | | | Style sheets - Add sheet action | Eric Guzman | 2012-05-07 | |
| | | | | | | ||||
| * | | | | | CSS Panel - Add labels for selection and document names | Eric Guzman | 2012-05-03 | |
| | | | | | | ||||
| * | | | | | Styles delegate - Clean up | Eric Guzman | 2012-05-03 | |
| | | | | | | ||||
| * | | | | | Style sheets - Add stub for add stylesheet button | Eric Guzman | 2012-05-03 | |
| | | | | | | ||||
| * | | | | | CSS Panel - Support showing computed styles | Eric Guzman | 2012-05-03 | |
| | | | | | | ||||
| * | | | | | CSS Panel - Fix issue with wrong style value when re-enabling style. | Eric Guzman | 2012-05-02 | |
| | | | | | | ||||
| * | | | | | CSS Panel - Added element highlight on selector field hover | Eric Guzman | 2012-05-02 | |
| | | | | | | ||||
| * | | | | | CSS Panel - Add focus management to styles view delegate | Eric Guzman | 2012-05-02 | |
| | | | | | | ||||
| * | | | | | CSS Panel - Modify pseudo class on getMatchedCSSRules | Eric Guzman | 2012-05-01 | |
| | | | | | | ||||
| * | | | | | CSS Panel - Inline style editing | Eric Guzman | 2012-05-01 | |
| | | | | | | ||||
| * | | | | | CSS Panel - Added code hinting and tooltips | Eric Guzman | 2012-05-01 | |
| | | | | | | ||||
| * | | | | | CSS Panel - Display no styles when deselecting all | Eric Guzman | 2012-05-01 | |
| | | | | | | ||||
| * | | | | | CSS Panel - Added removing of rules/styles | Eric Guzman | 2012-05-01 | |
| | | | | | | ||||
| * | | | | | Merge branch 'refs/heads/master' into CSSPanelUpdates | Eric Guzman | 2012-04-30 | |
| |\| | | | | ||||
| | * | | | | Merge cleanup | Valerio Virgillito | 2012-04-27 | |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | |||
| | * | | | | Merge branch 'refs/heads/serialization' | Valerio Virgillito | 2012-04-27 | |
| | |\ \ \ \ | ||||
| | | * \ \ \ | Merge branch 'stage-document-architecture' of ↵ | Valerio Virgillito | 2012-04-26 | |
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | https://github.com/mencio/ninja-internal into serialization | |||
| | | | * \ \ \ | Merge branch 'refs/heads/master' into stage-document-architecture | Valerio Virgillito | 2012-04-26 | |
| | | | |\ \ \ \ | ||||
| | | | * \ \ \ \ | Merge branch 'refs/heads/master' into stage-document-architecture | Valerio Virgillito | 2012-04-26 | |
| | | | |\ \ \ \ \ | | | | | |_|_|/ | | | | |/| | | | ||||