| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | Merge branch 'refs/heads/timeline-local' into TimelineUber | Jonathan Duran | 2012-04-06 |
| |\ | |||
| | * | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local | Jon Reid | 2012-04-05 |
| | |\ | |||
| | * | | Timeline: Improved drag-and-drop performance. Also fix problems with | Jon Reid | 2012-04-05 |
| | | | | | | | | | | | | | expand/collapse getting out of synch during drag-and-drop. | ||
| | * | | Timeline: Bit of code cleanup in Layer.js | Jon Reid | 2012-04-05 |
| | | | | |||
| | * | | Timeline: Bug fix: IKNINJA-1435 | Jon Reid | 2012-04-05 |
| | | | | |||
| | * | | Timeline: Bug fix for IKNINJA-1086, "CSS Style Suggestion stops working" | Jon Reid | 2012-04-05 |
| | | | | |||
| * | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-04-06 |
| |\ \ \ | |_|/ |/| | | |||
| | * | | Merge pull request #155 from ericguzman/PresetsPI | Valerio Virgillito | 2012-04-05 |
| | |\ \ | | | | | | | | | Presets controller - update for "_element" removal in selection objects | ||
| | | * \ | Merge branch 'refs/heads/master' into PresetsPI | Eric Guzman | 2012-04-04 |
| | | |\ \ | |||
| | | * | | | Presets Controller - Update to not use "_element" property of selection. | Eric Guzman | 2012-04-04 |
| | | | | | | |||
| | * | | | | Merge pull request #158 from ananyasen/integration-candidate | Valerio Virgillito | 2012-04-05 |
| | |\ \ \ \ | | | | | | | | | | | | | - disable ok when text box is cleared using backspace and cross, for fil... | ||
| | | * | | | | - disable ok when text box is cleared using backspace and cross, for file ↵ | Ananya Sen | 2012-04-04 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | name and directory location, in New file and save as dialog Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| | * | | | | | Merge pull request #153 from mencio/components | Valerio Virgillito | 2012-04-05 |
| | |\ \ \ \ \ | | |/ / / / | |/| | | | | Components panel cleanup and displaying only simple properties. | ||
| | | * | | | | fixing the number fields to not have units. | Valerio Virgillito | 2012-04-04 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | * | | | | Merge branch 'refs/heads/master' into components | Valerio Virgillito | 2012-04-04 |
| | | |\ \ \ \ | |||
| | | * \ \ \ \ | Merge branch 'refs/heads/master' into components | Valerio Virgillito | 2012-04-04 |
| | | |\ \ \ \ \ | | | | |_|/ / | | | |/| | | | |||
| | | * | | | | | removing some of the button properties | Valerio Virgillito | 2012-03-30 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | * | | | | | Merge branch 'components' of github.com:mencio/ninja-internal into components | Valerio Virgillito | 2012-03-30 |
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: node_modules/components-data/toggle-button.json Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | | * | | | | | completing the component simple pi | Valerio Virgillito | 2012-03-30 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | * | | | | | | completing the component simple pi | Valerio Virgillito | 2012-03-30 |
| | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | * | | | | | IKNINJA-1191 - Fixed the order of the components | Valerio Virgillito | 2012-03-30 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Components now appear in alphabetical order. Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | * | | | | | Merge branch 'refs/heads/master' into components | Valerio Virgillito | 2012-03-30 |
| | | |\ \ \ \ \ | |||
| | | * \ \ \ \ \ | Merge branch 'refs/heads/master' into components | Valerio Virgillito | 2012-03-28 |
| | | |\ \ \ \ \ \ | |||
| | | * | | | | | | | Removing properties from Montage components | Valerio Virgillito | 2012-03-28 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Simplified properties for the following components: - anchor - button - checkbox - image - number imput Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | * | | | | | | | removed trace statement | Valerio Virgillito | 2012-03-27 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | * | | | | | | | Cleanup of the components panel | Valerio Virgillito | 2012-03-26 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Renamed to naming convention. Deleted un-used file. Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | | | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-04-05 |
| |\| | | | | | | | | |_|_|_|_|_|_|/ |/| | | | | | | | |||
| | * | | | | | | | Merge pull request #157 from ananyasen/ninja-internal-master-patch1 | Valerio Virgillito | 2012-04-04 |
| | |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | | [CR] Keep Save related menu items always enabled, if there is an open do... | ||
| | | * | | | | | | [CR] Keep Save related menu items always enabled, if there is an open document | Ananya Sen | 2012-04-04 |
| | | | |_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| | * | | | | | | Merge pull request #156 from mayhewinator/WorkingBranch | Valerio Virgillito | 2012-04-04 |
| | |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | Namespace and code cleanup for RDGE and related files | ||
| | | * | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | John Mayhew | 2012-04-04 |
| | | |\ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WorkingBranch Conflicts: js/lib/drawing/world.js | ||
| | * | | | | | | Merge pull request #154 from mqg734/ToolFixes | Valerio Virgillito | 2012-04-04 |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | Need to set elementModel.isIn2DSnapCache flag to false when removing element from SnapManager's cache. | ||
| | | * | | | | | | Need to set elementModel.isIn2DSnapCache flag to false when removing element ↵ | Nivesh Rajbhandari | 2012-04-04 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | from SnapManager's cache. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | | | | | | | Merge pull request #149 from dhg637/BugFixes | Valerio Virgillito | 2012-04-04 |
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Bug fixes | ||
| | | * | | | | | | | Merge branch 'refs/heads/master' into BugFixes | Armen Kesablyan | 2012-04-04 |
| | | |\| | | | | | | |||
| | | * | | | | | | | Bug #1060: Fixed CSS Lint issue | Armen Kesablyan | 2012-03-30 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| | | * | | | | | | | Bug Fix: Height and width of panels not be kept | Armen Kesablyan | 2012-03-29 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| | | * | | | | | | | Resizing Bugs | Armen Kesablyan | 2012-03-29 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| | | * | | | | | | | Bug #1073: Panels interact with hottest drag drop | Armen Kesablyan | 2012-03-28 |
| | | | |_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| | * | | | | | | | Merge pull request #150 from ericguzman/PresetsPI | Valerio Virgillito | 2012-04-04 |
| | |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | / | | | |_|_|_|/ | | |/| | | | | Presets - Fix a couple issues with presets | ||
| | | * | | | | | Merge branch 'refs/heads/master' into PresetsPI | Eric Guzman | 2012-04-04 |
| | | |\ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | Conflicts: js/controllers/presets-controller.js | ||
| | | * | | | | | Animation Presets - Only combine animations if pre-existing animations exist | Eric Guzman | 2012-04-02 |
| | | | | | | | | |||
| | | * | | | | | Presets Controller - Remove unused method call | Eric Guzman | 2012-03-30 |
| | | | | | | | | |||
| | | * | | | | | Merge branch 'refs/heads/master' into PresetsPI | Eric Guzman | 2012-03-29 |
| | | |\ | |||