aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* mark document on setting color, properties and stroke.Ananya Sen2012-02-17
| | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* changed the document dirtying logic to be done in the feature that edits the ↵Ananya Sen2012-02-17
| | | | | | document. Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* -added keyboard control for saving documentsAnanya Sen2012-02-17
| | | | | | -mark html design view when element is added or deleted Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* remove similar function from coreioapi.jsAnanya Sen2012-02-16
| | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* moved file picker in file ioAnanya Sen2012-02-16
| | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* hide the rulers when no document is openAnanya Sen2012-02-16
| | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* file picker:Ananya Sen2012-02-16
| | | | | | | Enable ok if user double clicks folder and enter it. Validate path if user enter it manually in addressbar. Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* fixes to document tabbingAnanya Sen2012-02-15
| | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* Revert "Revert "Creating NinjaTemplate to HTML function""Ananya Sen2012-02-15
| | | | | | This reverts commit 2e308be9bec5e06d81b2905b65005a232f0a190d. Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* Revert "Revert "Reverting text/html document classes and setting up MVC ↵Ananya Sen2012-02-15
| | | | | | | | folder structure"" This reverts commit 9048cd50bf5e0a418d1d95498bb593961f72db36. Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* Revert "Revert "Cleaning up""Ananya Sen2012-02-15
| | | | | | This reverts commit a90e3be8850b64e8e370aa8ff8cadaa448dd0c82. Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* Revert "Revert "Merging TextDocument into BaseDocument""Ananya Sen2012-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 Sen2012-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 Sen2012-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 Sen2012-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 Sen2012-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 Sen2012-02-15
| | | | | | | | structure" This reverts commit 68ce64a5a2f4a71b54d33916aaf1d57161302425. Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* Revert "Creating NinjaTemplate to HTML function"Ananya Sen2012-02-15
| | | | | | This reverts commit e327eccb93e2bc513fcbb7ab302783d6bce83884. Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* Creating NinjaTemplate to HTML functionJose Antonio Marquez2012-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 FileIOJose Antonio Marquez2012-02-14
|\
| * 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>
* | 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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-24 13:26:12 +0000