aboutsummaryrefslogtreecommitdiff
path: root/js/panels
Commit message (Expand)AuthorAge
...
| * | | | | | | | | | | | Merge branch 'Timeline-latest-change' of github.com:ntfx47/ninja-internal int...Jonathan Duran2012-03-27
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Timeline : Zoom Slider StylingKruti Shah2012-03-27
| | * | | | | | | | | | | | Timeline : Breadcrumb FixKruti Shah2012-03-26
| | * | | | | | | | | | | | Timeline : Adding Zoom SliderKruti Shah2012-03-26
| * | | | | | | | | | | | | Timeline: Change dragIcon to be a data-uri.Jon Reid2012-03-26
| * | | | | | | | | | | | | Timeline: Drag and Drop of layers.Jon Reid2012-03-26
| * | | | | | | | | | | | | Remove console logsJonathan Duran2012-03-26
| * | | | | | | | | | | | | Fix bug with track properties getting over writtenJonathan Duran2012-03-26
| |/ / / / / / / / / / / /
| * | | | | | | | | | | | Timeline : Bug Fix : IKNINJA 1374Jonathan Duran2012-03-23
| * | | | | | | | | | | | Merge branch 'refs/heads/Timeline-local' into TimelineUberJonathan Duran2012-03-23
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Timeline: First integration of drag and drop of layers.Jon Reid2012-03-21
| | * | | | | | | | | | | | Timeline: Bug fix: style collapsers not staying in synch. Also, removed conso...Jon Reid2012-03-21
| | * | | | | | | | | | | | Fix: Change click handler to mousedown for better responsiveness in layer sel...Jon Reid2012-03-21
| | * | | | | | | | | | | | Timeline: fix layer and style select problems.Jon Reid2012-03-20
| | * | | | | | | | | | | | Timeline: Re-enable adding/removing styles to layers. New methods in Timeline...Jon Reid2012-03-19
| * | | | | | | | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-03-23
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Fix layer order and selection on reopenJonathan Duran2012-03-16
| * | | | | | | | | | | | | Merge branch 'refs/heads/Timeline-local' into TimelineDOMJonathan Duran2012-03-16
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'Timeline-local' into Timeline-local-2Jon Reid2012-03-16
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'ninja-jduran/TimelineUber' into Timeline-localJon Reid2012-03-16
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | Timeline: Hook up data binding for changes on subproperties.Jon Reid2012-03-16
| | | * | | | | | | | | | | | | | Timeline: remove comment.Jon Reid2012-03-15
| | | * | | | | | | | | | | | | | Timeline: Remove selection timer on add new layer method.Jon Reid2012-03-15
| | | * | | | | | | | | | | | | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into Timeline-localJon Reid2012-03-15
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | Timeline: Fix for layer selection problems on file open and switch.Jon Reid2012-03-15
| * | | | | | | | | | | | | | | | | Consolidate conversion functionsJonathan Duran2012-03-16
| * | | | | | | | | | | | | | | | | CleanupJonathan Duran2012-03-16
| |/ / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | Bug fix and cleanupJonathan Duran2012-03-16
| * | | | | | | | | | | | | | | | Fix layer select on selection changeJonathan Duran2012-03-16
| * | | | | | | | | | | | | | | | Start enforcing one element per layerJonathan Duran2012-03-16
| | |_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvementsAnanya Sen2012-04-26
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge branch 'refs/heads/ninja-internal' into WebGLMaterialsNivesh Rajbhandari2012-04-25
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | | 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
| | | |_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | | Fixed materials editor popup not refreshing correctly.Nivesh Rajbhandari2012-04-16
| | |_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvementsAnanya Sen2012-04-23
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | cleanup unused code.Valerio Virgillito2012-04-19
| | |/ / / / / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Squashed commit of the following:Valerio Virgillito2012-04-18
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
* / | | | | | | | | | | - collapse panels for code view, restore for design viewAnanya Sen2012-04-18
|/ / / / / / / / / / /
* | | | | | | | | | | Merge pull request #165 from mqg734/BoundsCalculationValerio Virgillito2012-04-17
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Drag and drop of images and components should not add 3d values by default.Nivesh Rajbhandari2012-04-16
| |/ / / / / / / / / /
* | | | | | | | | | | collapsing the history panel by default and commenting out the undo for the 3...Valerio Virgillito2012-04-13
* | | | | | | | | | | setAttribute added to the undo/redoValerio Virgillito2012-04-09
* | | | | | | | | | | adding a history panelValerio Virgillito2012-04-09
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #159 from mqg734/WebGLMaterialsValerio Virgillito2012-04-09
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
| * | | | | | | | | Undoing bad auto-merge resize-composer.js.Nivesh Rajbhandari2012-04-05
| * | | | | | | | | Undoing some minor spacing differences from auto-merge.Nivesh Rajbhandari2012-04-05