| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | Revert "Fix Pen Tool not broadcasting elementAdded event" | Jonathan Duran | 2012-04-25 |
| | | | | | | | This reverts commit 0475cb7e37601366ec07d77fcea44269d3d49633. Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| * | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-04-24 |
| |\ | | | | | | | | | | | | | Conflicts: js/components/layout/bread-crumb.reel/bread-crumb.js Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| | * | 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 |
| | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | adjusting the bread crumb to work with the new template | Valerio Virgillito | 2012-04-23 |
| | | | | | | | | | | | | | | | | | | | Initial container get setup in ninja now. Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | more backup fixes for the old stage | Valerio Virgillito | 2012-04-20 |
| | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | reverting old template to current working status. New template work. | Valerio Virgillito | 2012-04-20 |
| | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | 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 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | | | | | | | | initial stage web template | Valerio Virgillito | 2012-04-18 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | | | | | | | | | Turn on width and height as tweenable properties | Jonathan Duran | 2012-04-24 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| * | | | | | | | | | | Fix Brush tool not broadcasting elementAdded event | Jonathan Duran | 2012-04-23 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| * | | | | | | | | | | Fix Pen Tool not broadcasting elementAdded event | Jonathan Duran | 2012-04-23 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| * | | | | | | | | | | Change sublayer property names to match css property names | Jonathan Duran | 2012-04-23 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| * | | | | | | | | | | Fix Select All bug and remove debuggers | Jonathan Duran | 2012-04-23 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| * | | | | | | | | | | Breadcrumb Fix | Kruti Shah | 2012-04-20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> | ||
| * | | | | | | | | | | 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 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | closing. | ||
| | * | | | | | | | | | | Timeline: Bug fix: check for uninitialized currentDocument in intialization | Jon Reid | 2012-04-19 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | routine. | ||
| | * | | | | | | | | | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local | Jon Reid | 2012-04-19 |
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js Used mine. | ||
| | * | | | | | | | | | | | 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 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | | | | | | | | | | | Merge branch 'timeline-local' of github.com:ntfx47/ninja-internal into ↵ | Jonathan Duran | 2012-04-19 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TimelineUber | ||
| | * | | | | | | | | | | | | BreadCrumb Bug Fix | Kruti Shah | 2012-04-19 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> | ||
| * | | | | | | | | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-04-19 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / | |/| | / / / / / / / / / | |_|_|/ / / / / / / / / |/| | | | | | | | | | | | |||
| | * | | | | | | | | | | | Merge pull request #168 from mqg734/EricMerge | Valerio Virgillito | 2012-04-19 |
| | |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / | |/| | | | | | | | | | | Merging Eric's snapping and tool fixes into master. | ||
| | | * | | | | | | | | | | Moving initialzeSnapping routine from RotateObject3DTool tool to ↵ | Nivesh Rajbhandari | 2012-04-18 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rotate3DToolBase so Rotate Stage uses the same code. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | | * | | | | | | | | | | Merge branch 'refs/heads/ninja-internal' into EricMerge | Nivesh Rajbhandari | 2012-04-18 |
| | | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | |/| | | | | | | | | |||
| | | * | | | | | | | | | | Fixing some more merge issues. | Nivesh Rajbhandari | 2012-04-18 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | </ | |||