aboutsummaryrefslogtreecommitdiff
path: root/js/panels
Commit message (Expand)AuthorAge
* Timeline: Bug fixes: Document switching between new documents now working.Jon Reid2012-04-12
* Timeline: Fixing the animated ElementKruti Shah2012-04-12
* Timeline : Replace Element Taken Care ofKruti Shah2012-04-12
* Merge branch 'refs/heads/timeline-local' into TimelineUberJonathan Duran2012-04-12
|\
| * Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-localJon Reid2012-04-11
| |\
| * | Timeline: Change Master Layer configuration menu to be on click; bug fix:Jon Reid2012-04-11
* | | Merge branch 'refs/heads/timeline-kruti-local' into TimelineUberJonathan Duran2012-04-12
|\ \ \ | |_|/ |/| |
| * | Timeline:Changing function nameKruti Shah2012-04-12
* | | More Absolute vs Relative changes and cleanupJonathan Duran2012-04-11
| |/ |/|
* | Timeline: Bug fix: Drag and Drop now working again.Jon Reid2012-04-10
* | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-localJon Reid2012-04-10
|\ \
| * | Abs. vs. Rel. animation postion functionsJonathan Duran2012-04-10
| * | Merge branch 'refs/heads/timeline-local' into TimelineUberJonathan Duran2012-04-10
| |\ \
| * \ \ Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-04-10
| |\ \ \ | | |_|/ | |/| |
| | * | 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
| | | * | Undoing mistakes from auto-merge.Nivesh Rajbhandari2012-04-05
| | | * | Merge branch 'refs/heads/ToolFixes' into WebGLMaterialsNivesh Rajbhandari2012-04-04
| | | |\ \
| | | | * \ Merge branch 'refs/heads/WebGLFileIO' into ToolFixesNivesh Rajbhandari2012-04-04
| | | | |\ \
| | | | | * \ Merge branch 'refs/heads/EricSnapping' into WebGLFileIONivesh Rajbhandari2012-04-04
| | | | | |\ \
| | | | | | * | merge from mainhwc4872012-03-29
| | | | * | | | Styling PI's Materials edit button.Nivesh Rajbhandari2012-04-04
| | | * | | | | Merge branch 'refs/heads/ninja-internal' into WebGLMaterialsNivesh Rajbhandari2012-03-27
| | | |\ \ \ \ \
| | | * | | | | | Adding logic for flatten checkbox in PI.Nivesh Rajbhandari2012-03-24
| | | * | | | | | Tweaking some styles in the materials popup.Nivesh Rajbhandari2012-03-23
| | | * | | | | | IKNINJA-758 - The rotation value of the stage is not updated in the propertie...Nivesh Rajbhandari2012-03-22
* | | | | | | | | Timeline: New files.Jon Reid2012-04-10
* | | | | | | | | Timeline: New Features: Tag name now present in each layer. ConfigurationJon Reid2012-04-10
| |_|_|_|_|_|_|/ |/| | | | | | |
* | | | | | | | Timeline: Bug fix, IKNINJA 1467, "Timeline: Changing layer names should notJon Reid2012-04-09
|/ / / / / / /
* | | | | | | Timeline : Deleting of layers. And master duration track updating with deleti...Kruti Shah2012-04-06
* | | | | | | Merge branch 'refs/heads/timeline-local' into TimelineUberJonathan Duran2012-04-06
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-localJon Reid2012-04-05
| |\ \ \ \ \ \ \
| * | | | | | | | Timeline: Improved drag-and-drop performance. Also fix problems withJon Reid2012-04-05
| * | | | | | | | Timeline: Bit of code cleanup in Layer.jsJon Reid2012-04-05
| * | | | | | | | Timeline: Bug fix: IKNINJA-1435Jon Reid2012-04-05
| * | | | | | | | Timeline: Bug fix for IKNINJA-1086, "CSS Style Suggestion stops working"Jon Reid2012-04-05
* | | | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-04-06
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | / / / / / / | | |/ / / / / / | |/| | | | | |
| * | | | | | | fixing the number fields to not have units.Valerio Virgillito2012-04-04
| * | | | | | | Merge branch 'refs/heads/master' into componentsValerio Virgillito2012-04-04
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | |
| * | | | | | | completing the component simple piValerio Virgillito2012-03-30
| * | | | | | | IKNINJA-1191 - Fixed the order of the componentsValerio Virgillito2012-03-30
| * | | | | | | Merge branch 'refs/heads/master' into componentsValerio Virgillito2012-03-28
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| * | | | | | | Cleanup of the components panelValerio Virgillito2012-03-26
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-04-05
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | / / / | |_|_|/ / / |/| | | | |
| * | | | | Merge pull request #149 from dhg637/BugFixesValerio Virgillito2012-04-04
| |\ \ \ \ \
| | * \ \ \ \ Merge branch 'refs/heads/master' into BugFixesArmen Kesablyan2012-04-04
| | |\ \ \ \ \
| | * | | | | | Resizing BugsArmen Kesablyan2012-03-29
| | * | | | | | Bug #1073: Panels interact with hottest drag dropArmen Kesablyan2012-03-28
| | | |_|/ / / | | |/| | | |
| * | | | | | Merge branch 'refs/heads/master' into PresetsPIEric Guzman2012-04-04
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |