aboutsummaryrefslogtreecommitdiff
path: root/js/panels
Commit message (Expand)AuthorAge
* Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-05-11
|\
| * Removing obsolete treeList reference in preset templates.Nivesh Rajbhandari2012-05-11
| * Removing outdated tree-controller.Nivesh Rajbhandari2012-05-11
* | Timeline: Bug fixes for keyframe drag and drop.Jon Reid2012-05-09
* | Merge branch 'refs/heads/timeline-local' into TimelineUberJonathan Duran2012-05-09
|\ \
| * | Timeline: Automatic scrolling during dragging of keyframes.Jon Reid2012-05-08
| * | Timeline: Bug fix: Account for horizontal scroll when dragging keyframes.Jon Reid2012-05-08
| * | Timeline: Update drag and drop handlers to be unique for drag and drop type.Jon Reid2012-05-08
| * | Timeline: Move keyframe dragover and drop listeners to TimelinePanel forJon Reid2012-05-07
* | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-05-09
|\ \ \ | |/ / |/| / | |/
| * Fixing the color popupValerio Virgillito2012-05-04
| * temporary commenting a timeline bug preventing nested selectionValerio Virgillito2012-05-04
| * 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 branch 'refs/heads/master' into data-idValerio Virgillito2012-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
| |/ / / /
* | | | | 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
| | |_|/ / | |/| | |
| * | | | 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 pull request #191 from imix23ways/TimelineUberValerio Virgillito2012-05-03
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Dom ManipulationKruti Shah2012-05-03
| | |_|_|_|/ | |/| | | |
* | | | | | 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
| |/ / / / |/| | | |
* | | | | 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
|/ / / /
* | | | 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