aboutsummaryrefslogtreecommitdiff
path: root/js/controllers
Commit message (Expand)AuthorAge
* Merge branch 'refs/heads/master' into bindingArmen Kesablyan2012-06-19
|\
| * More cleaning upJose Antonio Marquez2012-06-16
| * Merge branch 'refs/heads/Ninja-Internal' into ColorJose Antonio Marquez2012-06-15
| |\
| | * Save user's html and body styles and inline body styles for 3d so they don't ...Nivesh Rajbhandari2012-06-14
| * | Fixing apply 'no color'Jose Antonio Marquez2012-06-15
| |/
| * Merge branch 'refs/heads/ninja-internal' into PI_HotTextFixesNivesh Rajbhandari2012-06-13
| |\
| | * fixed document switching issuesValerio Virgillito2012-06-12
| | * hack fix for the PI section throwing errors when dom is not ready to drawValerio Virgillito2012-06-12
| * | Fixing properties panel to support px and % for body and other elements.Nivesh Rajbhandari2012-06-12
| |/
| * rewrite: currentSelectedContainer -> domContainerValerio Virgillito2012-06-08
* | Objects Controller - Fix call to get current object bindings after add/removi...Eric Guzman2012-06-13
* | Objects Controller - Update current object bindings when adding/removing bind...Eric Guzman2012-06-13
* | Objects Controller - Add concept of categoriesEric Guzman2012-06-12
* | Merge branch 'binding' of github.com:dhg637/ninja-internal into bindingEric Guzman2012-06-11
|\ \
| * | Changes Made to Object Listing of iFrameArmen Kesablyan2012-06-11
| * | Merge branch 'refs/heads/master' into bindingArmen Kesablyan2012-06-11
| |\|
| | * Merge branch 'refs/heads/ninja-internal' into BodyPINivesh Rajbhandari2012-06-07
| | |\
| | | * fixing the body color chip for non banners templatesValerio Virgillito2012-06-07
| | * | Body PI fixes.Nivesh Rajbhandari2012-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
| | |/
| | * 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