aboutsummaryrefslogtreecommitdiff
path: root/js
Commit message (Expand)AuthorAge
* Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-04-24
|\
| * Merge branch 'refs/heads/master' into stage-document-architectureValerio Virgillito2012-04-23
| |\
| * | Temporary fix for the PI and Stage when opening the new template.Valerio Virgillito2012-04-23
| * | adjusting the bread crumb to work with the new templateValerio Virgillito2012-04-23
| * | more backup fixes for the old stageValerio Virgillito2012-04-20
| * | 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-16
| | |\ \
| | * \ \ Merge branch 'refs/heads/Ninja-Internal' into DocumentJose Antonio Marquez2012-04-11
| | |\ \ \
| | * \ \ \ Merge branch 'refs/heads/Ninja-Internal' into DocumentJose Antonio Marquez2012-04-10
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'refs/heads/Ninja-Internal' into DocumentJose Antonio Marquez2012-04-04
| | |\ \ \ \ \
| | * \ \ \ \ \ 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
| * | | | | | | | | typo fixValerio Virgillito2012-04-19
| * | | | | | | | | initial stage web templateValerio Virgillito2012-04-18
* | | | | | | | | | Turn on width and height as tweenable propertiesJonathan Duran2012-04-24
* | | | | | | | | | Fix Brush tool not broadcasting elementAdded eventJonathan Duran2012-04-23
* | | | | | | | | | Fix Pen Tool not broadcasting elementAdded eventJonathan Duran2012-04-23
* | | | | | | | | | Change sublayer property names to match css property namesJonathan Duran2012-04-23
* | | | | | | | | | Fix Select All bug and remove debuggersJonathan Duran2012-04-23
* | | | | | | | | | Breadcrumb FixKruti Shah2012-04-20
* | | | | | | | | | Merge branch 'refs/heads/timeline-local' into TimelineUberJonathan Duran2012-04-20
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Timeline: More bug fixes for selection with multiple documents opening andJon Reid2012-04-19
| * | | | | | | | | | Timeline: Bug fix: check for uninitialized currentDocument in intializationJon Reid2012-04-19
| * | | | | | | | | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-localJon Reid2012-04-19
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Timeline: Bug fix: Maintain selection between document switching.Jon Reid2012-04-19
* | | | | | | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-04-20
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | / | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
| * | | | | | | | | | Merge branch 'refs/heads/master' into cleanupValerio Virgillito2012-04-19
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | cleanup unused code.Valerio Virgillito2012-04-19
* | | | | | | | | | | | Merge branch 'timeline-local' of github.com:ntfx47/ninja-internal into Timeli...Jonathan Duran2012-04-19
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | BreadCrumb Bug FixKruti Shah2012-04-19
* | | | | | | | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-04-19
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / | |/| | / / / / / / / / / | |_|_|/ / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Merge pull request #168 from mqg734/EricMergeValerio Virgillito2012-04-19
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / | |/| | | | | | | | | |
| | * | | | | | | | | | Moving initialzeSnapping routine from RotateObject3DTool tool to Rotate3DTool...Nivesh Rajbhandari2012-04-18
| | * | | | | | | | | | Merge branch 'refs/heads/ninja-internal' into EricMergeNivesh Rajbhandari2012-04-18
| | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | |/| | | | | | | |
| | * | | | | | | | | | Fixing some more merge issues.Nivesh Rajbhandari2012-04-18
| | * | | | | | | | | | Merge branch 'refs/heads/ninja-internal' into EricMergeNivesh Rajbhandari2012-04-18
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/Snapping_II' into EricMergeNivesh Rajbhandari2012-04-18
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | Allow snapping to unselected objectshwc4872012-04-17
| | | * | | | | | | | | | | snapping for stage rotation toolhwc4872012-04-16
| | | * | | | | | | | | | | 3D translation fixeshwc4872012-04-16
| | | * | | | | | | | | | | 3D rotationhwc4872012-04-13
| | | * | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Sna...hwc4872012-04-13
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|_|/ | | | | |/| | | | | | | | |
| | | * | | | | | | | | | | 3D Rotate changeshwc4872012-04-13
| | | * | | | | | | | | | | Rotate3D tool changeshwc4872012-04-11
| | | * | | | | | | | | | | Merge branch 'Snapping' of github.com:ericmueller/ninja-internal into Snappin...hwc4872012-04-05
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | translate3DObject tool fixes.hwc4872012-04-05
| | | | * | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Sna...hwc4872012-04-04
| | | | |\ \ \ \ \ \ \ \ \ \ \