| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | 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 | ||
| | | | * | Fixed the stage border and layout in the new template | Valerio Virgillito | 2012-04-26 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | * | | Removing all "module" declarations and replaced with "prototype" in ↵ | John Mayhew | 2012-04-26 |
| | | |/ | | | | | | | | | | preparation for montage converting to the new "prototype" format fully | ||
| | * | | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-04-26 |
| | |\| | |||
| | * | | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-04-25 |
| | |\ \ | |||
| | * \ \ | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-04-24 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/components/layout/bread-crumb.reel/bread-crumb.js Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| | * | | | | Breadcrumb Fix | Kruti Shah | 2012-04-20 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> | ||
| | * | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-04-20 |
| | |\ \ \ \ | |||
| | * | | | | | BreadCrumb Bug Fix | Kruti Shah | 2012-04-19 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> | ||
| | * | | | | | Timeline: Bug fix: problem with editing layers missing last letter in new | Jon Reid | 2012-04-13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | value. | ||
| | * | | | | | Merge branch 'refs/heads/timeline-local' into TimelineUber | Jonathan Duran | 2012-04-10 |
| | |\ \ \ \ \ | |||
| | | * | | | | | Timeline: Bug fix, IKNINJA 1467, "Timeline: Changing layer names should not | Jon Reid | 2012-04-09 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | require hitting "Return" key to commit the change" | ||
| | * | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-04-10 |
| | |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||
| | * | | | | | | 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-04 |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js js/tools/SelectionTool.js Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| | * \ \ \ \ \ \ | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-03-30 |
| | |\ \ \ \ \ \ \ | |||
| | * \ \ \ \ \ \ \ | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-03-29 |
| | |\ \ \ \ \ \ \ \ | |||
| | * | | | | | | | | | Timeline : Bug Fix : IKNINJA 1374 | Jonathan Duran | 2012-03-23 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| | * | | | | | | | | | Merge branch 'refs/heads/Timeline-local' into TimelineUber | Jonathan Duran | 2012-03-23 |
| | |\ \ \ \ \ \ \ \ \ | |||
| | | * | | | | | | | | | Timeline: Bug fix: style collapsers not staying in synch. Also, removed ↵ | Jon Reid | 2012-03-21 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | console.log calls in hintable component. | ||
| * | | | | | | | | | | | Tree Controller -Delegate getter/setter | Eric Guzman | 2012-04-30 |
| | | | | | | | | | | | | |||
| * | | | | | | | | | | | Editable - Add paste event handling/dispatching | Eric Guzman | 2012-04-30 |
| | | | | | | | | | | | | |||
| * | | | | | | | | | | | Merge branch 'refs/heads/master' into CSSPanelUpdates | Eric Guzman | 2012-04-26 |
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |||
| | * | | | | | | | | | | Merge pull request #175 from mqg734/BoundsCalculation | Valerio Virgillito | 2012-04-25 |
| | |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | Allow users to toggle application of stroke and border settings when using the ink bottle tool. Also, fixed translate tool's handles to draw without stage's zoom. | ||
| | | * | | | | | | | | | Merge branch 'refs/heads/ninja-internal' into AllFixes | Nivesh Rajbhandari | 2012-04-24 |
| | | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ | | | |/| | | | | | | | |||
| | | * | | | | | | | | | Allow users to toggle application of stroke and border settings when using ↵ | Nivesh Rajbhandari | 2012-04-24 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the ink bottle tool. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | | * | | | | | | | | | Fixing translate handles to draw without zoom value. Also fixed some typos ↵ | Nivesh Rajbhandari | 2012-04-20 |
| | | | |_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in zoom code. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | | | | | | | | | Merge branch 'master' into pentool | Pushkar Joshi | 2012-04-24 |
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | | | |||
| | * | | | | | | | | | Merge branch 'master' into pentool | Pushkar Joshi | 2012-04-17 |
| | |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/tools/PenTool.js | ||
| | * | | | | | | | | | Merge branch 'master' into pentool | Pushkar Joshi | 2012-04-04 |
| | |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/tools/PenTool.js | ||
| | * | | | | | | | | | Merge branch 'master' into pentool | Pushkar Joshi | 2012-04-03 |
| | |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ | | |/| | | | | | | | |||
| | * | | | | | | | | | render the pen path with local coordinates, but use stage world coordinates ↵ | Pushkar Joshi | 2012-04-02 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to position the canvas on which the path is rendered AND add data-montage- to the ids in the pen and brush reels AND fix a bug with pen stroke transparency not working | ||
| * | | | | | | | | | | Merge branch 'refs/heads/master' into CSSPanelUpdates | Eric Guzman | 2012-04-23 |
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | | | |||
| | * | | | | | | | | | Merge branch 'refs/heads/master' into stage-document-architecture | Valerio Virgillito | 2012-04-23 |
| | |\ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / | | |/| | | | | | | | |||
| | * | | | | | | | | | adjusting the bread crumb to work with the new template | Valerio Virgillito | 2012-04-23 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Initial container get setup in ninja now. Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | | | | | | | | reverting old template to current working status. New template work. | Valerio Virgillito | 2012-04-20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |||