aboutsummaryrefslogtreecommitdiff
path: root/js/ninja.reel/ninja.js
Commit message (Collapse)AuthorAge
* adjusting the bread crumb to work with the new templateValerio Virgillito2012-04-23
| | | | | | Initial container get setup in ninja now. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* reverting old template to current working status. New template work.Valerio Virgillito2012-04-20
| | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* Merge branch 'refs/heads/master' into BugFixesArmen Kesablyan2012-04-04
|\
| * Squashed commit of Preparing for the montage undo-manager: Architecture changesValerio Virgillito2012-04-04
| | | | | | | | | | | | | | | | | | Reworked the add and remove elements into 1 function which can take 1 or more elements. Removed the _element from the selection array Many other changes related to those 2 changes Undo/Redo shortcuts are now using montage undo/redo manager. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | 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>
* Merge pull request #139 from dhg637/ResizersRefactoringValerio Virgillito2012-03-28
|\ | | | | Resizers refactoring
| * minor glitch in calculations in snap codeArmen Kesablyan2012-03-23
| | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| * Resizers updatedArmen Kesablyan2012-03-23
| | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| * Updated Resizers for Panels and timelineArmen Kesablyan2012-03-22
| | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
* | Respect play/pause WebGL animation when saving files and re-rendering caused ↵Nivesh Rajbhandari2012-03-23
| | | | | | | | | | | | by geometry changes. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | Start WebGL animation during live preview. And set WebGL animation back to ↵Nivesh Rajbhandari2012-03-22
|/ | | | | | user preference when closing live preview. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* Merge dhg637 DisabledState into master.Valerio Virgillito2012-03-12
| | | | | | Committing Disabled states for tool-bar, tool-options, viewbar, breadcrumb Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* Committing Disabled states for tool-bar, tool-options, viewbar, breadcrumbArmen Kesablyan2012-03-12
| | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
* Squashed commit of preload-fix into MasterValerio Virgillito2012-03-06
| | | | | | | - Requiring all the previously pre-loaded files - RDGE, Codemirror and gl-matrix are not included via a script tag. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* user document main reel listener moved to the html-document class.Valerio Virgillito2012-02-21
| | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* Chrome PreviewJose Antonio Marquez2012-02-17
|
* Merge branch 'live-preview-fix' of https://github.com/mencio/ninja-internal ↵Valerio Virgillito2012-02-14
|\ | | | | | | into integration
| * Fixing the live preview background issue.Valerio Virgillito2012-02-14
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-09
|\| | | | | | | | | Conflicts: index.html
| * fixed error with initializing and accessing the ninja version object from ↵John Mayhew2012-02-09
| | | | | | | | the main reel
* | Removing reference to Ninja UtilsJose Antonio Marquez2012-02-02
| | | | | | | | This was removed, will need to check was it affects. Also added the removed checking script on Ninja didDraw to prompt user for cloud simulator.
* | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-02
|\| | | | | | | | | | | Conflicts: .gitignore js/ninja.reel/ninja.js
| * Revert "Adding njUtils as a component and adding it to the application object"Valerio Virgillito2012-02-02
| | | | | | | | | | | | This reverts commit f07bbfaa60c3fb7c2412c5aa97b49d114d6a88ea. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * Fixes for montage integrationValerio Virgillito2012-02-02
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * Adding njUtils as a component and adding it to the application objectValerio Virgillito2012-02-02
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * Adding the version to the main Ninja reel component.Valerio Virgillito2012-01-30
| | | | | | | | Signed-off-by: Valerio Virgillito <rmwh84@motorola.com>
| * Adding a version json object to NinjaValerio Virgillito2012-01-30
| | | | | | | | | | | | | | Versions object to start keeping track of versions for Ninja, Montage and eventually other dependencies. Loaded before montage to use in the splash screen. Signed-off-by: Valerio Virgillito <rmwh84@motorola.com>
* | Cloud IO PromptJose Antonio Marquez2012-01-31
| | | | | | | | Setting up UI for the file IO prompt on initialization of Ninja and whenever a cloud IO call is made and the server is not detected.
* | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-01-30
|\ \ | | | | | | | | | | | | | | | Conflicts: _scss/compass_app_log.txt _scss/imports/scss/_Stage.scss
| * | Adding the version to the main Ninja reel component.Valerio Virgillito2012-01-31
| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <rmwh84@motorola.com>
| * | Adding a version json object to NinjaValerio Virgillito2012-01-31
| |/ | | | | | | | | | | | | Versions object to start keeping track of versions for Ninja, Montage and eventually other dependencies. Loaded before montage to use in the splash screen. Signed-off-by: Valerio Virgillito <rmwh84@motorola.com>
* / Merged old FileIOJose Antonio Marquez2012-01-27
|/
* First commit of Ninja to ninja-internalPierre Frisch2012-01-27
Signed-off-by: Valerio Virgillito <rmwh84@motorola.com>