aboutsummaryrefslogtreecommitdiff
path: root/js/document
Commit message (Expand)AuthorAge
...
* | Squashed commit of stage architectureValerio Virgillito2012-04-30
* | Merge pull request #182 from ericmueller/Canvas-interactionValerio Virgillito2012-04-30
|\ \ | |/ |/|
| * canvas interactionhwc4872012-04-26
| * Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Can...hwc4872012-04-25
| |\
| * \ Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Can...hwc4872012-04-24
| |\ \
| * | | canvas interactionhwc4872012-04-23
* | | | Merge branch 'stage-document-architecture' of https://github.com/mencio/ninja...Valerio Virgillito2012-04-26
|\ \ \ \
| * | | | Fixed the stage border and layout in the new templateValerio Virgillito2012-04-26
| * | | | Simplifying the getElement method from stage and adding an exclusion list to ...Valerio Virgillito2012-04-26
| * | | | Fixing the element model and adding get elementValerio Virgillito2012-04-26
| * | | | Merge branch 'refs/heads/master' into stage-document-architectureValerio Virgillito2012-04-24
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Added a body controllerValerio Virgillito2012-04-24
| | |_|/ | |/| |
* | | | Removing all "module" declarations and replaced with "prototype" in preparati...John Mayhew2012-04-26
| |/ / |/| |
* | | Merge branch 'master' into pentoolPushkar Joshi2012-04-24
|\| |
| * | adjusting the bread crumb to work with the new templateValerio Virgillito2012-04-23
| * | reverting old template to current working status. New template work.Valerio Virgillito2012-04-20
| * | Merge branch 'refs/heads/Document' into stage-document-architectureValerio Virgillito2012-04-19
| |\ \
| | * | Merge branch 'refs/heads/Ninja-Internal' into DocumentJose Antonio Marquez2012-04-10
| | |\|
| | * | Merge branch 'refs/heads/Ninja-Internal' into DocumentJose Antonio Marquez2012-04-04
| | |\ \
| | * | | Backup for mergeJose Antonio Marquez2012-04-04
| | * | | Merge branch 'refs/heads/Ninja-Internal' into DocumentJose Antonio Marquez2012-04-02
| | |\ \ \
| | * | | | Setting up document reworkJose Antonio Marquez2012-04-02
| * | | | | initial stage web templateValerio Virgillito2012-04-18
| | |_|_|/ | |/| | |
* | | | | Merge branch 'master' into pentoolPushkar Joshi2012-04-17
|\| | | |
| * | | | Merge pull request #159 from mqg734/WebGLMaterialsValerio Virgillito2012-04-09
| |\ \ \ \
| | * | | | Removing fill, stroke, fillMaterial and strokeMaterial from the shapeModel ca...Nivesh Rajbhandari2012-04-05
| | * | | | Merge branch 'refs/heads/ToolFixes' into WebGLMaterialsNivesh Rajbhandari2012-04-04
| | |\ \ \ \
| | | * \ \ \ Merge branch 'refs/heads/WebGLFileIO' into ToolFixesNivesh Rajbhandari2012-04-04
| | | |\ \ \ \ | | | | |_|_|/ | | | |/| | |
| | | | * | | Give user feedback about which element the Fill/InkBottle tools will act on.Nivesh Rajbhandari2012-04-03
| | | | * | | Merge branch 'refs/heads/ninja-internal' into WebGLFileIONivesh Rajbhandari2012-03-30
| | | | |\ \ \ | | | | | | |/ | | | | | |/|
| | | | * | | Updated shapes to always check for its stroke and fill colors and materials i...Nivesh Rajbhandari2012-03-29
| | | | | |/ | | | | |/|
| | * | | | Merge branch 'refs/heads/ninja-internal' into WebGLMaterialsNivesh Rajbhandari2012-03-27
| | |\ \ \ \
| | * | | | | Adding logic for flatten checkbox in PI.Nivesh Rajbhandari2012-03-24
* | | | | | | Merge branch 'master' into pentoolPushkar Joshi2012-04-06
|\| | | | | |
| * | | | | | Merge pull request #157 from ananyasen/ninja-internal-master-patch1Valerio Virgillito2012-04-04
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| | * | | | | [CR] Keep Save related menu items always enabled, if there is an open documentAnanya Sen2012-04-04
| | | |_|_|/ | | |/| | |
| * | | | | Removed the dependence on an "assets" directory for the RDGE runtime. Now Nin...John Mayhew2012-04-03
| * | | | | removed old unused import and export functions.John Mayhew2012-04-03
| * | | | | Namespaced the canvas runtime file and updated all dependenciesJohn Mayhew2012-04-03
| |/ / / /
* | | | | Merge branch 'master' into pentoolPushkar Joshi2012-04-03
|\| | | |
| * | | | Merge pull request #147 from pushkarjoshi/brushtoolValerio Virgillito2012-03-29
| |\ \ \ \ | | |_|_|/ | |/| | |
| * | | | Merge pull request #131 from ananyasen/integration-candidateValerio Virgillito2012-03-28
| |\ \ \ \
| | * | | | - enable/disable save, saveAs, saveAll, close, closeAll as per documents openAnanya Sen2012-03-22
| | | |/ / | | |/| |
* | | | | working File I/O for pen tool created paths and some minor bug fixes (correct...Pushkar Joshi2012-04-03
| |_|/ / |/| | |
* | | | Merge branch 'master' into brushtoolPushkar Joshi2012-03-28
|\| | |
| * | | Presets Controller - Removing test background from transition classEric Guzman2012-03-27
| * | | Merge branch 'refs/heads/master' into PresetsPIEric Guzman2012-03-27
| |\ \ \ | | | |/ | | |/|
| * | | Presets Panel - Adding presets controller and removing functionality from pan...Eric Guzman2012-03-22
| | |/ | |/|
* | | File IO for the brush stroke AND changing the data type of brush stroke from ...Pushkar Joshi2012-03-27
| |/ |/|
* | Removing m-js components I/O and fix for webGLJose Antonio Marquez2012-03-23