aboutsummaryrefslogtreecommitdiff
path: root/js
Commit message (Collapse)AuthorAge
* allow / in windows directory pathAnanya Sen2012-02-14
| | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* use button tag for save as dialogAnanya Sen2012-02-14
| | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* Cleaning upJose Antonio Marquez2012-02-14
| | | | Setting up a 'document' folder to handle all document related classes that in relation to IO
* Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-14
|\
| * Fixing the live preview background issue.Valerio Virgillito2012-02-14
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | Cleaning up mediatorJose Antonio Marquez2012-02-14
| |
* | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-14
|\|
| * Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵John Mayhew2012-02-14
| |\ | | | | | | | | | WorkingBranch
| * | Implemented about box component and hooked it up to the About menuJohn Mayhew2012-02-14
| | |
* | | Cleaning up requiresJose Antonio Marquez2012-02-14
| | |
* | | Merge branch 'refs/heads/AnanyaFileIO' into FileIOJose Antonio Marquez2012-02-13
|\ \ \
| * | | 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>
* | | | File IO UI tweaksJose Antonio Marquez2012-02-13
|/ / / | | | | | | | | | Making minor tweaks to the UI for file IO, will need to make much more at a later time.
* | | new file dialog - preselect default templateAnanya 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>
| * | | show iframeContainer if all documents are closedAnanya Sen2012-02-10
| | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-13
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge branch 'refs/heads/master' into StylesControllerUpdatesEric Guzman2012-02-13
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: js/controllers/styles-controller.js
| | * \ \ Merge branch 'refs/heads/master' into stage-colorValerio Virgillito2012-02-13
| | |\ \ \
| | * \ \ \ Merge branch 'refs/heads/master' into stage-colorValerio Virgillito2012-02-13
| | |\ \ \ \
| | * | | | | 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
| | | | | | | |
* | | | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-13
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| * | | | | | | Merge pull request #34 from ericguzman/TreeComponentsValerio Virgillito2012-02-13
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | Tree components - updating the ninja branch/leaf
| | * | | | | | Ninja leaf - remove console lotEric Guzman2012-02-13
| | | | | | | |
| | * | | | | | Merge branch 'refs/heads/master' into TreeComponentsEric Guzman2012-02-13
| | |\ \ \ \ \ \ | | | | |_|_|/ / | | | |/| | | |
| | * | | | | | Tree Components - Change the way delegate methods are calledEric Guzman2012-02-13
| | | | | | | |
* | | | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-13
|\| | | | | | |
| * | | | | | | Bug FixesJose Antonio Marquez2012-02-13
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | IKNINJA-1101 IKNINJA-1079 IKNINJA-1144
* | | | | | | Save 'code' view filesJose Antonio Marquez2012-02-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Added functionality (temp) to save files in code view.
* | | | | | | File Save (with CSS styles)Jose Antonio Marquez2012-02-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Temp fix for saving styles in <style> of HTML document.
* | | | | | | 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
| * | | | | | 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>
| | * | | | | | | Removing some console logs. I kept in the ones that signify error cases.Nivesh Rajbhandari2012-02-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| | * | | | | | | Updated linear and radial gradient materials import/export routines.Nivesh Rajbhandari2012-02-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | | | | | | Merging changes for rectangle drawing.Nivesh Rajbhandari2012-02-09
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | * | | | | | | Changed the rendering for canvas 2D rectangle.hwc4872012-02-08
| | | | | | | | | |