aboutsummaryrefslogtreecommitdiff
path: root/js/controllers
Commit message (Expand)AuthorAge
* Merge branch 'refs/heads/ninja-internal-master' into cut-copy-pasteAnanya Sen2012-06-07
|\
| * Merge branch 'refs/heads/master' into element-model-fixesValerio Virgillito2012-06-05
| |\
| | * Merge pull request #267 from mqg734/ToolOptionsValerio Virgillito2012-06-05
| | |\
| | | * Merge branch 'refs/heads/ninja-internal' into ToolOptionsNivesh Rajbhandari2012-06-05
| | | |\
| | | * | Updated ink bottle tool to support color-chip's checkbox and undo/redo for st...Nivesh Rajbhandari2012-06-05
| | | * | Fill and Ink-Bottle fixes.Nivesh Rajbhandari2012-06-04
| * | | | removing all model creators.Valerio Virgillito2012-06-05
| |/ / /
| * | | fixing the save asValerio Virgillito2012-06-05
| * | | fixing the save asValerio Virgillito2012-06-05
| * | | Merge pull request #263 from joseeight/ComponentsValerio Virgillito2012-06-05
| |\ \ \ | | |_|/ | |/| |
| | * | Fixing saveAll from menuJose Antonio Marquez2012-06-04
| | |/
| * / components fix: adding a first draw event to componentsValerio Virgillito2012-06-04
| |/
* | - cleanse html for copying from outer applicationAnanya Sen2012-06-07
* | cut/paste for canvas objects and for multiple selected objects of mixed typesAnanya Sen2012-06-04
* | Merge branch 'refs/heads/ninja-internal-master' into cut-copy-pasteAnanya Sen2012-06-04
|\|
| * fixing some selection container changes and the breadcrumb not drawing initiallyValerio Virgillito2012-06-01
| * Merge branch 'refs/heads/master' into document-bindings-fixValerio Virgillito2012-06-01
| |\
| | * Attempting to track clean nodesJose Antonio Marquez2012-05-30
| * | Merge branch 'refs/heads/valerio-document-bindings-fix' into document-binding...Nivesh Rajbhandari2012-06-01
| |\ \
| | * \ Merge branch 'document-bindings-fix' of github.com:mencio/ninja-internal into...Valerio Virgillito2012-06-01
| | |\ \
| | * | | fixing the document closing when the first document is closed.Valerio Virgillito2012-06-01
| * | | | Moving styles controller higher in ninja's serialization so its bindings will...Nivesh Rajbhandari2012-06-01
| | |/ / | |/| |
| * | | Merge branch 'refs/heads/valerio-document-bindings-fix' into document-binding...Nivesh Rajbhandari2012-06-01
| |\| |
| | * | fixed the 3d grid when switching documents and some cleanupValerio Virgillito2012-06-01
| | * | fixing the code editor, closing documents and cleanup of the stageValerio Virgillito2012-06-01
| * | | SnapManager.setupDragPlaneFromPlane must happen after StylesController has fi...Nivesh Rajbhandari2012-06-01
| |/ /
| * | fixing the switching between various types of documentsValerio Virgillito2012-05-31
| * | removing the last closeDocument handlerValerio Virgillito2012-05-31
| * | Merge pull request #4 from mqg734/dom-architecture-pentoolValerio Virgillito2012-05-31
| |\ \
| | * | Removed temporary hack to support stage styles.Nivesh Rajbhandari2012-05-31
| * | | fixing the close and saveValerio Virgillito2012-05-31
| * | | fixing selection when switching documentsValerio Virgillito2012-05-31
| * | | cleanup itemsValerio Virgillito2012-05-31
| * | | fixing the closing of documentsValerio Virgillito2012-05-30
| |/ /
| * | opening code view documentsValerio Virgillito2012-05-30
| * | Merge branch 'Dom-Architecture' of github.com:mqg734/ninja-internal into docu...Valerio Virgillito2012-05-30
| |\ \
| | * | Cache perspective distance lookup to speed up user interaction.Nivesh Rajbhandari2012-05-29
| | * | IKNinja-1491 - Adding slice value to border gradients.Nivesh Rajbhandari2012-05-25
| | |/
| * | Fixing the close document.Valerio Virgillito2012-05-30
| * | cleanup and handling the document views in the document controller for now.Valerio Virgillito2012-05-29
| * | fix for the document tab close button and rulers on initial documentValerio Virgillito2012-05-29
| * | document bindings phase 1Valerio Virgillito2012-05-29
| |/
* | cut/paste html elements in single documentAnanya Sen2012-06-01
* | Merge branch 'refs/heads/ninja-internal-master' into cut-copy-pasteAnanya Sen2012-05-31
|\|
| * Merge branch 'refs/heads/Ninja-DOM-Architecture' into DocumentJose Antonio Marquez2012-05-24
| |\
| | * Fixed selection bug when switching/opening documents. Also, use saved scroll ...Nivesh Rajbhandari2012-05-24
| | * fixing the styles manager to open code view files and closing the last document.Valerio Virgillito2012-05-23
| | * Merge pull request #252 from ananyasen/dom-architectureValerio Virgillito2012-05-23
| | |\
| | | * Merge branch 'refs/heads/master-dom-architecture' into dom-architectureAnanya Sen2012-05-22
| | | |\
| | | * | - don't redraw stage for code document - fixes a switching bugAnanya Sen2012-05-22