aboutsummaryrefslogtreecommitdiff
path: root/js
Commit message (Expand)AuthorAge
* Squashed commit of the following:Jonathan Duran2012-02-09
* Fix layer/element selection on first click selectJonathan Duran2012-02-09
* Squashed commit of the following:Jonathan Duran2012-02-09
* Merge branch 'refs/heads/NINJAmaster' into TimelineJonathan Duran2012-02-09
|\
| * Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Wor...John Mayhew2012-02-09
| |\
| | * Merge pull request #24 from mencio/pi_bugsValerio Virgillito2012-02-08
| | |\
| | | * Correcting the PI lock for height which had a bug in the original pull request.Valerio Virgillito2012-02-08
| | | * Fix for the PI Lock button.Valerio Virgillito2012-02-08
| | * | Tree Components - css fixesEric Guzman2012-02-08
| | |/
| * / fixed error with initializing and accessing the ninja version object from the...John Mayhew2012-02-09
| |/
| * Merge pull request #21 from mencio/pi_bugsValerio Virgillito2012-02-08
| |\
| | * IKNINJA - 1084: Fixing the custom tag.Valerio Virgillito2012-02-07
| | * IKNINJA-616 - Drag and drop images fix for the PI and sourceValerio Virgillito2012-02-07
| | * IKNINJA-964 - Fixed inconsistent element name in PI/CSS panel.Valerio Virgillito2012-02-07
| * | Merge pull request #22 from ericguzman/StylesControllerUpdatesValerio Virgillito2012-02-08
| |\ \
| | * | Styles Controller - Added array of dirty stylesheets and event dispatch when ...Eric Guzman2012-02-08
| * | | Merge pull request #20 from mqg734/ToolFixesValerio Virgillito2012-02-08
| |\ \ \ | | |_|/ | |/| |
| | * | Added ability to toggle combobox's visibility so we can show/hide materials c...Nivesh Rajbhandari2012-02-07
| | * | id's must start with a letter, so our workaround for using uuid for RDGE canv...Nivesh Rajbhandari2012-02-07
| | * | Fixing some typos and undeclared variables in GLRectangle and ShapesController.Nivesh Rajbhandari2012-02-07
| | * | Supporting switching materials in the PI. Also, moved makeFillMaterial and ma...Nivesh Rajbhandari2012-02-07
| | * | Fixed PI to support WebGL materials.Nivesh Rajbhandari2012-02-07
| | * | Updated tools and PI to get/set materials by binding to appModel's materials ...Nivesh Rajbhandari2012-02-07
| | * | Merge branch 'refs/heads/ninja-internal' into ToolFixesNivesh Rajbhandari2012-02-07
| | |\|
| | * | Force layout canvas and SelectionController to update their info when a 2d ca...Nivesh Rajbhandari2012-02-06
| | * | Support toggling between 2d and 3d canvas context. This requires us to create...Nivesh Rajbhandari2012-02-06
| | * | Add enabled property for ComboBox to support enabling/disabling materials dro...Nivesh Rajbhandari2012-02-06
| | * | Allow users to switch between 2d and webGL mode. Note that this doesn't curre...Nivesh Rajbhandari2012-02-06
| | * | Support use WebGL checkbox in the PI.Nivesh Rajbhandari2012-02-06
| * | | Tree Components - Added copyright commentsEric Guzman2012-02-07
| | |/ | |/|
* | | Fixes for animation element assignmentJonathan Duran2012-02-09
* | | CleanupJonathan Duran2012-02-09
* | | Cleaning up more code and adding more models for timelineJonathan Duran2012-02-09
* | | Squashed commit of the following:Jonathan Duran2012-02-08
* | | Display time reading above layers and code clean upJonathan Duran2012-02-08
* | | Merge branch 'refs/heads/Timeline_updated' into TimelineJonathan Duran2012-02-08
|\ \ \
| * | | Numbering of layers between different selectedContainers starts from 1Kruti Shah2012-02-08
* | | | Squashed commit of the following:Jonathan Duran2012-02-08
* | | | Squashed commit of the following:Jonathan Duran2012-02-08
* | | | Squashed commit of the following:Jonathan Duran2012-02-08
|/ / /
* | | Merge branch 'refs/heads/Timeline-jreid' into TimelineJonathan Duran2012-02-08
|\ \ \
| * | | Timeline: restore method incorrectly removed in last commit.Jon Reid2012-02-08
* | | | Keyframe and span style updates and change time marker timesJonathan Duran2012-02-08
|/ / /
* | | Timeline: Feature: select first layer by default. Bug fix: Remove left panel ...Jon Reid2012-02-08
* | | Merge branch 'Timeline-jduran' into Timeline-jreidJon Reid2012-02-08
|\ \ \
| * \ \ Merge branch 'refs/heads/Timeline_updated' into TimelineJonathan Duran2012-02-08
| |\ \ \
| | * | | Timeline : Adding functionality to unable deletion when a single layer remain...Kruti Shah2012-02-07
| | * | | Timeline : Layers & DOM enchancementKruti Shah2012-02-07
| | * | | Timeline : Change in the Hooking up of DOM/LayersKruti Shah2012-02-06
| * | | | Layer Undo enhancementsJonathan Duran2012-02-07