aboutsummaryrefslogtreecommitdiff
path: root/js/panels
Commit message (Expand)AuthorAge
* Merge branch 'tag-2.0' of github.com:mencio/ninja-internal into data-idValerio Virgillito2012-05-03
|\
| * Merge branch 'refs/heads/master' into tag-2.0Valerio Virgillito2012-05-03
| |\
| * \ Merge branch 'refs/heads/master' into tag-2.0Valerio Virgillito2012-05-03
| |\ \
| * | | Refactor creating elements. Removed makeNJElement and separated the model cre...Valerio Virgillito2012-05-03
| * | | code cleanupValerio Virgillito2012-05-02
* | | | Removing unused components referencesValerio Virgillito2012-05-03
* | | | Fixing the lock button cssValerio Virgillito2012-05-03
* | | | finishing to replace all id with data-montage-idValerio Virgillito2012-05-03
* | | | Merge branch 'refs/heads/master' into data-idValerio Virgillito2012-05-03
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge pull request #192 from ananyasen/Codeview-improvementsValerio Virgillito2012-05-03
| |\ \ \
| | * \ \ Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvementsAnanya Sen2012-05-03
| | |\ \ \ | | | | |/ | | | |/|
| | * | | Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvementsAnanya Sen2012-05-01
| | |\ \ \ | | | | |/ | | | |/|
| | * | | Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvementsAnanya Sen2012-04-26
| | |\ \ \
| | * \ \ \ Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvementsAnanya Sen2012-04-23
| | |\ \ \ \
| | * | | | | - collapse panels for code view, restore for design viewAnanya Sen2012-04-18
* | | | | | | Merge branch 'refs/heads/master' into data-idValerio Virgillito2012-05-03
|\| | | | | |
| * | | | | | Merge pull request #191 from imix23ways/TimelineUberValerio Virgillito2012-05-03
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| | * | | | | Timeline: bug fix: disable bread crumb setlevel.Jon Reid2012-04-30
| | * | | | | Timeline: Change serialization parameters for some component properties.Jon Reid2012-04-30
| | * | | | | Timeline: Replace id with data-montage-id in all reels.Jon Reid2012-04-27
| | | |_|_|/ | | |/| | |
| * / | | | Dom ManipulationKruti Shah2012-05-03
| |/ / / /
* | | | | 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