aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
...
| | * | | | | | | | | | | | | | | | | | | | 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
|\| | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | Removed hack that required us to use a bogus url for host permissions. Chrome...John Mayhew2012-04-19
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge bran