aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
...
| | | | | | | | | | | | | | | | | | * | | | Timeline: Bug fix: problem with editing layers missing last letter in newJon Reid2012-04-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | value.
| | | | | | | | | | | | | | | | | | * | | | Timeline: Remove default style track.Jon Reid2012-04-13
| | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | * | | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-localJon Reid2012-04-13
| | | | | | | | | | | | | | | | | | |\ \ \ \
| | | | | | | | | | | | | | | | | | | * \ \ \ Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-04-13
| | | | | | | | | | | | | | | | | | | |\ \ \ \ | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | | | | |/| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | * | | | | Timeline: More bug fixes for document switching.Jon Reid2012-04-13
| | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | * | | | | Timeline: More bug fixes.Jon Reid2012-04-12
| | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | * | | | | Timeline: Bug fixes: Document switching between new documents now working.Jon Reid2012-04-12
| | | | | | | | | | | | | | | | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed problem with MasterDuration not being set correctly on document switch.
| | | | | | | | | | | | | | | | | | * | | | Timeline: Fixing the animated ElementKruti Shah2012-04-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
| | | | | | | | | | | | | | | | | | * | | | Timeline : Replace Element Taken Care ofKruti Shah2012-04-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
| | | | | | | | | | | | | | | | | | * | | | Merge branch 'refs/heads/timeline-local' into TimelineUberJonathan Duran2012-04-12
| | | | | | | | | | | | | | | | | | |\ \ \ \
| | | | | | | | | | | | | | | | | | | * \ \ \ Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-localJon Reid2012-04-11
| | | | | | | | | | | | | | | | | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js Used mine.
| | | | | | | | | | | | | | | | | | | * | | | | Timeline: Change Master Layer configuration menu to be on click; bug fix:Jon Reid2012-04-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Master Layer config menu does not scroll with layers. Bug fix: New layers do not take into account "show only animated layers" feature.
| | | | | | | | | | | | | | | | | | * | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-04-12
| | | | | | | | | | | | | | | | | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | |_|_|_|/ / / / / / | | | | | | | | | | | | | | |/| | | | | | | | |
| | | | | | | | | | | | | | | | | | * | | | | | Merge branch 'refs/heads/timeline-kruti-local' into TimelineUberJonathan Duran2012-04-12
| | | | | | | | | | | | | | | | | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | |_|/ / / / | | | | | | | | | | | | | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js Signed-off-by: Jonathan Duran <jduran@motorola.com>
| | | | | | | | | | | | | | | | | | | * | | | | Timeline:Changing function nameKruti Shah2012-04-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
| | | | | | | | | | | | | | | | | | * | | | | | More Absolute vs Relative changes and cleanupJonathan Duran2012-04-11
| | | | | | | | | | | | | | | | | | | |/ / / / | | | | | | | | | | | | | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| | | | | | | | | | | | | | | | | | * | | | | Timeline: Bug fix: Drag and Drop now working again.Jon Reid2012-04-10
| | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | * | | | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-localJon Reid2012-04-10
| | | | | | | | | | | | | | | | | | |\ \ \ \ \
| | | | | | | | | | | | | | | | | | | *