aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge branch 'refs/heads/Ninja-Internal' into DocumentJose Antonio Marquez2012-03-14
|\
| * Merge pull request #116 from joseeight/ColorValerio Virgillito2012-03-14
| |\
| | * Temp Fix for: IKNINJA-1078Jose Antonio Marquez2012-03-13
| * | Removing the obsolete modalContainer div.Valerio Virgillito2012-03-14
| * | Merge pull request #117 from mencio/layout-fixValerio Virgillito2012-03-14
| |\ \
| | * | Fixing the layout to only draw one level and stage resize when the panels are...Valerio Virgillito2012-03-13
| | * | Some code cleanup - removing unused assignments.Valerio Virgillito2012-03-13
| * | | Merge pull request #114 from mqg734/ToolFixesValerio Virgillito2012-03-13
| |\ \ \ | | |/ / | |/| |
| | * | Fixed drawing of multiple selection bounds when in flat case.Nivesh Rajbhandari2012-03-13
| | * | Merge branch 'refs/heads/ninja-internal' into ToolFixesNivesh Rajbhandari2012-03-13
| | |\ \
| | * \ \ Merge branch 'refs/heads/ninja-internal' into ToolFixesNivesh Rajbhandari2012-03-13
| | |\ \ \
| | * | | | Fixing selection tool when moving multiple selection in 3d mode.Nivesh Rajbhandari2012-03-12
| | * | | | Fixing snapping bugs in Selection, translate and rotate tools.Nivesh Rajbhandari2012-03-12
| | * | | | Merge branch 'refs/heads/ninja-internal' into ToolFixesNivesh Rajbhandari2012-03-12
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'refs/heads/ninja-internal' into ToolFixesNivesh Rajbhandari2012-03-02
| | |\ \ \ \ \
| * | \ \ \ \ \ Merge pull request #112 from ericguzman/PresetsPanelValerio Virgillito2012-03-13
| |\ \ \ \ \ \ \
| | * | | | | | | 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
| | | |_|_|/ / / | | |/| | | | |
| * | | | | | | Merge pull request #115 from joseeight/ColorValerio Virgillito2012-03-13
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| | * | | | | | Deleting temp folderJose Antonio Marquez2012-03-13
| | * | | | | | Renaming folderJose Antonio Marquez2012-03-13
| * | | | | | | Merge pull request #113 from joseeight/ColorValerio Virgillito2012-03-13
| |\| | | | | | | | |_|_|_|_|/ | |/| | | | |
| | * | | | | Gradient stop logicJose Antonio Marquez2012-03-13
| |/ / / / /
| * | | | | Merge pull request #109 from imix23ways/TimelineUberValerio Virgillito2012-03-13
| |\ \ \ \ \
| | * | | | | Fix unassigned track element on document switchJonathan Duran2012-03-13
| | * | | | | Timeline : Fixing deleting the layers and hash table and removing while loops...Jonathan Duran2012-03-12
| | * | | | | 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
| | * | | | | | Merge branch 'refs/heads/Timeline-local' into TimelineUberJonathan Duran2012-03-09
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | |
| | | * | | | | Timeline: Fixes for deleting layers, layer selection, persisting layer name e...Jon Reid2012-03-09
| | * | | | | | Merge branch 'refs/heads/Timeline-local' into TimelineUberJonathan Duran2012-03-09
| | |\| | | | |
| | | * | | | | Timeline: Fix for Open/close/switch document problems. Partial fix for select...Jon Reid2012-03-09
| | * | | | | | Squashed commit of the following:Jonathan Duran2012-03-09
| | * | | | | | remove console log and cleanupJonathan Duran2012-03-08
| | * | | | | | Merge branch 'refs/heads/SerialKiller' into TimelineUberJonathan Duran2012-03-08
| | |\| | | | |
| | | * | | | | Squashed commit of the following:Jonathan Duran2012-03-08
| | | * | | | | Timeline: Fixes for layer numbering problem, document switching events.Jon Reid2012-03-08
| | | * | | | | Merge remote-tracking branch 'ninja-kruti/SerialKiller-branch1' into Timeline...Jon Reid2012-03-08
| | | |\ \ \ \ \
| | | | * | | | | Timeline : Changing the order of the arrLayers being builtKruti Shah2012-03-08
| | | * | | | | | Merge remote-tracking branch 'ninja-jduran/SerialKiller' into Timeline-localJon Reid2012-03-08
| | | |\| | | | |
| | | | * | | | | Remove unnecessary needsDraw callsJonathan Duran2012-03-08
| | | * | | | | | Merge branch 'Timeline-serialkiller' into Timeline-localJon Reid2012-03-07
| | | |\| | | | |
| | | | * | | | | cleanupJonathan Duran2012-03-07
| | | | * | | | | Bigfixes and cleanup from optimizationJonathan Duran2012-03-07