aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Reverting text/html document classes and setting up MVC folder structureJose Antonio Marquez2012-02-14
| | | | Setting up the folder structure for the proposed set up for documents in Ninja. Reverted to have a temp HTML/Text document class. Tweak some UI for file pickers.
* Merging TextDocument into BaseDocumentJose Antonio Marquez2012-02-14
| | | | Merged the text-document class with base-document, didn't make sense to have two classes for basic model of documents, the html-document class remain extending base-document to incorporate design view. These two classes might be renamed.
* 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
|\
| * Merge pull request #41 from mencio/live-preview-fixValerio Virgillito2012-02-14
| |\ | | | | | | Fixing the live preview background issue.
| | * 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 pull request #40 from mayhewinator/WorkingBranchmayhewinator2012-02-14
| |\ | | | | | | Implemented about box dialog
| | * 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>
| * | | Merge branch 'FileIO' of github.com:joseeight/ninja-internal into FileIOAnanya Sen2012-02-13
| |\ \ \
| * | | | 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.
* | | | Merge branch 'refs/heads/AnanyaFileIO' into FileIOJose Antonio Marquez2012-02-13
|\| | |
| * | | 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>
| * | | Merge branch 'FileIO' of github.com:joseeight/ninja-internal into FileIOAnanya Sen2012-02-13
| |\ \ \
| * \ \ \ Merge branch 'FileIO' of github.com:joseeight/ninja-internal into FileIOAnanya Sen2012-02-13
| |\ \ \ \
* | \ \ \ \ Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-13
|\ \ \ \ \ \ | |_|_|/ / / |/| | | / / | | |_|/ / | |/| | |
| * | | | Merge pull request #39 from mencio/montage-overridesValerio Virgillito2012-02-13
| |\ \ \ \ | | | | | | | | | | | | Adding a montage override sass file. Overriding the default css for montage popups.
| | * | | | Adding a montage override sass file. Overriding the default css for montage ↵Valerio Virgillito2012-02-13
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | popups. Signed-off-by: Valerio Virgillito <valerio@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 pull request #38 from ericguzman/StylesControllerUpdatesValerio Virgillito2012-02-13
| |\ \ \ | | | | | | | | | | Styles controller updates
| | * \ \ Merge branch 'refs/heads/master' into StylesControllerUpdatesEric Guzman2012-02-13
| | |\ \ \ | | |/ / / | |/| | | | | | | | | | | | | Conflicts: js/controllers/styles-controller.js
| * | | | Merge pull request #37 from mencio/stage-colorValerio Virgillito2012-02-13
| |\ \ \ \ | | | | | | | | | | | | Stage color: Adding the stage background color chip to the stage PI
| | * \ \ \ 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 #36 from mayhewinator/WorkingBranchValerio Virgillito2012-02-13
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | | Final Splash Screen Art
| | * | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵John Mayhew2012-02-13
| | |\ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | | | | | | | | | | | WorkingBranch
| | * | | | | | | implemented finalized splash screenJohn Mayhew2012-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
| | | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-12 01:57:01 +0000