aboutsummaryrefslogtreecommitdiff
path: root/js/components
Commit message (Expand)AuthorAge
* Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-06-20
|\
| * Merge branch 'IKNINJA-1754' of github.com:mencio/ninja-internalValerio Virgillito2012-06-19
| |\
| | * IKNINJA 1754 menu not opening on hoverValerio Virgillito2012-06-19
| * | Merge branch 'bugfix-master' of github.com:ananyasen/ninja-internalValerio Virgillito2012-06-19
| |\ \ | | |/ | |/|
| | * Reverting last change since this is is being made in a different pull request.Ananya Sen2012-06-19
| | * Fix for IKNINJA-1754 (CLONE) - Menu Component: Hovering over another main men...Ananya Sen2012-06-19
| | * Fixed - IKNINJA-1313 - File menu drop down should close when New File dialog ...Ananya Sen2012-06-18
* | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-06-19
|\| |
| * | Cleaning reelJose Antonio Marquez2012-06-17
| * | Cleaning up element referencesJose Antonio Marquez2012-06-17
| * | Tidying up color barJose Antonio Marquez2012-06-17
| |/
* | Merge remote-tracking branch 'ninja-internal/master' into test-mergeJon Reid2012-06-15
|\|
| * Fix: IKNINJA-1187Jose Antonio Marquez2012-06-13
| * Merge branch 'refs/heads/Ninja-Internal' into ColorJose Antonio Marquez2012-06-13
| |\
| | * Merge branch 'refs/heads/ninja-internal' into PI_HotTextFixesNivesh Rajbhandari2012-06-13
| | |\
| | | * Merge branch 'refs/heads/master' into montage-v10-integrationValerio Virgillito2012-06-13
| | | |\
| | | * | fixed document switching issuesValerio Virgillito2012-06-12
| | | * | adding more missing properties to the serializationValerio Virgillito2012-06-12
| | | * | adding more missing propertiesValerio Virgillito2012-06-11
| | | * | adding more missing propertiesValerio Virgillito2012-06-11
| | | * | removing serializable to the tree and adding a few more missing propertiesValerio Virgillito2012-06-11
| | | * | Merge branch 'refs/heads/master' into montage-v10-integrationValerio Virgillito2012-06-11
| | | |\ \
| | | * \ \ Merge branch 'refs/heads/master' into montage-v10-integrationValerio Virgillito2012-06-06
| | | |\ \ \
| | | * | | | first iteration of adding serializable to ninja plus other changes to run the...Valerio Virgillito2012-06-06
| | * | | | | Merge branch 'refs/heads/ninja-internal' into PI_HotTextFixesNivesh Rajbhandari2012-06-13
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | |
| | * | | | | Fixing properties panel to support px and % for body and other elements.Nivesh Rajbhandari2012-06-12
| | | |_|_|/ | | |/| | |
| * | | | | Cleaning up color wheel componentJose Antonio Marquez2012-06-13
| | |/ / / | |/| | |
| * | | | Merge branch 'refs/heads/Ninja-Internal' into TempPromptUIJose Antonio Marquez2012-06-12
| |\| | |
| | * | | rewrite: currentSelectedContainer -> domContainerValerio Virgillito2012-06-08
| * | | | Adding temp prompt UI componentJose Antonio Marquez2012-06-11
| |/ / /
* | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-06-11
|\| | |
| * | | Merge branch 'refs/heads/master' into element-model-fixesValerio Virgillito2012-06-06
| |\ \ \
| | * \ \ Merge pull request #272 from pushkarjoshi/pentoolValerio Virgillito2012-06-06
| | |\ \ \ | | | |_|/ | | |/| |
| | | * | Merge branch 'master' into pentoolPushkar Joshi2012-06-04
| | | |\|
| | | * | Merge branch 'master' into pentoolPushkar Joshi2012-05-31
| | | |\ \
| | | * | | More consistent local and global mouse coords which solves a bug with the Pen...Pushkar Joshi2012-05-29
| | | * | | allow changes in the pen subtool in options to be seen by the pen tool code (...Pushkar Joshi2012-05-22
| * | | | | Merge branch 'refs/heads/master' into element-model-fixesValerio Virgillito2012-06-05
| |\| | | |
| * | | | | cleanup and making the webgl-helper only loop canvas on file saveValerio Virgillito2012-06-05
| | |_|_|/ | |/| | |
* | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-06-06
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Fill and Ink-Bottle fixes.Nivesh Rajbhandari2012-06-04
| |/ / /
* | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-06-05
|\| | |
| * | | making the document bar handle the current document to hide/show itselfValerio Virgillito2012-06-01
| * | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into doc...Valerio Virgillito2012-05-31
| |\ \ \ | | | |/ | | |/|
| | * | CSS Panel Toolbar - Prevent warning regarding undefined sourceObjectEric Guzman2012-05-30
| * | | fixing the close and saveValerio Virgillito2012-05-31
| * | | Fixing the close document.Valerio Virgillito2012-05-30
| * | | fixing the menu bindings and some cleanup of the stageValerio Virgillito2012-05-29
| * | | 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