aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
...
| | * | | | | | | change cursors for pen tool realtime feedback....still need to position the c...Pushkar Joshi2012-03-28
| | * | | | | | | Merge branch 'brushtool' into pentoolPushkar Joshi2012-03-28
| | |\ \ \ \ \ \ \
| | * | | | | | | | added cursors to the pen tool UI AND change cursor when the user hovers over ...Pushkar Joshi2012-03-27
* | | | | | | | | | Revert "Fix Pen Tool not broadcasting elementAdded event"Jonathan Duran2012-04-25
* | | | | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-04-24
|\| | | | | | | | |
| * | | | | | | | | Merge pull request #173 from mencio/stage-document-architectureValerio Virgillito2012-04-23
| |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ 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
| | | * | | | | | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into DocumentJose Antonio Marquez2012-03-28
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/Ninja-Internal' into DocumentJose Antonio Marquez2012-03-27
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/Ninja-Internal' into DocumentJose Antonio Marquez2012-03-26
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/Ninja-Internal' into DocumentJose Antonio Marquez2012-03-21
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/Ninja-Internal' into DocumentJose Antonio Marquez2012-03-16
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/Ninja-Internal' into DocumentJose Antonio Marquez2012-03-14
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/Ninja-Internal' into FileIOJose Antonio Marquez2012-03-09
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-04-23
|\| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Fixing the 3d stack for the youtube channel component.Valerio Virgillito2012-04-20
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Fixing the flow component to layout all the tiles on first draw.Valerio Virgillito2012-04-20
| * | | | | | | | | | | | | | | | | | | | | Merge pull request #172 from mayhewinator/WorkingBranchmayhewinator2012-04-20
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | fixed injection caused by inability to add our webRequest listener due to an ...John Mayhew2012-04-20
* | | | | | | | | | | | | | | | | | | | | | | 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 pull request #170 from mayhewinator/WorkingBranchmayhewinator2012-04-19
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / / |