aboutsummaryrefslogtreecommitdiff
path: root/js
Commit message (Expand)AuthorAge
* Merge branch 'refs/heads/timeline-local' into TimelineUberJonathan Duran2012-04-06
|\
| * Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-localJon Reid2012-04-05
| |\
| * | Timeline: Improved drag-and-drop performance. Also fix problems withJon Reid2012-04-05
| * | Timeline: Bit of code cleanup in Layer.jsJon Reid2012-04-05
| * | Timeline: Bug fix: IKNINJA-1435Jon Reid2012-04-05
| * | Timeline: Bug fix for IKNINJA-1086, "CSS Style Suggestion stops working"Jon Reid2012-04-05
* | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-04-06
|\ \ \ | |_|/ |/| |
| * | Merge pull request #155 from ericguzman/PresetsPIValerio Virgillito2012-04-05
| |\ \
| | * \ Merge branch 'refs/heads/master' into PresetsPIEric Guzman2012-04-04
| | |\ \
| | * | | Presets Controller - Update to not use "_element" property of selection.Eric Guzman2012-04-04
| * | | | Merge pull request #158 from ananyasen/integration-candidateValerio Virgillito2012-04-05
| |\ \ \ \
| | * | | | - disable ok when text box is cleared using backspace and cross, for file nam...Ananya Sen2012-04-04
| * | | | | Merge pull request #153 from mencio/componentsValerio Virgillito2012-04-05
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | fixing the number fields to not have units.Valerio Virgillito2012-04-04
| | * | | | Merge branch 'refs/heads/master' into componentsValerio Virgillito2012-04-04
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'refs/heads/master' into componentsValerio Virgillito2012-04-04
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | |
| | * | | | | completing the component simple piValerio Virgillito2012-03-30
| | * | | | | IKNINJA-1191 - Fixed the order of the componentsValerio Virgillito2012-03-30
| | * | | | | Merge branch 'refs/heads/master' into componentsValerio Virgillito2012-03-30
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'refs/heads/master' into componentsValerio Virgillito2012-03-28
| | |\ \ \ \ \ \
| | * | | | | | | removed trace statementValerio Virgillito2012-03-27
| | * | | | | | | Cleanup of the components panelValerio Virgillito2012-03-26
* | | | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-04-05
|\| | | | | | | | | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Merge pull request #157 from ananyasen/ninja-internal-master-patch1Valerio Virgillito2012-04-04
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| | * | | | | | [CR] Keep Save related menu items always enabled, if there is an open documentAnanya Sen2012-04-04
| | | |_|_|/ / | | |/| | | |
| * | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Wor...John Mayhew2012-04-04
| |\| | | | |
| | * | | | | Merge pull request #154 from mqg734/ToolFixesValerio Virgillito2012-04-04
| | |\ \ \ \ \
| | | * | | | | Need to set elementModel.isIn2DSnapCache flag to false when removing element ...Nivesh Rajbhandari2012-04-04
| | * | | | | | Merge pull request #149 from dhg637/BugFixesValerio Virgillito2012-04-04
| | |\ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| | | * | | | | Merge branch 'refs/heads/master' into BugFixesArmen Kesablyan2012-04-04
| | | |\| | | |
| | | * | | | | Bug Fix: Height and width of panels not be keptArmen Kesablyan2012-03-29
| | | * | | | | Resizing BugsArmen Kesablyan2012-03-29
| | | * | | | | Bug #1073: Panels interact with hottest drag dropArmen Kesablyan2012-03-28
| | | | |_|/ / | | | |/| | |
| | * | | | | Merge branch 'refs/heads/master' into PresetsPIEric Guzman2012-04-04
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | |
| | * | | | | Animation Presets - Only combine animations if pre-existing animations existEric Guzman2012-04-02
| | * | | | | Presets Controller - Remove unused method callEric Guzman2012-03-30
| | * | | | | Merge branch 'refs/heads/master' into PresetsPIEric Guzman2012-03-29
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | |
| | * | | | | Presets - Remove style transition when transition doesn't start. Also added t...Eric Guzman2012-03-29
| * | | | | | removed unnecessary call to exportMaterials from init(). this call should not...John Mayhew2012-04-04
| * | | | | | Removed the dependence on an "assets" directory for the RDGE runtime. Now Nin...John Mayhew2012-04-03
| * | | | | | removed old unused import and export functions.John Mayhew2012-04-03
| * | | | | | Namespaced the canvas runtime file and updated all dependenciesJohn Mayhew2012-04-03
| * | | | | | updated the rdge compiled version and its runtime, incremented rdge library v...John Mayhew2012-04-03
| * | | | | | fixed remaining namespace bugs ensuring the use of the RDGE namespace everywh...John Mayhew2012-04-03
| * | | | | | removed unnecessary files from the RDGE build.John Mayhew2012-04-03
| * | | | | | Made use of semicolons consistent and updated new files to use the new RDGE n...John Mayhew2012-04-03
| * | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Wor...John Mayhew2012-04-02
| |\ \ \ \ \ \
| * | | | | | | Recompiled RDGE and put index.html back to loading the compiled version of RDGEJohn Mayhew2012-04-02
| * | | | | | | Fixed compiler warningsJohn Mayhew2012-04-02
| * | | | | | | -Namespaced all RDGE javascript.John Mayhew2012-04-02