aboutsummaryrefslogtreecommitdiff
path: root/js
Commit message (Collapse)AuthorAge
* Merge branch 'refs/heads/master' into CSSPanelUpdatesEric Guzman2012-03-14
|\
| * Merge pull request #117 from mencio/layout-fixValerio Virgillito2012-03-14
| |\ | | | | | | Layout Fixes and Canvas sized when panels are collapsed
| | * Fixing the layout to only draw one level and stage resize when the panels ↵Valerio Virgillito2012-03-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | are collapsed. Fixing the following bugs: IKNINJA-1068 Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * Some code cleanup - removing unused assignments.Valerio Virgillito2012-03-13
| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | Merge branch 'refs/heads/master' into CSSPanelUpdatesEric Guzman2012-03-13
|\| |
| * | Merge pull request #114 from mqg734/ToolFixesValerio Virgillito2012-03-13
| |\ \ | | |/ | |/| Fixed selection rectangle for multiple selection case.
| | * Fixed drawing of multiple selection bounds when in flat case.Nivesh Rajbhandari2012-03-13
| | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | Merge pull request #112 from ericguzman/PresetsPanelValerio Virgillito2012-03-13
| |\ \ | | | | | | | | Presets panel - Ninja-leaf hover state
| | * | Presets Panel - Re-add dbl-click activationEric Guzman2012-03-13
| | | |
| | * | Presets Panel - Remove :active pseudo class from ninja-leafEric Guzman2012-03-13
| | | |
| | * | Presets Panel - Add :active pseudo class for ninja-treeEric Guzman2012-03-13
| | | |
| | * | Presets Panel - Adding single-click activationEric Guzman2012-03-13
| | | |
| | * | Presets Panel - Adding hover state to ninja-leafEric Guzman2012-03-13
| | | |
| * | | Deleting temp folderJose Antonio Marquez2012-03-13
| | | |
| * | | Renaming folderJose Antonio Marquez2012-03-13
| | | |
| * | | Gradient stop logicJose Antonio Marquez2012-03-13
| | |/ | |/| | | | | | | Made logic changes to allow for a minimum number of gradients to remain at 2 at all times and not apply default colors.
* | | CSS Panel - Style updates for collapsing branchesEric Guzman2012-03-13
| | |
* | | CSS Panel - Add new panel to panel dataEric Guzman2012-03-13
| | |
* | | Merge branch 'refs/heads/master' into CSSPanelUpdatesEric Guzman2012-03-13
|\| | | | | | | | | | | | | | Conflicts: js/controllers/styles-controller.js
| * | Merge pull request #109 from imix23ways/TimelineUberValerio Virgillito2012-03-13
| |\ \ | | | | | | | | Timeline uber
| | * | Fix unassigned track element on document switchJonathan Duran2012-03-13
| | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| | * | Timeline : Fixing deleting the layers and hash table and removing while ↵Jonathan Duran2012-03-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | loops replacing with for loops Signed-off-by: Kruti Shah <kruti.shah@motorola.com> Signed-off-by: Jonathan Duran <jduran@motorola.com>
| | * | Merge branch 'refs/heads/Timeline-local' into TimelineUberJonathan Duran2012-03-12
| | |\ \
| | | * \ Merge remote-tracking branch 'ninja-jduran/TimelineUber' into Timeline-localJon Reid2012-03-09
| | | |\ \
| | | * | | Timeline: new enablePanel() method on TimelinePanel class.Jon Reid2012-03-09
| | | | | |
| | * | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-03-12
| | |\ \ \ \ | | | |_|/ / | | |/| | / | | | | |/ | | | |/|
| | * | | Squashed commit of the following:Jonathan Duran2012-03-09
| | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |