| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | Revert "Revert "Cleaning up"" | Ananya Sen | 2012-02-15 |
| | | | | | | | This reverts commit a90e3be8850b64e8e370aa8ff8cadaa448dd0c82. Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| * | Revert "Revert "Merging TextDocument into BaseDocument"" | Ananya Sen | 2012-02-15 |
| | | | | | | | This reverts commit b8782f2e3dd106accbb0160a98e6b498f26752ea. Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| * | Revert "merging from github.com/joseeight/ninja-internal/tree/FileIO is ↵ | Ananya Sen | 2012-02-15 |
| | | | | | | | | | breaking opening html files… to trying to fix local build" This reverts commit 3cf1d19c5cdc9534d9c87cbc7d1fcf48e68daa42. Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| * | merging from github.com/joseeight/ninja-internal/tree/FileIO is breaking ↵ | Ananya Sen | 2012-02-15 |
| | | | | | | | opening html files… to trying to fix local build Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| * | Revert "Merging TextDocument into BaseDocument" | Ananya Sen | 2012-02-15 |
| | | | | | | | | | | | This reverts commit 93c8f327d662a7693d1d6ca050a0efd15ebc18ed. Conflicts: js/controllers/document-controller.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| * | Revert "Cleaning up" | Ananya Sen | 2012-02-15 |
| | | | | | | | | | | | | This reverts commit a7952c5a16e2cae3fd1a459b03b9f16bba1004da. Conflicts: js/controllers/document-controller.js js/io/document/text-document.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| * | Revert "Reverting text/html document classes and setting up MVC folder ↵ | Ananya Sen | 2012-02-15 |
| | | | | | | | | | structure" This reverts commit 68ce64a5a2f4a71b54d33916aaf1d57161302425. Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| * | Revert "Creating NinjaTemplate to HTML function" | Ananya Sen | 2012-02-15 |
| | | | | | | | This reverts commit e327eccb93e2bc513fcbb7ab302783d6bce83884. Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| * | Creating NinjaTemplate to HTML function | Jose Antonio Marquez | 2012-02-14 |
| | | | | | This function will need to be cleaned up and possibly moved once the MVC structure is in-place for the document. | ||
| * | Merge branch 'refs/heads/AnanyaFileIO' into FileIO | Jose Antonio Marquez | 2012-02-14 |
| |\ | |||
| | * | allow / in windows directory path | Ananya Sen | 2012-02-14 |
| | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| | * | use button tag for save as dialog | Ananya Sen | 2012-02-14 |
| | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| * | | Reverting text/html document classes and setting up MVC folder structure | Jose Antonio Marquez | 2012-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 BaseDocument | Jose Antonio Marquez | 2012-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 up | Jose Antonio Marquez | 2012-02-14 |
| | | | | | Setting up a 'document' folder to handle all document related classes that in relation to IO | ||
| * | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-14 |
| |\ | |||
| | * | Merge pull request #41 from mencio/live-preview-fix | Valerio Virgillito | 2012-02-14 |
| | |\ | | | | | | | Fixing the live preview background issue. | ||
| | | * | Fixing the live preview background issue. | Valerio Virgillito | 2012-02-14 |
| | |/ | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | Cleaning up mediator | Jose Antonio Marquez | 2012-02-14 |
| | | | |||
| * | | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-14 |
| |\| | |||
| | * | Merge pull request #40 from mayhewinator/WorkingBranch | mayhewinator | 2012-02-14 |
| | |\ | | | | | | | Implemented about box dialog | ||
| | | * | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | John Mayhew | 2012-02-14 |
| | | |\ | | |/ | |/| | | | | WorkingBranch | ||
| | | * | Implemented about box component and hooked it up to the About menu | John Mayhew | 2012-02-14 |
| | | | | |||
| * | | | Cleaning up requires | Jose Antonio Marquez | 2012-02-14 |
| | | | | |||
| * | | | Merge branch 'refs/heads/AnanyaFileIO' into FileIO | Jose Antonio Marquez | 2012-02-13 |
| |\ \ \ | |||
| | * | | | save integration - minor bug fix | Ananya Sen | 2012-02-13 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| | * | | | Merge branch 'FileIO' of github.com:joseeight/ninja-internal into FileIO | Ananya Sen | 2012-02-13 |
| | |\ \ \ | |||
| | * | | | | integrating save functionality | Ananya Sen | 2012-02-13 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| * | | | | | File IO UI tweaks | Jose Antonio Marquez | 2012-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 FileIO | Jose Antonio Marquez | 2012-02-13 |
| |\| | | | |||
| | * | | | new file dialog - preselect default template | Ananya Sen | 2012-02-13 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| | * | | | added logical drive selection to file picker | Ananya Sen | 2012-02-13 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| | * | | | Merge branch 'FileIO' of github.com:joseeight/ninja-internal into FileIO | Ananya Sen | 2012-02-13 |
| | |\ \ \ | |||
| | * \ \ \ | Merge branch 'FileIO' of github.com:joseeight/ninja-internal into FileIO | Ananya Sen | 2012-02-13 |
| | |\ \ \ \ | |||
| * | \ \ \ \ | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-13 |
| |\ \ \ \ \ \ | |_|_|/ / / |/| | | / / | | |_|/ / | |/| | | | |||
| | * | | | | Merge pull request #39 from mencio/montage-overrides | Valerio Virgillito | 2012-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 Virgillito | 2012-02-13 |
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | popups. Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | | | | Fixing multiple tabs | Jose Antonio Marquez | 2012-02-13 |
| | | | | | | | | | | | | | | | | | | | | | Fixed broken code to allow for multiple tabs to open. | ||
| * | | | | | Merge branch 'refs/heads/AnanyaFileIO' into FileIO | Jose Antonio Marquez | 2012-02-13 |
| |\ \ \ \ \ | | |/ / / | |/| | | | |||
| | * | | | | Revert "Merge from /joseeight/ninja-internal/tree/FileIO" | Ananya Sen | 2012-02-10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit c48eeb01bd726895dc577d8b843b2a75883eee07. Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| | * | | | | Merge from /joseeight/ninja-internal/tree/FileIO | Ananya Sen | 2012-02-10 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| | * | | | | show iframeContainer if all documents are closed | Ananya Sen | 2012-02-10 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| * | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-13 |
| |\ \ \ \ \ | | |/ / / | |/| / / | |_|/ / |/| | | | |||
| | * | | | Merge pull request #38 from ericguzman/StylesControllerUpdates | Valerio Virgillito | 2012-02-13 |
| | |\ \ \ | | | | | | | | | | | Styles controller updates | ||
| | | * \ \ | Merge branch 'refs/heads/master' into StylesControllerUpdates | Eric Guzman | 2012-02-13 |
| | | |\ \ \ | | |/ / / | |/| | | | | | | | | | | | | | Conflicts: js/controllers/styles-controller.js | ||
| | * | | | | Merge pull request #37 from mencio/stage-color | Valerio Virgillito | 2012-02-13 |
| | |\ \ \ \ | | | | | | | | | | | | | Stage color: Adding the stage background color chip to the stage PI | ||
| | | * \ \ \ | Merge branch 'refs/heads/master' into stage-color | Valerio Virgillito | 2012-02-13 |
| | | |\ \ \ \ | | |/ / / / | |/| | | | | |||
| | | * | | | | Merge branch 'refs/heads/master' into stage-color | Valerio Virgillito | 2012-02-13 |
| | | |\ \ \ \ | |||
| | | * | | | | | Cleaning up the stage background color chip. | Valerio Virgillito | 2012-02-13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | * | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | Valerio Virgillito | 2012-02-12 |
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | stage-color | ||