aboutsummaryrefslogtreecommitdiff
path: root/js/panels
Commit message (Collapse)AuthorAge
* More implementation of moving color chips to the individual subtools.John Mayhew2012-05-07
| | | | | | | | | Removed the tool color bar Added new icons for inkbottle Removed Pencil tool Removed Inkbottle tool Added chips to the pen, brush and tag tools Aligned controls in several subtools
* First round of moving color chips into the sub tools. Shape and Pen tool now ↵John Mayhew2012-05-03
| | | | have chips in the sub tool bar. Still need to complete adding chips to the Brush tool and finalizing the subtool bar layout to our spec for all of the subtools.
* Merge cleanupValerio Virgillito2012-04-27
| | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* Merge branch 'refs/heads/serialization'Valerio Virgillito2012-04-27
|\
| * Merge branch 'stage-document-architecture' of ↵Valerio Virgillito2012-04-26
| |\ | | | | | | | | | https://github.com/mencio/ninja-internal into serialization
| | * Merge branch 'refs/heads/master' into stage-document-architectureValerio Virgillito2012-04-26
| | |\
| | * \ Merge branch 'refs/heads/master' into stage-document-architectureValerio Virgillito2012-04-26
| | |\ \
| | * | | Fixing the element model and adding get elementValerio Virgillito2012-04-26
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | Merge branch 'master' of https://github.com/mayhewinator/ninja-internal into ↵Valerio Virgillito2012-04-26
| |\ \ \ \ | | |_|_|/ | |/| | | | | | | | serialization
| | * | | Removing all "module" declarations and replaced with "prototype" in ↵John Mayhew2012-04-26
| | | |/ | | |/| | | | | | | | | preparation for montage converting to the new "prototype" format fully
* | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-04-27
|\| | |
| * | | Merge pull request #178 from mqg734/PerspectiveFixValerio Virgillito2012-04-26
| |\ \ \ | | |/ / | |/| | IKNINJA-1511 - We don't currently support perspective values on individual elements, so removing perspective values from the animation presets.
| | * | We don't currently support perspective values on individual elements, so ↵Nivesh Rajbhandari2012-04-26
| | |/ | | | | | | | | | | | | | | | removing perspective values from the animation presets. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | Fix WEbGL not rendering on stage with timelineJonathan Duran2012-04-26
| | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | Timeline: Deleting elements now deletes associated layers.Jon Reid2012-04-26
| | |
* | | Timeline: comment out a conditional debugger; re-enable layer name storage.Jon Reid2012-04-26
| | |
* | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-localJon Reid2012-04-26
|\ \ \
| * | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-04-26
| |\| |
| | * | Merge branch 'refs/heads/ninja-internal' into WebGLMaterialsNivesh Rajbhandari2012-04-25
| | |\|
| | * | Fixed materials editor popup not refreshing correctly.Nivesh Rajbhandari2012-04-16
| | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | | Timeline: Decouple Timeline and Breadcrumb. Remove most document changeJon Reid2012-04-26
|/ / / | | | | | | | | | event handlers. Bind Timeline to currentSelectedElement. Various bug fixes.
* | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-localJon Reid2012-04-25
|\ \ \
| * | | Timeline Bug Fix : 1541Kruti Shah2012-04-25
| | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
* | | | Timeline: Handling of multiselect of elements from stage.Jon Reid2012-04-25
| | | |
* | | | Timeline: New tracking for multiple selected layers.Jon Reid2012-04-25
|/ / /
* | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-04-24
|\ \ \ | | |/ | |/| | | | | | | | | | | | | Conflicts: js/components/layout/bread-crumb.reel/bread-crumb.js Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * | Merge branch 'refs/heads/master' into stage-document-architectureValerio Virgillito2012-04-23
| |\ \
| * | | Temporary fix for the PI and Stage when opening the new template.Valerio Virgillito2012-04-23
| | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | more backup fixes for the old stageValerio Virgillito2012-04-20
| | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | reverting old template to current working status. New template work.Valerio Virgillito2012-04-20
| | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | initial stage web templateValerio Virgillito2012-04-18
| | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | Turn on width and height as tweenable propertiesJonathan Duran2012-04-24
| | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | | Change sublayer property names to match css property namesJonathan Duran2012-04-23
| | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | | Fix Select All bug and remove debuggersJonathan Duran2012-04-23
| | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | | Breadcrumb FixKruti Shah2012-04-20
| | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
* | | | Merge branch 'refs/heads/timeline-local' into TimelineUberJonathan Duran2012-04-20
|\ \ \ \
| * | | | Timeline: More bug fixes for selection with multiple documents opening andJon Reid2012-04-19
| | | | | | | | | | | | | | | | | | | | closing.
| * | | | Timeline: Bug fix: check for uninitialized currentDocument in intializationJon Reid2012-04-19
| | | | | | | | | | | | | | | | | | | | routine.
| * | | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-localJon Reid2012-04-19
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js Used mine.
| * | | | | Timeline: Bug fix: Maintain selection between document switching.Jon Reid2012-04-19
| | | | | |
* | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-04-20
|\ \ \ \ \ \ | |_|/ / / / |/| | | / / | | |_|/ / | |/| | |
| * | | | cleanup unused code.Valerio Virgillito2012-04-19
| | |/ / | |/| | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | Merge branch 'timeline-local' of github.com:ntfx47/ninja-internal into ↵Jonathan Duran2012-04-19
|\ \ \ \ | |_|/ / |/| | | | | | | TimelineUber
| * | | BreadCrumb Bug FixKruti Shah2012-04-19
| | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
* | | | Remove more unneeded requiresJonathan Duran2012-04-19
| | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | | Remove unneeded requireJonathan Duran2012-04-19
| | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-04-19
|\ \ \ \ | | |/ / | |/| |
| * | | Squashed commit of the following:Valerio Virgillito2012-04-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 2054551bfb01a0f4ca2e138b9d724835462d45cd Merge: 765c2da 616a853 Author: Valerio Virgillito <valerio@motorola.com> Date: Wed Apr 18 13:48:21 2012 -0700 Merge branch 'refs/heads/master' into integration commit 765c2da8e1aa03550caf42b2bd5f367555ad2843 Author: Valerio Virgillito <valerio@motorola.com> Date: Tue Apr 17 15:29:41 2012 -0700 updating the picasa carousel Signed-off-by: Valerio Virgillito <valerio@motorola.com> commit 9484f1c82b81e27edf2dc0a1bcc1fa3b12077406 Merge: d27f2df cacb4a2 Author: Valerio Virgillito <valerio@motorola.com> Date: Tue Apr 17 15:03:50 2012 -0700 Merge branch 'refs/heads/master' into integration commit d27f2df4d846064444263d7832d213535962abe7 Author: Valerio Virgillito <valerio@motorola.com> Date: Wed Apr 11 10:39:36 2012 -0700 integrating new picasa carousel component Signed-off-by: Valerio Virgillito <valerio@motorola.com> commit 6f98384c9ecbc8abe55ccfe1fc25a0c7ce22c493 Author: Valerio Virgillito <valerio@motorola.com> Date: Tue Apr 10 14:33:00 2012 -0700 fixed the text area case issue Text area was renamed from TextArea to Textarea Signed-off-by: Valerio Virgillito <valerio@motorola.com> commit 1e83e26652266136802bc7af930379c1ecd631a6 Author: Valerio Virgillito <valerio@motorola.com> Date: Mon Apr 9 22:10:45 2012 -0700 integrating montage v0.8 into ninja. Signed-off-by: Valerio Virgillito <valerio@motorola.com> Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | Remove TODOsJonathan Duran2012-04-18
| | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | | Add flag for abs/rel positionJonathan Duran2012-04-18
| | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-21 05:30:01 +0000