aboutsummaryrefslogtreecommitdiff
path: root/js
Commit message (Collapse)AuthorAge
* Merge branch 'refs/heads/ninja-internal' into ToolFixesNivesh Rajbhandari2012-03-13
|\
| * Merge dhg637 DisabledState into master.Valerio Virgillito2012-03-12
| | | | | | | | | | | | Committing Disabled states for tool-bar, tool-options, viewbar, breadcrumb Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * Committing Disabled states for tool-bar, tool-options, viewbar, breadcrumbArmen Kesablyan2012-03-12
| | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
* | Fixing selection tool when moving multiple selection in 3d mode.Nivesh Rajbhandari2012-03-12
| | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | Fixing snapping bugs in Selection, translate and rotate tools.Nivesh Rajbhandari2012-03-12
|/ | | | | | | We should show snap marker on mouse move for selection tool prior to mousing down as well. We should create drag plane parallel to the view and where the user moused down. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* reverting old pi dataValerio Virgillito2012-03-09
| | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* Temp Gradient FixJose Antonio Marquez2012-03-09
| | | | Temporary fix for getting gradient mode.
* Merge branch 'refs/heads/Ninja-Internal' into ColorJose Antonio Marquez2012-03-09
|\
| * Merge pull request #102 from dhg637/PanelsValerio Virgillito2012-03-08
| |\ | | | | | | Fixed Some Calculation issues and bugs & appended disabled state when no documents exist
| | * Disabled state for panelsArmen Kesablyan2012-03-07
| | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | * Reordering and resizing now worksArmen Kesablyan2012-03-07
| | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | * Fixed: Collapsed panels would collapse panels belowArmen Kesablyan2012-03-07
| | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | * Fixed Collapsing and resizing window with panelsArmen Kesablyan2012-03-07
| | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| * | IKNINJA-1270: fixed browser crashing when you close a document while playing ↵Ananya Sen2012-03-08
| | | | | | | | | | | | | | | | | | a video Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | Merge pull request #100 from imix23ways/TimelineUberValerio Virgillito2012-03-08
| |\ \ | | | | | | | | Timeline uber
| | * | Timeline Bug Fix: IKNINJA-1283Kruti Shah2012-03-07
| | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
| | * | Merge branch 'refs/heads/Timeline-b4-latest' into TimelineUberJonathan Duran2012-03-06
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js Signed-off-by: Jonathan Duran <jduran@motorola.com>
| | | * | Timeline: Storing Hashtable for element MappingKruti Shah2012-03-06
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
| | | * | Timeline:Storing HashTable for switching docsKruti Shah2012-03-06
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
| | | * | Timeline: Fixing the layer switchingKruti Shah2012-03-05
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
| | | * | Timeline: Removing Events for Adding and Deleting Layer, Taking care of ↵Kruti Shah2012-03-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BreadCrumb Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
| | * | | Merge branch 'Timeline-uber' into timeline-serializedJon Reid2012-03-06
| | |\ \ \
| | | * \ \ Merge remote-tracking branch 'ninja-jduran/TimelineUber' into Timeline-uberJon Reid2012-03-06
| | | |\ \ \
| | | | * \ \ Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-03-06
| | | | |\ \ \
| | * | | | | | Timeline: Code cleanup. Fix bug with unfound property in serialization.Jon Reid2012-03-06
| | | | | | | |
| | * | | | | | Merge branch 'Timeline-uber' into timeline-serializedJon Reid2012-03-06
| | |\| | | | |
| | | * | | | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into Timeline-uberJon Reid2012-03-06
| | | |\ \ \ \ \
| | | | * | | | | Squashed commit of the following:Jonathan Duran2012-03-06
| | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 1cd89d4d06e3a8f2c221628b19cf26a2c69f5d3f Author: Jose Antonio Marquez <kgq387@motorola.com> Date: Tue Mar 6 11:24:25 2012 -0800 Fixing WebGL not available bug commit 84332ab81c1b445195f1d9be8bbeae0725c8e758 Author: Valerio Virgillito <valerio@motorola.com> Date: Tue Mar 6 10:58:25 2012 -0800 Squashed commit of preload-fix into Master - Requiring all the previously pre-loaded files - RDGE, Codemirror and gl-matrix are not included via a script tag. Signed-off-by: Valerio Virgillito <valerio@motorola.com> commit 13f52cf0c74f53a919fa864f86669e8155f82961 Merge: dced508 abc04f3 Author: Valerio Virgillito <valerio@motorola.com> Date: Fri Mar 2 15:46:11 2012 -0800 Merge pull request #93 from imix23ways/Timeline Timeline: Critical bug fixes commit dced508bb19a7bcd467ff1b86b5df5bbec4be794 Merge: 0aeb400 cc772ef Author: Valerio Virgillito <valerio@motorola.com> Date: Fri Mar 2 15:45:35 2012 -0800 Merge pull request #92 from mqg734/WebGLFixes Selection Tool Fixes for elements flying off into space when they overlap commit 0aeb