aboutsummaryrefslogtreecommitdiff
path: root/js/panels
Commit message (Expand)AuthorAge
* Merge branch 'Color' of https://github.com/joseeight/ninja-internal into data-idValerio Virgillito2012-05-03
|\
| * Changing ID to Montage-ID for Color PanelJose Antonio Marquez2012-05-03
* | Updating id to data-montage-id (and associated CSS, if necessary) in some of ...Nivesh Rajbhandari2012-04-30
|/
* Merge cleanupValerio Virgillito2012-04-27
* Merge branch 'refs/heads/serialization'Valerio Virgillito2012-04-27
|\
| * Merge branch 'stage-document-architecture' of https://github.com/mencio/ninja...Valerio Virgillito2012-04-26
| |\
| | * Merge branch 'refs/heads/master' into stage-document-architectureValerio Virgillito2012-04-26
| | |\
| | * \ Merge branch 'refs/heads/master' into stage-document-architectureValerio Virgillito2012-04-26
| | |\ \
| | * | | Fixing the element model and adding get elementValerio Virgillito2012-04-26
| * | | | Merge branch 'master' of https://github.com/mayhewinator/ninja-internal into ...Valerio Virgillito2012-04-26
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Removing all "module" declarations and replaced with "prototype" in preparati...John Mayhew2012-04-26
| | | |/ | | |/|
* | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-04-27
|\| | |
| * | | Merge pull request #178 from mqg734/PerspectiveFixValerio Virgillito2012-04-26
| |\ \ \ | | |/ / | |/| |
| | * | We don't currently support perspective values on individual elements, so remo...Nivesh Rajbhandari2012-04-26
| | |/
* | | Fix WEbGL not rendering on stage with timelineJonathan Duran2012-04-26
* | | Timeline: Deleting elements now deletes associated layers.Jon Reid2012-04-26
* | | Timeline: comment out a conditional debugger; re-enable layer name storage.Jon Reid2012-04-26
* | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-localJon Reid2012-04-26
|\ \ \
| * | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-04-26
| |\| |
| | * | Merge branch 'refs/heads/ninja-internal' into WebGLMaterialsNivesh Rajbhandari2012-04-25
| | |\|
| | * | Fixed materials editor popup not refreshing correctly.Nivesh Rajbhandari2012-04-16
* | | | Timeline: Decouple Timeline and Breadcrumb. Remove most document changeJon Reid2012-04-26
|/ / /
* | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-localJon Reid2012-04-25
|\ \ \
| * | | Timeline Bug Fix : 1541Kruti Shah2012-04-25
* | | | Timeline: Handling of multiselect of elements from stage.Jon Reid2012-04-25
* | | | Timeline: New tracking for multiple selected layers.Jon Reid2012-04-25
|/ / /
* | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-04-24
|\ \ \ | | |/ | |/|
| * | Merge branch 'refs/heads/master' into stage-document-architectureValerio Virgillito2012-04-23
| |\ \
| * | | Temporary fix for the PI and Stage when opening the new template.Valerio Virgillito2012-04-23
| * | | more backup fixes for the old stageValerio Virgillito2012-04-20
| * | | reverting old template to current working status. New template work.Valerio Virgillito2012-04-20
| * | | initial stage web templateValerio Virgillito2012-04-18
* | | | Turn on width and height as tweenable propertiesJonathan Duran2012-04-24
* | | | Change sublayer property names to match css property namesJonathan Duran2012-04-23
* | | | Fix Select All bug and remove debuggersJonathan Duran2012-04-23
* | | | Breadcrumb FixKruti Shah2012-04-20
* | | | Merge branch 'refs/heads/timeline-local' into TimelineUberJonathan Duran2012-04-20
|\ \ \ \
| * | | | Timeline: More bug fixes for selection with multiple documents opening andJon Reid2012-04-19
| * | | | Timeline: Bug fix: check for uninitialized currentDocument in intializationJon Reid2012-04-19
| * | | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-localJon Reid2012-04-19
| |\ \ \ \
| * | | | | Timeline: Bug fix: Maintain selection between document switching.Jon Reid2012-04-19
* | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-04-20
|\ \ \ \ \ \ | |_|/ / / / |/| | | / / | | |_|/ / | |/| | |
| * | | | cleanup unused code.Valerio Virgillito2012-04-19
| | |/ / | |/| |
* | | | Merge branch 'timeline-local' of github.com:ntfx47/ninja-internal into Timeli...Jonathan Duran2012-04-19
|\ \ \ \ | |_|/ / |/| | |
| * | | BreadCrumb Bug FixKruti Shah2012-04-19
* | | | Remove more unneeded requiresJonathan Duran2012-04-19
* | | | Remove unneeded requireJonathan Duran2012-04-19
* | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-04-19
|\ \ \ \ | | |/ / | |/| |
| * | | Squashed commit of the following:Valerio Virgillito2012-04-18
* | | | Remove TODOsJonathan Duran2012-04-18