aboutsummaryrefslogtreecommitdiff
path: root/js/controllers
Commit message (Collapse)AuthorAge
* Merge branch 'FileIO' of https://github.com/joseeight/ninja-internal into ↵Valerio Virgillito2012-02-14
|\ | | | | | | integration
| * save integration - minor bug fixAnanya Sen2012-02-13
| | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * integrating save functionalityAnanya Sen2012-02-13
| | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * added logical drive selection to file pickerAnanya Sen2012-02-13
| | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * Fixing multiple tabsJose Antonio Marquez2012-02-13
| | | | | | | | Fixed broken code to allow for multiple tabs to open.
| * Merge branch 'refs/heads/AnanyaFileIO' into FileIOJose Antonio Marquez2012-02-13
| |\
| | * Revert "Merge from /joseeight/ninja-internal/tree/FileIO"Ananya Sen2012-02-10
| | | | | | | | | | | | | | | | | | This reverts commit c48eeb01bd726895dc577d8b843b2a75883eee07. Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * Merge from /joseeight/ninja-internal/tree/FileIOAnanya Sen2012-02-10
| | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-13
| |\ \
| * | | Save 'code' view filesJose Antonio Marquez2012-02-13
| | | | | | | | | | | | | | | | Added functionality (temp) to save files in code view.
| * | | File Save (HTML only)Jose Antonio Marquez2012-02-12
| | | | | | | | | | | | | | | | Added the ability to save an HTML file from design view, need to add CSS detection and saving (of styles in <style> only). Also need to add 'Save All' for all file attached to the HTML file.
| * | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-11
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: js/ninja.reel/ninja.html
| * | | | Cleaning up open file in code viewJose Antonio Marquez2012-02-10
| | | | |
| * | | | Adding back file open for code viewJose Antonio Marquez2012-02-10
| | | | |
| * | | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-10
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/ninja.reel/ninja.html js/stage/stage.reel/stage.html
| * | | | | File OpenJose Antonio Marquez2012-02-10
| | |_|_|/ | |/| | | | | | | | | | | | | Adding the functionality to open a basic file.
| * | | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-09
| |\ \ \ \
| * \ \ \ \ Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-08
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-06
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-06
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge pull request #16 from ericguzman/TreeComponentsValerio Virgillito2012-02-06
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Tree components
| | | * | | | | | | Tree Controller - Clean out unused codeEric Guzman2012-02-06
| | | | | | | | | |
| | | * | | | | | | Tree Controller - Initial addEric Guzman2012-02-06
| | | | | | | | | |
| * | | | | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-06
| |\| | | | | | | |
| * | | | | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-02
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitignore js/ninja.reel/ninja.js
| * | | | | | | | | Updated canvas controller to override setProperties so we don't set styles ↵Nivesh Rajbhandari2012-01-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when updating width and height. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | | | | | | Merged old FileIOJose Antonio Marquez2012-01-27
| | | | | | | | | |
* | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵John Mayhew2012-02-14
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | WorkingBranch
| * | | | | | | | | Merge branch 'refs/heads/master' into StylesControllerUpdatesEric Guzman2012-02-13
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/controllers/styles-controller.js
| | * | | | | | | | | Cleaning up the stage background color chip.Valerio Virgillito2012-02-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵Valerio Virgillito2012-02-12
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | stage-color
| | * | | | | | | | | initial color chip for the stageValerio Virgillito2012-02-10
| | | |_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | | | | | | Styles Controller - Separate css animation rule gettersEric Guzman2012-02-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To add document- and sheet-specific getters.
| * | | | | | | | | Merge branch 'refs/heads/master' into StylesControllerUpdatesEric Guzman2012-02-08
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / | | |/| | | | | | |
| * | | | | | | | | Styles Controller - added methods to get keyframe animation rulesEric Guzman2012-02-08
| | | | | | | | | |
* | | | | | | | | | Implemented about box component and hooked it up to the About menuJohn Mayhew2012-02-14
| |_|_|/ / / / / / |/| | | | | | | |
* | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵John Mayhew2012-02-10
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WorkingBranch
| * \ \ \ \ \ \ \ \ Merge branch 'refs/heads/ninja-internal' into WebGLFixesNivesh Rajbhandari2012-02-10
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ | | |/| | | | | | |
| * | | | | | | | | Support export/import of GLLine data.Nivesh Rajbhandari2012-02-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | | | | | | Fixed switching between webGL and canvas 2d modes.Nivesh Rajbhandari2012-02-09
| | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵John Mayhew2012-02-10
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WorkingBranch Conflicts: js/ninja.reel/ninja.html
| * | | | | | | | Merge branch 'Timeline' of https://github.com/imix23ways/ninja-internal into ↵Valerio Virgillito2012-02-09
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature-branch Conflicts: js/helper-classes/RDGE/Materials/FlatMaterial.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | | | | | Squashed commit of the following:Jonathan Duran2012-02-