aboutsummaryrefslogtreecommitdiff
path: root/js/panels
Commit message (Expand)AuthorAge
...
| | | * | | | | | | | | | | | | | Merge branch 'refs/heads/ninja-internal-master' into cut-copy-pasteAnanya Sen2012-06-13
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/ninja-internal-master' into cut-copy-pasteAnanya Sen2012-06-12
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | - removed extra selection change event,Ananya Sen2012-06-11
| | | | |_|_|_|_|_|_|_|_|_|_|_|/ / / | | | |/| | | | | | | | | | | | | |
| * | / | | | | | | | | | | | | | | FIx - can't delete keyframesJonathan Duran2012-06-22
| |/ / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | Merge pull request #321 from imix23ways/Timeline-merge-candidateValerio Virgillito2012-06-21
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/Timeline-local-kruti' into Timeline-merge-candidateJonathan Duran2012-06-21
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / / / / / / / / | | |/| | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | Sub Property ADding KEyframe fixedKruti Shah2012-06-21
| * | | | | | | | | | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into ColorJose Antonio Marquez2012-06-21
| |\| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | remove bad fileJonathan Duran2012-06-20
| | |/ / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-krutiKruti Shah2012-06-20
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-krutiKruti Shah2012-06-20
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-krutiKruti Shah2012-06-19
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | LockedElements - LayersKruti Shah2012-06-19
| | * | | | | | | | | | | | | | | | | | Layer LockKruti Shah2012-06-19
| | * | | | | | | | | | | | | | | | | | Lock ElementsKruti Shah2012-06-19
| | * | | | | | | | | | | | | | | | | | Lock ELementsKruti Shah2012-06-19
| | * | | | | | | | | | | | | | | | | | Locked Elements. Layer ControlsKruti Shah2012-06-19
| * | | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into ColorJose Antonio Marquez2012-06-20
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / / / / / / / / / | | |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Adding transparent background to color chip buttonsJose Antonio Marquez2012-06-20
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Timeline: Breadcrumb hash in currentDocument will now update as changesJon Reid2012-06-21
* | | | | | | | | | | | | | | | | | | Timeline: Bug fix: When creating a new file, Timeline was disabled.Jon Reid2012-06-21
* | | | | | | | | | | | | | | | | | | Timeline: Bug fix IKNINJA-1791 Double-clicking to go in a child level andJon Reid2012-06-21
* | | | | | | | | | | | | | | | | | | Timeline: Bug fix IKNINJA-1755 Can't insert keyframes in a CSS styleJon Reid2012-06-21
* | | | | | | | | | | | | | | | | | | Timeline: Bug fix IKNINJA-1783, Timeline panel is disabled when CSS file isJon Reid2012-06-21
* | | | | | | | | | | | | | | | | | | Timeline: Bug Fix: Document switching was doubling position tracks.Jon Reid2012-06-21
| |_|_|_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/timeline-local' into Timeline-merge-candidateJonathan Duran2012-06-20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Timeline: Bug fix: Keyframe animation now works with 3D elements.Jon Reid2012-06-20
| * | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'ninja-internal/master' into timeline-localJon Reid2012-06-20
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / | | |/| | | / / / / / / / / / / / / / | | |_|_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/NINJAmaster' into Timeline-merge-candidateJonathan Duran2012-06-20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internalValerio Virgillito2012-06-20
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Fixing logic to close color panel popupJose Antonio Marquez2012-06-19
| | | |_|_|_|_|_|/ / / / / / / / / | | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | remove the un-used css fileValerio Virgillito2012-06-20
| * | | | | | | | | | | | | | | | fixing the last instances of the old montage components in the css panelValerio Virgillito2012-06-20
| * | | | | | | | | | | | | | | | Merge branch 'refs/heads/master' into montage-v11-integrationValerio Virgillito2012-06-20
| |\| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | fixing the css bugs with montage v11Valerio Virgillito2012-06-18
| * | | | | | | | | | | | | | | | fixing the components.Valerio Virgillito2012-06-18
| * | | | | | | | | | | | | | | | Merge branch 'refs/heads/master' into montage-v11-integrationValerio Virgillito2012-06-18
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | updating the components and descriptor.json to support montage v.11Valerio Virgillito2012-06-17
* | | | | | | | | | | | | | | | | remove unneeded filesJonathan Duran2012-06-20
| |_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | remove obsolete functionsJonathan Duran2012-06-19
* | | | | | | | | | | | | | | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-localJon Reid2012-06-19
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_