aboutsummaryrefslogtreecommitdiff
path: root/js/mediators
Commit message (Collapse)AuthorAge
* Merge branch 'refs/heads/FileIO' into FileIO-Build-CandidateJose Antonio Marquez2012-02-29
|\
| * Making class level url template variableJose Antonio Marquez2012-02-29
| | | | | | | | Created a class level variable for the URL to be parsed out of the user files.
* | Merge branch 'refs/heads/integration-candidate' into FileIO-Build-CandidateJose Antonio Marquez2012-02-28
|\ \ | |/ |/|
| * Merge pull request #79 from pushkarjoshi/pentoolValerio Virgillito2012-02-28
| |\ | | | | | | Pentool
| | * Merge branch 'master' into pentoolPushkar Joshi2012-02-28
| | |\ | | | | | | | | | | | | | | | | Conflicts: manifest.json
| | * | Bug fixes:Pushkar Joshi2012-02-28
| | | | | | | | | | | | | | | | | | | | | | | | 1152: allow deleting of multiple paths from inside pen tool 1128: keyboard hotkey shortcut 'P' for pen tool 941: changing width or height of the path scales the path
| * | | Merge branch 'FileIO-Build-Candidate' of ↵Valerio Virgillito2012-02-28
| |\ \ \ | | | | | | | | | | | | | | | https://github.com/joseeight/ninja-internal into integration-candidate
| * \ \ \ Merge branch 'ToolFixes' of https://github.com/mqg734/ninja-internal into ↵Valerio Virgillito2012-02-28
| |\ \ \ \ | | |_|_|/ | |/| | | | | | | | integration-candidate
| | * | | Fixing tooltips and keyboard shortcuts for 3d tools.Nivesh Rajbhandari2012-02-27
| | | |/ | | |/| | | | | | | | | | | | | | | | | IKNinja-1014 and IKNinja-1015. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | | CSS attributesJose Antonio Marquez2012-02-28
| |_|/ |/| | | | | | | | Setting up logic to include attributes in <link> for the <style> duplicates and add attributes created in Ninja back to <link> tag on save.
* | | Updating legal copyJose Antonio Marquez2012-02-27
| | |
* | | Merge branch 'refs/heads/FileIO-jose' into FileIOAnanya Sen2012-02-27
|\ \ \
| * | | Cleaning up pretty functions in IOJose Antonio Marquez2012-02-27
| | | |
| * | | Cleaning up and adding TODOsJose Antonio Marquez2012-02-26
| |/ /
| * | Cleaning up formatting for webGL dataJose Antonio Marquez2012-02-26
| | |
| * | Fixed issue with losing track of Ninja template cssJose Antonio Marquez2012-02-26
| | | | | | | | | | | | Also cleaned up URL getter for app in cleaning string code.
| * | Cleaning up ninja-data attributesJose Antonio Marquez2012-02-25
| | | | | | | | | | | | Added logic to load cross-domain CSS from CDN, but need to explore how to load without impacting permissions.
| * | Adding prettify code to I/OJose Antonio Marquez2012-02-24
| | | | | | | | | | | | This is a possible set of methods to be used to prettify code. Added temporarily until approved.
| * | Merge pull request #19 from ananyasen/FileIOJose Antonio Marquez Russo2012-02-24
| |\ \ | | | | | | | | FileIO branch pull request
| * \ \ Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-24
| |\ \ \ | | | |/ | | |/|
| | * | Adding back Ink Bottle tool in the tool bar so QE can test ink bottle ↵Nivesh Rajbhandari2012-02-24
| | | | | | | | | | | | | | | | | | | | | | | | functionality without having to wait for the new icon and location of the tool. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | Added import/export of RDGE dataJose Antonio Marquez2012-02-24
| | | | | | | | | | | | | | | | This is only the IO aspect, the data getter seems broken for 2D canvas and does not allow for save, and nothing works for setting the data on load. However, the IO aspect of saving and opening the data are not incorporated.
* | | | - save show3DGrid flag per document while switching documentsAnanya Sen2012-02-27
| |_|/ |/| | | | | | | | | | | | | | - fix zoom tool keyboard control to listen to Z when ctrl and shift keys are not pressed with it Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | | - added closeDocument event for timelineAnanya Sen2012-02-24
|/ / | | | | | | | | | | - minor bug fixes Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-23
|\| | | | | | | | | Conflicts: js/controllers/document-controller.js
| * fixing the tools shortcuts - IKNINJA 1199Valerio Virgillito2012-02-23
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | Adding url clean up to HTML on saveJose Antonio Marquez2012-02-23
| |
* | Merge branch 'FileIO' of github.com:joseeight/ninja-internal into file-ioValerio Virgillito2012-02-23
|\ \
| * | Temp fix for CSS url dataJose Antonio Marquez2012-02-22
| | | | | | | | | | | | Added a temp fix to parse out the app url that is placed in the CSS styles.
| * | Cleaning up and commenting CSS IOJose Antonio Marquez2012-02-22
| | |
| * | Logic to save <style> for a fileJose Antonio Marquez2012-02-22
| |/ | | | | | | Saving CSS in <style> tags, need to implement saving CSS to files.
* / renaming makeElementModel2 to makeModelFromElementValerio Virgillito2012-02-23
|/ | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* Merge branch 'nested-selection' of https://github.com/mencio/ninja-internal ↵Valerio Virgillito2012-02-21
|\ | | | | | | | | | | | | | | | | into file-io Conflicts: js/controllers/document-controller.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * cleanupValerio Virgillito2012-02-20
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | fixing the dirty flag and removing sass changesValerio Virgillito2012-02-21
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@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>
| * Chrome PreviewJose Antonio Marquez2012-02-17
| |
* | 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>
| * Adding new RDGE library dataJose Antonio Marquez2012-02-16
| |
| * Setting up webGL library copy on saveJose Antonio Marquez2012-02-15
| |
| * Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-15
| |\ | | | | | | | | | | | | Conflicts: js/document/html-document.js
| | * Merge branch 'components' of https://github.com/mencio/ninja-internal into ↵Valerio Virgillito2012-02-14
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | integration Conflicts: js/io/document/html-document.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | | * Add support for drag and drop for the components.Valerio Virgillito2012-02-14
| | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-16 04:07:11 +0000