aboutsummaryrefslogtreecommitdiff
path: root/js/panels
Commit message (Expand)AuthorAge
* Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into int...hwc4872012-03-06
|\
| * Merge branch 'refs/heads/master' into panelsValerio Virgillito2012-03-06
| |\
| | * Squashed commit of preload-fix into MasterValerio Virgillito2012-03-06
| * | Adding drag and dropValerio Virgillito2012-03-05
| * | remove console logValerio Virgillito2012-03-05
| * | removing repetition from the panel container and using a static list of panels.Valerio Virgillito2012-03-05
| |/
| * Merge pull request #93 from imix23ways/TimelineValerio Virgillito2012-03-02
| |\
| | * Timeline Fix timing functionJonathan Duran2012-03-02
| | * Timeline: Fix for animation iteration countJonathan Duran2012-03-02
| * | Presets Panel - Fix single-click activation, and transition cut-off bug.Eric Guzman2012-03-02
* | | Timeline Fix for layer/element selectionJonathan Duran2012-03-06
* | | Support writing and reading of animation duration with millsecondsJonathan Duran2012-03-02
* | | Timeline Fix timing functionJonathan Duran2012-03-02
* | | Timeline: Fix for animation iteration countJonathan Duran2012-03-02
* | | Remove console logJonathan Duran2012-03-02
* | | CleanupJonathan Duran2012-03-02
* | | Start looping over tweened properties genericallyJonathan Duran2012-03-02
* | | Timeline bug fixes and cleanupJonathan Duran2012-03-01
* | | Fix for selection change event handlerJonathan Duran2012-03-01
* | | Merge branch 'refs/heads/Timeline-local' into TimelineUberJonathan Duran2012-03-01
|\ \ \ | |_|/ |/| |
| * | Timeline: Merge arrlayers and arrtracks into one object.Jon Reid2012-03-01
* | | Merge branch 'refs/heads/NINJAmaster' into TimelineJonathan Duran2012-03-01
|\ \ \ | |/ / |/| / | |/
| * Merge branch 'refs/heads/master' into stage-fixesValerio Virgillito2012-03-01
| |\
| | * Squashed commit of the workspace-bugsValerio Virgillito2012-03-01
| * | stage and elements fixesValerio Virgillito2012-03-01
| |/
| * Merge branch 'integration-candidate' of github.com:Motorola-Mobility/ninja-in...Valerio Virgillito2012-02-29
| |\
| * \ Merge branch 'NiveshColor' of https://github.com/mqg734/ninja-internal into i...Valerio Virgillito2012-02-29
| |\ \
| | * | We need to remove color buttons from the color model when updating the PI for...Nivesh Rajbhandari2012-02-28
| * | | putting the color panel on top when opening ninjaValerio Virgillito2012-02-28
| * | | minor fix for handling selections on switch documentAnanya Sen2012-02-28
| * | | persist selections while switching documentsAnanya Sen2012-02-28
* | | | Merge branch 'Timeline-main' into Timeline-localJon Reid2012-03-01
|\ \ \ \
| * | | | Set doc dirty flag when adding tweens or modifying animationsJonathan Duran2012-03-01
| * | | | Update master track on duration change instead of tween add.Jonathan Duran2012-03-01
| * | | | Timeline: Track Duration FixJonathan Duran2012-03-01
* | | | | Timeline: efficiency improvements to collapser. Document switching.Jon Reid2012-03-01
* | | | | Timeline: Merge. Set collapser heights.Jon Reid2012-03-01
* | | | | Merge branch 'Timeline-main' into Timeline-newdocJon Reid2012-03-01
|\| | | |
| * | | | Squashed commit of the following:Jonathan Duran2012-02-29
| * | | | Merge branch 'Timeline-b2-latest' of github.com:ntfx47/ninja-internal into Ti...Jonathan Duran2012-02-29
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Timeline:Revert back to earlier codeKruti Shah2012-02-29
| | * | | TImeline: CleanupKruti Shah2012-02-29
| | * | | Timeline: Changed the variables names to resolve issues.And removed the alert.Kruti Shah2012-02-29
| * | | | Squashed commit of the following:Jonathan Duran2012-02-29
| |/ / /
* | | | Timeline: Document switching and code restructuring.Jon Reid2012-03-01
* | | | Merge remote-tracking branch 'ninja-jduran/Timeline' into Timeline-newdocJon Reid2012-02-29
|\| | |
| * | | Merge branch 'Timeline-b2-latest' of github.com:ntfx47/ninja-internal into Ti...Jonathan Duran2012-02-29
| |\ \ \ | | |/ / | |/| |
| | * | Timeline: Fix Selection , Partially Fix adding element to an already animated...Kruti Shah2012-02-28
* | | | Timeline: document switching + new document.Jon Reid2012-02-29
|/ / /
* | | Merge branch 'refs/heads/NINJAmaster' into TimelineJonathan Duran2012-02-28
|\ \ \ | |/ / |/| / | |/