| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | Merge branch 'refs/heads/master' into CSSPanelUpdates | Eric Guzman | 2012-05-17 |
| |\ | |||
| | * | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | John Mayhew | 2012-05-15 |
| | |\ | | | | | | | | | | WorkingBranch | ||
| | | * | Removing obsolete treeList reference in preset templates. | Nivesh Rajbhandari | 2012-05-11 |
| | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | | * | Removing outdated tree-controller. | Nivesh Rajbhandari | 2012-05-11 |
| | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | | fixed bug introduced when we removed the color toolbar. The styling of the ↵ | John Mayhew | 2012-05-11 |
| | | | | | | | | | | | | | color chips in the PI was broken due to a reliance on a css class from the colortoolbar reel. The requried class was copied to the properties.css file as a temporary fix. | ||
| | * | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | John Mayhew | 2012-05-07 |
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WorkingBranch Conflicts: js/components/layout/tools-list.reel/tools-list.html js/components/layout/tools-properties.reel/tools-properties.html js/components/tools-properties/brush-properties.reel/brush-properties.html js/components/tools-properties/fill-properties.reel/fill-properties.html js/components/tools-properties/pen-properties.reel/pen-properties.html js/components/tools-properties/pencil-properties.reel/pencil-properties.html js/components/tools-properties/selection-properties.reel/selection-properties.html js/components/tools-properties/shape-properties.reel/shape-properties.html js/components/tools-properties/tag-properties.reel/tag-properties.html js/components/tools-properties/text-properties.reel/text-properties.html | ||
| | * | | More implementation of moving color chips to the individual subtools. | John Mayhew | 2012-05-07 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed the tool color bar Added new icons for inkbottle Removed Pencil tool Removed Inkbottle tool Added chips to the pen, brush and tag tools Aligned controls in several subtools | ||
| | * | | First round of moving color chips into the sub tools. Shape and Pen tool now ↵ | John Mayhew | 2012-05-03 |
| | | | | | | | | | | | | | have chips in the sub tool bar. Still need to complete adding chips to the Brush tool and finalizing the subtool bar layout to our spec for all of the subtools. | ||
| * | | | CSS Panel - delcaration - remove auto sort | Eric Guzman | 2012-05-17 |
| | | | | |||
| * | | | CSS Panel - declaration - sort objects when flag is set | Eric Guzman | 2012-05-17 |
| | | | | |||
| * | | | Style sheets view - Remove duplicate property definition | Eric Guzman | 2012-05-17 |
| | | | | |||
| * | | | CSS Panel - Clear styles section on document close | Eric Guzman | 2012-05-17 |
| | | | | |||
| * | | | CSS Panel - comment out paste handler for now | Eric Guzman | 2012-05-17 |
| | | | | |||
| * | | | CSS Panel - remove duplicate entry in completion map | Eric Guzman | 2012-05-17 |
| | | | | |||
| * | | | Style Declaration - fix property name in addStyle() | Eric Guzman | 2012-05-16 |
| | | | | |||
| * | | | CSS Panel - Style sheets dirty flag added | Eric Guzman | 2012-05-16 |
| | | | | |||
| * | | | CSS Panel - Fix toggling style on/off. | Eric Guzman | 2012-05-16 |
| | | | | |||
| * | | | CSS Panel - Added flag to draw method to improve perceived loading time | Eric Guzman | 2012-05-16 |
| | | | | |||
| * | | | CSS Panel - Fix issue with adding new style and activating property field | Eric Guzman | 2012-05-16 |
| | | | | |||
| * | | | Style Declaration - Fix update/add/addNew methods | Eric Guzman | 2012-05-16 |
| | | | | |||
| * | | | CSSPanel - Add mutli-selection and adding classes to groups of elements | Eric Guzman | 2012-05-14 |
| | | | | |||
| * | | | CSS Panel - Fixed removing rules and checking to see if rules apply on add. | Eric Guzman | 2012-05-10 |
| | | | | |||
| * | | | CSS Panel - Add work-around for selection change event. | Eric Guzman | 2012-05-10 |
| | | | | |||
| * | | | CSS Panel - Rule list - remove old update code | Eric Guzman | 2012-05-10 |
| | | | | |||
| * | | | CSS Panel - fix issue with hover/scroll to top | Eric Guzman | 2012-05-10 |
| | | | | |||
| * | | | CSS Panel - Fix errors from new Montage and remove logs. | Eric Guzman | 2012-05-10 |
| | | | | |||
| * | | | Merge branch 'refs/heads/master' into CSSPanelUpdates | Eric Guzman | 2012-05-10 |
| |\ \ \ | | |/ | |/| | | | | | | | Conflicts: js/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.html | ||
| | * | | Fixing the color popup | Valerio Virgillito | 2012-05-04 |
| | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | 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> | ||