aboutsummaryrefslogtreecommitdiff
path: root/js/panels
Commit message (Collapse)AuthorAge
* 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>
* | | FIX for layer selection when adding a keyframe in unselected layerJonathan Duran2012-04-18
| | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | Merge branch 'refs/heads/timeline-local' into TimelineUberJonathan Duran2012-04-18
|\ \ \ | | |/ | |/|
| * | Timeline: Bug fix: changing layer name didn't save in some circumstances.Jon Reid2012-04-17
| | |
| * | Timeline: Further fixes to new document/breadcrumb interactions.Jon Reid2012-04-17
| | |
* | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-04-18
|\ \ \ | |/ / |/| / | |/
| * Merge pull request #165 from mqg734/BoundsCalculationValerio Virgillito2012-04-17
| |\ | | | | | | Drag and drop of images and components should not add 3d values by default
| | * Drag and drop of images and components should not add 3d values by default.Nivesh Rajbhandari2012-04-16
| | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | collapsing the history panel by default and commenting out the undo for the ↵Valerio Virgillito2012-04-13
| | | | | | | | | | | | | | | | | | 3d properties Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | setAttribute added to the undo/redoValerio Virgillito2012-04-09
| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | adding a history panelValerio Virgillito2012-04-09
| |/ | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | Fix tweens not updating keyframe rulesJonathan Duran2012-04-16
| | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | Timeline: Bug fixes for restoring tweens on new document and breadcrumb.Jon Reid2012-04-13
| |
* | Timeline: Remove default style track.Jon Reid2012-04-13
| |
* | Timeline: More bug fixes for document switching.Jon Reid2012-04-13
| |
* | Timeline: More bug fixes.Jon Reid2012-04-12
| |
* | Timeline: Bug fixes: Document switching between new documents now working.Jon Reid2012-04-12
| | | | | | | | | | Fixed problem with MasterDuration not being set correctly on document switch.
* | Timeline: Fixing the animated ElementKruti Shah2012-04-12
| | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
* | Timeline : Replace Element Taken Care ofKruti Shah2012-04-12
| | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
* | Merge branch 'refs/heads/timeline-local' into TimelineUberJonathan Duran2012-04-12
|\ \
| * \ Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-localJon Reid2012-04-11
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js Used mine.
| * | | Timeline: Change Master Layer configuration menu to be on click; bug fix:Jon Reid2012-04-11
| | | | | | | | | | | | | | | | | | | | Master Layer config menu does not scroll with layers. Bug fix: New layers do not take into account "show only animated layers" feature.
* | | | Merge branch 'refs/heads/timeline-kruti-local' into TimelineUberJonathan Duran2012-04-12
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * | | Timeline:Changing function nameKruti Shah2012-04-12
| | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
* | | | More Absolute vs Relative changes and cleanupJonathan Duran2012-04-11
| |/ / |/| | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | Timeline: Bug fix: Drag and Drop now working again.Jon Reid2012-04-10
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-22 07:46:50 +0000