aboutsummaryrefslogtreecommitdiff
path: root/js
Commit message (Collapse)AuthorAge
...
| | * | | | | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-localJon Reid2012-04-19
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js Used mine.
| | * | | | | | | Timeline: Bug fix: Maintain selection between document switching.Jon Reid2012-04-19
| | | | | | | | |
| * | | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-04-20
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | / | | | |_|_|_|_|/ | | |/| | | | |
| * | | | | | | Merge branch 'timeline-local' of github.com:ntfx47/ninja-internal into ↵Jonathan Duran2012-04-19
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | TimelineUber
| | * | | | | | | BreadCrumb Bug FixKruti Shah2012-04-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
| * | | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-04-19
| |\ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
| * | | | | | | | Remove more unneeded requiresJonathan Duran2012-04-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * | | | | | | | Remove unneeded requireJonathan Duran2012-04-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * | | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-04-19
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Remove TODOsJonathan Duran2012-04-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * | | | | | | | | Add flag for abs/rel positionJonathan Duran2012-04-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * | | | | | | | | FIX for layer selection when adding a keyframe in unselected layerJonathan Duran2012-04-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * | | | | | | | | Merge branch 'refs/heads/timeline-local' into TimelineUberJonathan Duran2012-04-18
| |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | |
| | * | | | | | | | Timeline: Bug fix: changing layer name didn't save in some circumstances.Jon Reid2012-04-17
| | | | | | | | | |
| | * | | | | | | | Timeline: Further fixes to new document/breadcrumb interactions.Jon Reid2012-04-17
| | | | | | | | | |
| * | | | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-04-18
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | Fix tweens not updating keyframe rulesJonathan Duran2012-04-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * | | | | | | | | Timeline: Bug fixes for restoring tweens on new document and breadcrumb.Jon Reid2012-04-13
| | | | | | | | | |
| * | | | | | | | | 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
| | | | | | |