Commit message (Expand) | 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 | |
| * | | | | | | | | | | | | | | | | | 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 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | 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 file nam... | Ananya Sen | 2012-04-04 | |
| | | |_|_|_|_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | | | | | ||||
| * | | | | | | | | | | | | | | | | Merge pull request #153 from mencio/components | Valerio Virgillito | 2012-04-05 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | ||||
| | * | | | | | | | | | | | | | | | 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 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|/ / / / / / | | | |/| | | | | | | | | | | | | | ||||
| | * | | | | | | | | | | | | | | | 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-30 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|/ / / / | | | |/| | | | | | | | | | | | | | ||||
| | * | | | | | | | | | | | | | | | Merge branch 'refs/heads/master' into components | Valerio Virgillito | 2012-03-28 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|/ / / / | | | |/| | | | | | | | | | | | | | ||||
| | * | | | | | | | | | | | | | | | removed trace statement | Valerio Virgillito | 2012-03-27 | |
| | * | | | | | | | | | | | | | | | 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 #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 document | Ananya Sen | 2012-04-04 | |
| | | |_|_|/ / / / / / / / / | | |/| | | | | | | | | | | | ||||
| * | | | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Wor... | John Mayhew | 2012-04-04 | |
| |\| | | | | | | | | | | | | ||||
| | * | | | | | | | | | | | | Merge pull request #154 from mqg734/ToolFixes | Valerio Virgillito | 2012-04-04 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | ||||
| | | * | | | | | | | | | | | | Need to set elementModel.isIn2DSnapCache flag to false when removing element ... | Nivesh Rajbhandari | 2012-04-04 | |
| | * | | | | | | | | | | | | | Merge pull request #149 from dhg637/BugFixes | Valerio Virgillito | 2012-04-04 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / / / / | | |/| | | | | | | | | | | | | ||||
| | | * | | | | | | | | | | | | Merge branch 'refs/heads/master' into BugFixes | Armen Kesablyan | 2012-04-04 | |
| | | |\| | | | | | | | | | | | ||||
| | | * | | | | | | | | | | | | Bug Fix: Height and width of panels not be kept | Armen Kesablyan | 2012-03-29 | |
| | | * | | | | | | | | | | | | 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 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / | | | |/| | | | | | | | | | | ||||
| | * | | | | | | | | | | | | 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 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / / / | | | |/| | | | | | | | | | | ||||
| | * | | | | | | | | | | | | Presets - Remove style transition when transition doesn't start. Also added t... | Eric Guzman | 2012-03-29 | |
| * | | | | | | | | | | | | | removed unnecessary call to exportMaterials from init(). this call should not... | John Mayhew | 2012-04-04 | |
| * | | | | | | | | | | | | |