aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
...
* | | | | | | | Merge pull request #10 from ananyasen/FileIOJose Antonio Marquez Russo2012-02-18
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | FileIO branch pull request
| | * | | | | | check cloud availability before open file picker and new file dialogsAnanya Sen2012-02-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * | | | | | - moved tools specific keyboard controls for desing view onlyAnanya Sen2012-02-20
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - stopped snapping when all documents are closed Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | | | | | Merge branch 'refs/heads/FileIO-jose' into FileIOAnanya Sen2012-02-18
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/controllers/document-controller.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | | | | | doc.markEdited() removed from element-mediator, for style changes, as per ↵Ananya Sen2012-02-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | teams suggestion Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | | | | | Merge branch 'refs/heads/FileIO-jose' into FileIOAnanya Sen2012-02-17
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: css/ninja.css js/controllers/document-controller.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | | | | | | renamed methods to use better wordsAnanya Sen2012-02-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | | | | | | use method to update dirtyFlagAnanya Sen2012-02-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | | | | | | 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>
| | | | | * | | Integrating canvas-2d drawing and WebGL fixes, including adding back WebGL ↵Nivesh Rajbhandari2012-02-22
| | | | | | |/ | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | materials. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | | | * | Updated Materials Library and Materials Editor Popup to work with latest ↵mqg7342012-02-21
| | | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | version of Montage. We had to change our css to not use id's. Also, updated the popup to use Montage's Popup component. It looks like bump material has a bug. So loading that material results in a runtime error.
| | | | | * Merge branch 'refs/heads/ninja-internal' into ToolFixesNivesh Rajbhandari2012-02-20
| | | | | |\ | |_|_|_|_|/ |/| |