| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | Merge branch 'refs/heads/timeline-local' into TimelineUber | Jonathan Duran | 2012-05-09 |
| |\ | |||
| | * | Timeline: Automatic scrolling during dragging of keyframes. | Jon Reid | 2012-05-08 |
| | | | |||
| | * | Timeline: Bug fix: Account for horizontal scroll when dragging keyframes. | Jon Reid | 2012-05-08 |
| | | | |||
| | * | Timeline: Update drag and drop handlers to be unique for drag and drop type. | Jon Reid | 2012-05-08 |
| | | | |||
| | * | Timeline: Move keyframe dragover and drop listeners to TimelinePanel for | Jon Reid | 2012-05-07 |
| | | | | | | | | | interaction improvements. | ||
| * | | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-05-09 |
| |\ \ | |/ |/| | | | | | | | | | Conflicts: js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| | * | Fixed a snapping issue on the mouse down in drawing tools. | hwc487 | 2012-05-08 |
| | | | |||
| | * | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-05-08 |
| | |\ | | | | | | | | | | Snapping | ||
| | | * | IKNINJA-1603 | Ananya Sen | 2012-05-08 |
| | | | | | | | | | | | | | | | | | | | Uncaught TypeError: Cannot read property 'documentRoot' of null js/components/layout/bread-crumb.reel/bread-crumb.js:26 Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| | | * | fixed javascript errors | Ananya Sen | 2012-05-07 |
| | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| | | * | removed incorrect id selector css for code view container since its breaking it. | Ananya Sen | 2012-05-07 |
| | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| | * | | fixes for 2D and 3D translation. | hwc487 | 2012-05-07 |
| | |/ | |||
| | * | 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> | ||
| | * | fixing the currentContainer | Valerio Virgillito | 2012-05-03 |
| | | | | | | | | | 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> | ||
| | | * | | | 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> | ||
| | | * | | | | 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> | ||
| | * | | | | | 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 |
| | |\ \ \ \ \ | | | |_|_|/ | | |/| | | | |||
| | * | | | | | 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> 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 Panel | Jose Antonio Marquez | 2012-05-03 |
| | | | | | | | | | |||
| | | * | | | | | | Changing ID to Montage-ID for Color Components | Jose Antonio Marquez | 2012-05-03 |
| | | | |_|_|/ / | | |/| | | | | |||
| | * | | | | | | Merge branch 'refs/heads/master' into data-id | Valerio Virgillito | 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> | ||
| * | | | | | | | Timeline: True drag-and-drop of keyframes | Jon Reid | 2012-05-04 |
| | | | | | | | | |||
| * | | | | | | | Timeline: Restore event handler for selectionChange. | Jon Reid | 2012-05-04 |
| | | | | | | | | |||
| * | | | | | | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local | Jon Reid | 2012-05-04 |
| |\ \ \ \ \ \ \ | |||
| | * | | | | | | | Timeline: More fixes to selection changing and document switching. | Jon Reid | 2012-05-04 |
| | | |_|_|/ / / | |/| | | | | | |||
| | * | | | | | | Code reformatting | Valerio Virgillito | 2012-05-03 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | | | | | Merge pull request #192 from ananyasen/Codeview-improvements | Valerio Virgillito | 2012-05-03 |
| | |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | submitting project : Code Editor Improvements [Phase 1] | ||
| | | * | | | | | using prototype in the serialization | 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-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-02 |
| | | |\ \ \ \ \ | | | | |_|/ / | | | |/| | | | |||
| | | * | | | | | removing format button for now until fully implemented | Ananya Sen | 2012-05-02 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| | | * | | | | | disable format button for now | Ananya Sen | 2012-05-01 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| | | * | | | | | Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvements | Ananya Sen | 2012-05-01 |
| | | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | | | |||