aboutsummaryrefslogtreecommitdiff
path: root/js/panels
Commit message (Expand)AuthorAge
...
| | * | | | | | | | | | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-05-09
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Fix a bug in span splitting interaction and remove console logsJonathan Duran2012-05-11
| * | | | | | | | | | | | | | | | allow splitting existing spans with new keyframeJonathan Duran2012-05-11
| * | | | | | | | | | | | | | | | Timeline: Bug fix: tweens now hide when their container collapses.Jonathan Duran2012-05-10
| * | | | | | | | | | | | | | | | Some sub prop updatesJonathan Duran2012-05-10
| * | | | | | | | | | | | | | | | sub property additionsJonathan Duran2012-05-09
| * | | | | | | | | | | | | | | | Update timeline CSS to allow longer layer labels by defaultJonathan Duran2012-05-08
| * | | | | | | | | | | | | | | | Change sub property track arraysJonathan Duran2012-05-08
| * | | | | | | | | | | | | | | | more sub prop additionsJonathan Duran2012-05-04
| * | | | | | | | | | | | | | | | Merge branch 'refs/heads/TimelineUber' into TimelinePropsJonathan Duran2012-05-04
| |\| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Timeline: True drag-and-drop of keyframesJon Reid2012-05-04
| | * | | | | | | | | | | | | | | Timeline: Restore event handler for selectionChange.Jon Reid2012-05-04
| | * | | | | | | | | | | | | | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-localJon Reid2012-05-04
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | Timeline: More fixes to selection changing and document switching.Jon Reid2012-05-04
| | * | | | | | | | | | | | | | | | Timeline: More work on tween drag-and-dropJon Reid2012-05-03
| | * | | | | | | | | | | | | | | | Timeline: Bug fix: Master Duration not updating when all documents areJon Reid2012-05-03
| | * | | | | | | | | | | | | | | | Timeline: Initial keyframe drag-and-drop interaction.Jon Reid2012-05-01
| | * | | | | | | | | | | | | | | | Timeline: Expand/collapse state of layers now mantained across documentJon Reid2012-05-01
| * | | | | | | | | | | | | | | | | property track additions to serialization data objectJonathan Duran2012-05-04
| * | | | | | | | | | | | | | | | | Fix subproperty keyframe selectionJonathan Duran2012-05-04
| * | | | | | | | | | | | | | | | | update data bindings for subproperty tracksJonathan Duran2012-05-04
| * | | | | | | | | | | | | | | | | apply old stash to new branchJonathan Duran2012-05-03
| | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into ColorJose Antonio Marquez2012-06-20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internalValerio Virgillito2012-06-20
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | 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
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Adding transparent background to color chip buttonsJose Antonio Marquez2012-06-20
| |_|_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Fixing logic to close color panel popupJose Antonio Marquez2012-06-19
| |_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge pull request #298 from ericmueller/TexturesValerio Virgillito2012-06-19
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Removed Flat material from the materials libraryhwc4872012-06-15
| * | | | | | | | | | | | | | | Re-added Raiders materialhwc4872012-06-15
| * | | | | | | | | | | | | | | Re-added Paris materialhwc4872012-06-15
| * | | | | | | | | | | | | | | Added correct 'Cancel' behavior to the material editorhwc4872012-06-15
| * | | | | | | | | | | | | | | Material changes through the popup editor can effect multiple material instan...hwc4872012-06-15
| * | | | | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex...hwc4872012-06-14
| |\| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Fix for line color.hwc4872012-06-14
| * | | | | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex...hwc4872012-06-13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex...hwc4872012-06-13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex...hwc4872012-06-12
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Disabled the add, copy, and delete buttons in the material library panel. Al...hwc4872012-06-12
| * | | | | | | | | | | | | | | | material cleanup and rearchitecturehwc4872012-06-06
| * | | | | | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex...hwc4872012-06-05
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex...hwc4872012-06-04
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|<