| Commit message (Expand) | Author | Age | |
|---|---|---|---|
| * | Merge branch 'refs/heads/timeline-kruti-local' into TimelineUber | Jonathan Duran | 2012-04-12 |
| |\ | |||
| | * | Timeline:Changing function name | Kruti Shah | 2012-04-12 |
| * | | More Absolute vs Relative changes and cleanup | Jonathan Duran | 2012-04-11 |
| * | | Timeline: Bug fix: Drag and Drop now working again. | Jon Reid | 2012-04-10 |
| * | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local | Jon Reid | 2012-04-10 |
| |\ \ | |||
| | * | | Abs. vs. Rel. animation postion functions | Jonathan Duran | 2012-04-10 |
| | * | | Merge branch 'refs/heads/timeline-local' into TimelineUber | Jonathan Duran | 2012-04-10 |
| | |\ \ | |||
| | * \ \ | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-04-10 |
| | |\ \ \ | | |_|/ | |/| | | |||
| | | * | | Merge pull request #159 from mqg734/WebGLMaterials | Valerio Virgillito | 2012-04-09 |
| | | |\ \ | |||
| | | | * | | Undoing bad auto-merge resize-composer.js. | Nivesh Rajbhandari | 2012-04-05 |
| | | | * | | Undoing some minor spacing differences from auto-merge. | Nivesh Rajbhandari | 2012-04-05 |
| | | | * | | Undoing mistakes from auto-merge. | Nivesh Rajbhandari | 2012-04-05 |
| | | | * | | Merge branch 'refs/heads/ToolFixes' into WebGLMaterials | Nivesh Rajbhandari | 2012-04-04 |
| | | | |\ \ | |||
| | | | | * \ | Merge branch 'refs/heads/WebGLFileIO' into ToolFixes | Nivesh Rajbhandari | 2012-04-04 |
| | | | | |\ \ | |||
| | | | | | * \ | Merge branch 'refs/heads/EricSnapping' into WebGLFileIO | Nivesh Rajbhandari | 2012-04-04 |
| | | | | | |\ \ | |||
| | | | | | | * | | merge from main | hwc487 | 2012-03-29 |
| | | | | * | | | | Styling PI's Materials edit button. | Nivesh Rajbhandari | 2012-04-04 |
| | | | * | | | | | Merge branch 'refs/heads/ninja-internal' into WebGLMaterials | Nivesh Rajbhandari | 2012-03-27 |
| | | | |\ \ \ \ \ | |||
| | | | * | | | | | | Adding logic for flatten checkbox in PI. | Nivesh Rajbhandari | 2012-03-24 |
| | | | * | | | | | | Tweaking some styles in the materials popup. | Nivesh Rajbhandari | 2012-03-23 |
| | | | * | | | | | | IKNINJA-758 - The rotation value of the stage is not updated in the propertie... | Nivesh Rajbhandari | 2012-03-22 |
| * | | | | | | | | | Timeline: New files. | Jon Reid | 2012-04-10 |
| * | | | | | | | | | Timeline: New Features: Tag name now present in each layer. Configuration | Jon Reid | 2012-04-10 |
| | |_|_|_|_|_|_|/ |/| | | | | | | | |||
| * | | | | | | | | Timeline: Bug fix, IKNINJA 1467, "Timeline: Changing layer names should not | Jon Reid | 2012-04-09 |
| |/ / / / / / / | |||
| * | | | | | | | Timeline : Deleting of layers. And master duration track updating with deleti... | Kruti Shah | 2012-04-06 |
| * | | | | | | | 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 |
| | * | | | | | | | | 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 |
| |\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | / / / / / / | | |/ / / / / / | |/| | | | | | | |||
| | * | | | | | | | fixing the number fields to not have units. | Valerio Virgillito | 2012-04-04 |
| | * | | | | | | | Merge branch 'refs/heads/master' into components | Valerio Virgillito | 2012-04-04 |
| | |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | | | |||
| | * | | | | | | | completing the component simple pi | Valerio Virgillito | 2012-03-30 |
| | * | | | | | | | IKNINJA-1191 - Fixed the order of the components | Valerio Virgillito | 2012-03-30 |
| | * | | | | | | | Merge branch 'refs/heads/master' into components | Valerio Virgillito | 2012-03-28 |
| | |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | | | |||
| | * | | | | | | | Cleanup of the components panel | Valerio Virgillito | 2012-03-26 |
| | | |_|_|_|/ / | |/| | | | | | |||
| * | | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-04-05 |
| |\ \ \ \ \ \ \ | | |_|/ / / / | |/| | / / / | |_|_|/ / / |/| | | | | | |||
| | * | | | | | Merge pull request #149 from dhg637/BugFixes | Valerio Virgillito | 2012-04-04 |
| | |\ \ \ \ \ | |||
| | | * \ \ \ \ | Merge branch 'refs/heads/master' into BugFixes | Armen Kesablyan | 2012-04-04 |
| | | |\ \ \ \ \ | |||
| | | * | | | | | | Resizing Bugs | Armen Kesablyan | 2012-03-29 |
| | | * | | | | | | Bug #1073: Panels interact with hottest drag drop | Armen Kesablyan | 2012-03-28 |
| | | | |_|/ / / | | |/| | | | | |||
| | * | | | | | | Merge branch 'refs/heads/master' into PresetsPI | Eric Guzman | 2012-04-04 |
| | |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | |||
| | * | | | | | | Merge branch 'refs/heads/master' into PresetsPI | Eric Guzman | 2012-03-29 |
| | |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | |||
| | * | | | | | | Presets - Remove style transition when transition doesn't start. Also added t... | Eric Guzman | 2012-03-29 |
| * | | | | | | | Should not select any layer on element delete | Jonathan Duran | 2012-04-04 |
| * | | | | | | | Update timeline to work with new element removed event | Jonathan Duran | 2012-04-04 |
| * | | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-04-04 |
| |\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | |||
| | * | | | | | | Squashed commit of Preparing for the montage undo-manager: Architecture changes | Valerio Virgillito | 2012-04-04 |
| | | |_|_|_|/ | |/| | | | | |||