Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | 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 |
| |\ | |||
| * | | Nesting absolute element in the Tag tool. Refactoring element creation and ↵ | Valerio Virgillito | 2012-05-02 |
| | | | | | | | | | | | | | | | | | | element models 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> | ||
* | | | Removing more id and changing the appropriate CSS for them | 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 |
|\ \ \ | | |/ | |/| | |||
| * | | use data-montage-id instead of id in template | Ananya Sen | 2012-05-03 |
| | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| * | | 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 |
| |\ \ \ | |||
| * \ \ \ | Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvements | Ananya Sen | 2012-04-17 |
| |\ \ \ \ | |||
| * | | | | | - Decouple code editor from stage document switching logic | Ananya Sen | 2012-04-09 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - cleaning up Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
* | | | | | | use data-montage-id instead of id in template | Ananya Sen | 2012-05-03 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> Conflicts: js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.html Signed-off-by: Ananya Sen <Ananya.Sen@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 Components | Jose Antonio Marquez | 2012-05-03 |
| | |_|_|_|/ | |/| | | | | |||
* | | | | | | Merge pull request #183 from mqg734/data-id | Valerio Virgillito | 2012-04-30 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Updating id to data-montage-id. | ||
| * | | | | | | 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> | ||
* | | | | | | | fixing the menu and tool properties | Valerio Virgillito | 2012-04-30 |
|/ / / / / / | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* / / / / / | converting the layout folder to use data-montage-id | Valerio Virgillito | 2012-04-30 |
|/ / / / / | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* | | | | | 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 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 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-04-25 |
|\| | | | | | |||
| * | | | | | 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/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> | ||
| * | | | | | | 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 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | | | | | initial stage web template | Valerio Virgillito | 2012-04-18 |
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@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 |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | |||
| * | | | | | cleanup unused code. | Valerio Virgillito | 2012-04-19 |
| |/ / / / | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* | | | | | 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 |
|\ \ \ \ \ \ | |