| Commit message (Collapse) | Author | Age |
... | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
closing.
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
routine.
|
| |\ \ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Conflicts:
js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
Used mine.
|
| | | | | | | |
|
|\ \ \ \ \ \ \
| |_|/ / / / /
|/| | | / / /
| | |_|/ / /
| |/| | | | |
|
| | |/ / /
| |/| | |
| | | | |
| | | | | |
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
|\ \ \ \ \
| |_|/ / /
|/| | | |
| | | | | |
TimelineUber
|
| | | | |
| | | | |
| | | | |
| | | | | |
Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
|
| | | | |
| | | | |
| | | | |
| | | | | |
Signed-off-by: Jonathan Duran <jduran@motorola.com>
|
| | | | |
| | | | |
| | | | |
| | | | | |
Signed-off-by: Jonathan Duran <jduran@motorola.com>
|
|\ \ \ \ \
| | |/ / /
| |/| | | |
|
| | |_|/
| |/| |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
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>
|
| | | |
| | | |
| | | |
| | | | |
Signed-off-by: Jonathan Duran <jduran@motorola.com>
|
| | | |
| | | |
| | | |
| | | | |
Signed-off-by: Jonathan Duran <jduran@motorola.com>
|
| | | |
| | | |
| | | |
| | | | |
Signed-off-by: Jonathan Duran <jduran@motorola.com>
|
|\ \ \ \
| | |/ /
| |/| | |
|
| | | | |
|
| | | | |
|
|\ \ \ \
| |/ / /
|/| / /
| |/ / |
|
| |\ \
| | | |
| | | | |
Drag and drop of images and components should not add 3d values by default
|
| | |/
| | |
| | |
| | | |
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
|
| | |
| | |
| | |
| | |
| | |
| | | |
3d properties
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
| | |
| | |
| | |
| | | |
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
| |/
| |
| |
| | |
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
| |
| |
| |
| | |
Signed-off-by: Jonathan Duran <jduran@motorola.com>
|
| | |
|
| | |
|
| | |
|
| | |
|
| |
| |
| |
| |
| | |
Fixed problem with MasterDuration not being set correctly on document
switch.
|
| |
| |
| |
| | |
Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
|
| |
| |
| |
| | |
Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
|
|\ \ |
|
| |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
Used mine.
|
| | | |
| | | |
| | | |
| | | |
| | | | |
Master Layer config menu does not scroll with layers. Bug fix: New layers do
not take into account "show only animated layers" feature.
|
|\ \ \ \
| |_|/ /
|/| | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
Signed-off-by: Jonathan Duran <jduran@motorola.com>
|
| | | |
| | | |
| | | |
| | | | |
Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
|
| |/ /
|/| |
| | |
| | | |
Signed-off-by: Jonathan Duran <jduran@motorola.com>
|
| | | |
|
|\ \ \ |
|
| | | |
| | | |
| | | |
| | | | |
Signed-off-by: Jonathan Duran <jduran@motorola.com>
|
| |\ \ \ |
|
| |\ \ \ \
| | |_|/ /
| |/| | /
| | | |/
| | |/| |
|
| | |\ \
| | | | |
| | | | | |
3D tools, eyedropper, fill, ink-bucket, gradients and shape fixes.
|
| | | | |
| | | | |
| | | | |
| | | | | |
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
|
| | | | |
| | | | |
| | | | |
| | | | | |
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
|
| | | | |
| | | | |
| | | | |
| | | | | |
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
|
| | | |\ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Conflicts:
js/document/templates/montage-html/default_html.css
js/mediators/element-mediator.js
js/panels/properties.reel/properties.js
js/tools/BrushTool.js
js/tools/LineTool.js
js/tools/PenTool.js
js/tools/SelectionTool.js
js/tools/ShapeTool.js
js/tools/TranslateObject3DTool.js
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
|
| | | | |\ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | < |