Commit message (Expand) | Author | Age | ||
---|---|---|---|---|
... | ||||
* | | | | | | | | | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-04-24 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | ||||
| * | | | | | | | | | | | | | Merge branch 'refs/heads/master' into stage-document-architecture | Valerio Virgillito | 2012-04-23 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / / / | | |/| | | | | | | | | | | | ||||
| * | | | | | | | | | | | | | Temporary fix for the PI and Stage when opening the new template. | Valerio Virgillito | 2012-04-23 | |
| * | | | | | | | | | | | | | adjusting the bread crumb to work with the new template | Valerio Virgillito | 2012-04-23 | |
| * | | | | | | | | | | | | | more backup fixes for the old stage | Valerio Virgillito | 2012-04-20 | |
| * | | | | | | | | | | | | | reverting old template to current working status. New template work. | Valerio Virgillito | 2012-04-20 | |
| * | | | | | | | | | | | | | Merge branch 'refs/heads/Document' into stage-document-architecture | Valerio Virgillito | 2012-04-19 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'refs/heads/Ninja-Internal' into Document | Jose Antonio Marquez | 2012-04-16 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|/ / / / | | | |/| | | | | | | | | | | | ||||
| | * | | | | | | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into Document | Jose Antonio Marquez | 2012-04-11 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'refs/heads/Ninja-Internal' into Document | Jose Antonio Marquez | 2012-04-10 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'refs/heads/Ninja-Internal' into Document | Jose Antonio Marquez | 2012-04-04 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'refs/heads/Ninja-Internal' into Document | Jose Antonio Marquez | 2012-04-04 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|/ / / / / / / | | | |/| | | | | | | | | | | | | | | ||||
| | * | | | | | | | | | | | | | | | | Backup for merge | Jose Antonio Marquez | 2012-04-04 | |
| | * | | | | | | | | | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into Document | Jose Antonio Marquez | 2012-04-02 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|/ / / / / / / | | | |/| | | | | | | | | | | | | | | ||||
| | * | | | | | | | | | | | | | | | | Setting up document rework | Jose Antonio Marquez | 2012-04-02 | |
| | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | ||||
| * | | | | | | | | | | | | | | | | typo fix | Valerio Virgillito | 2012-04-19 | |
| * | | | | | | | | | | | | | | | | initial stage web template | Valerio Virgillito | 2012-04-18 | |
* | | | | | | | | | | | | | | | | | Turn on width and height as tweenable properties | Jonathan Duran | 2012-04-24 | |
* | | | | | | | | | | | | | | | | | Fix Brush tool not broadcasting elementAdded event | Jonathan Duran | 2012-04-23 | |
* | | | | | | | | | | | | | | | | | Fix Pen Tool not broadcasting elementAdded event | Jonathan Duran | 2012-04-23 | |
* | | | | | | | | | | | | | | | | | Change sublayer property names to match css property names | Jonathan Duran | 2012-04-23 | |
* | | | | | | | | | | | | | | | | | Fix Select All bug and remove debuggers | Jonathan Duran | 2012-04-23 | |
* | | | | | | | | | | | | | | | | | Breadcrumb Fix | Kruti Shah | 2012-04-20 | |
* | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/timeline-local' into TimelineUber | Jonathan Duran | 2012-04-20 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | | | | | | | | | Timeline: More bug fixes for selection with multiple documents opening and | Jon Reid | 2012-04-19 | |
| * | | | | | | | | | | | | | | | | | Timeline: Bug fix: check for uninitialized currentDocument in intialization | Jon Reid | 2012-04-19 | |
| * | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local | Jon Reid | 2012-04-19 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | | | | | | | | | | Timeline: Bug fix: Maintain selection between document switching. | Jon Reid | 2012-04-19 | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-04-20 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | / / / / / / / / | | |_|_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | ||||
| * | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/master' into cleanup | Valerio Virgillito | 2012-04-19 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | | | | | | ||||
| * | | | | | | | | | | | | | | | | | cleanup unused code. | Valerio Virgillito | 2012-04-19 | |
* | | | | | | | | | | | | | | | | | | Merge branch 'timeline-local' of github.com:ntfx47/ninja-internal into Timeli... | Jonathan Duran | 2012-04-19 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | | | | | | | | | | BreadCrumb Bug Fix | Kruti Shah | 2012-04-19 | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-04-19 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / / / | |/| | / / / / / / / / / / / / / / / | |_|_|/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | ||||
| * | | | | | | | | | | | | | | | | | Merge pull request #168 from mqg734/EricMerge | Valerio Virgillito | 2012-04-19 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | ||||
| | * | | | | | | | | | | | | | | | | Moving initialzeSnapping routine from RotateObject3DTool tool to Rotate3DTool... | Nivesh Rajbhandari | 2012-04-18 | |
| | * | | | | | | | | | | | | | | | | Merge branch 'refs/heads/ninja-internal' into EricMerge | Nivesh Rajbhandari | 2012-04-18 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | ||||
| | * | | | | | | | | | | | | | | | | Fixing some more merge issues. | Nivesh Rajbhandari | 2012-04-18 | |
| | * | | | | | | | | | | | | | | | | Merge branch 'refs/heads/ninja-internal' into EricMerge | Nivesh Rajbhandari | 2012-04-18 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | | | ||||
| | * | | | | | | | | | | | | | | | | Merge branch 'refs/heads/Snapping_II' into EricMerge | Nivesh Rajbhandari | 2012-04-18 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| | | * | | | | | | | | | | | | | | | | Allow snapping to unselected objects | hwc4 |