aboutsummaryrefslogtreecommitdiff
path: root/js
Commit message (Collapse)AuthorAge
* Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-04-06
|\
| * Merge pull request #155 from ericguzman/PresetsPIValerio Virgillito2012-04-05
| |\ | | | | | | Presets controller - update for "_element" removal in selection objects
| | * 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 fil...
| | * | | - disable ok when text box is cleared using backspace and cross, for file ↵Ananya Sen2012-04-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | name and directory location, in New file and save as dialog Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | | | Merge pull request #153 from mencio/componentsValerio Virgillito2012-04-05
| |\ \ \ \ | | |/ / / | |/| | | Components panel cleanup and displaying only simple properties.
| | * | | fixing the number fields to not have units.Valerio Virgillito2012-04-04
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | 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
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | | IKNINJA-1191 - Fixed the order of the componentsValerio Virgillito2012-03-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Components now appear in alphabetical order. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | | | | Cleanup of the components panelValerio Virgillito2012-03-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Renamed to naming convention. Deleted un-used file. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | | | | | 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 do...
| | * | | | | | [CR] Keep Save related menu items always enabled, if there is an open documentAnanya Sen2012-04-04
| | | |_|_|/ / | | |/| | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵John Mayhew2012-04-04
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WorkingBranch Conflicts: js/lib/drawing/world.js
| | * | | | | Merge pull request #154 from mqg734/ToolFixesValerio Virgillito2012-04-04
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | Need to set elementModel.isIn2DSnapCache flag to false when removing element from SnapManager's cache.
| | | * | | | | Need to set elementModel.isIn2DSnapCache flag to false when removing element ↵Nivesh Rajbhandari2012-04-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | from SnapManager's cache. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | | | | | Merge pull request #149 from dhg637/BugFixesValerio Virgillito2012-04-04
| | |\ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | | Bug fixes
| | | * | | | | Merge branch 'refs/heads/master' into BugFixesArmen Kesablyan2012-04-04
| | | |\| | | |
| | | * | | | | Bug Fix: Height and width of panels not be keptArmen Kesablyan2012-03-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | | * | | | | Resizing BugsArmen Kesablyan2012-03-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | | * | | | | Bug #1073: Panels interact with hottest drag dropArmen Kesablyan2012-03-28
| | | | |_|/ / | | | |/| | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | * | | | | Merge branch 'refs/heads/master' into PresetsPIEric Guzman2012-04-04
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | | | | | | | | | | | | | | | | Conflicts: js/controllers/presets-controller.js
| | * | | | | 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 ↵Eric Guzman2012-03-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | temporary fix for aggregating animations (from timeline/presets)
| * | | | | | removed unnecessary call to exportMaterials from init(). this call should ↵John Mayhew2012-04-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | not have been there.
| * | | | | | Removed the dependence on an "assets" directory for the RDGE runtime. Now ↵John Mayhew2012-04-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Ninja does not need to create duplicate files when it sets up the users Ninja Projects directory for RDGE support.
| * | | | | | 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 ↵John Mayhew2012-04-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | version number
| * | | | | | fixed remaining namespace bugs ensuring the use of the RDGE namespace ↵John Mayhew2012-04-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | everywhere it is required
| * | | | | | removed unnecessary files from the RDGE build.John Mayhew2012-04-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added back the build batch and shell script files for building the compiled version of RDGE Corrected the build scripts to not include the precompiled.js file twice.
| * | | | | | Made use of semicolons consistent and updated new files to use the new RDGE ↵John Mayhew2012-04-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | namespace
| * | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵John Mayhew2012-04-02
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |