Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge branch 'refs/heads/Timeline_updated' into Timeline | Jonathan Duran | 2012-02-08 |
|\ | | | | | | | | | | | | | Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| * | Timeline : Adding functionality to unable deletion when a single layer ↵ | Kruti Shah | 2012-02-07 |
| | | | | | | | | | | | | remaining & when track is animated Signed-off-by: Kruti Shah <kruti.shah@motorola.com> | ||
| * | Timeline : Layers & DOM enchancement | Kruti Shah | 2012-02-07 |
| | | | | | | | | | | | | | | | | - Undo & Redo of Layers within same container - Undo & Redo of Layers between different containers - Adding the element on the layer selected else default is the last layer drawn Signed-off-by: Kruti Shah <kruti.shah@motorola.com> | ||
| * | Timeline : Change in the Hooking up of DOM/Layers | Kruti Shah | 2012-02-06 |
| | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> | ||
* | | Layer Undo enhancements | Jonathan Duran | 2012-02-07 |
| | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
* | | Add Span color highlight for animated spans and restyle keyframes | Jonathan Duran | 2012-02-07 |
| | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
* | | Hookup track animations to layer element | Jonathan Duran | 2012-02-07 |
| | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
* | | Fix timeline time markers | Jonathan Duran | 2012-02-07 |
| | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
* | | Change DOM/layer handling workflow | Jonathan Duran | 2012-02-07 |
| | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
* | | Fix resized going off screen by giving layer gutter a max width of 500 | Jonathan Duran | 2012-02-06 |
| | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
* | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | Jonathan Duran | 2012-02-06 |
|\ \ | | | | | | | | | | Timeline | ||
| * | | Attempt to fix initialization bug for snap-manager | Jose Antonio Marquez | 2012-02-06 |
| | | | |||
| * | | TreeController - moving the tree controller to the components directory | Eric Guzman | 2012-02-06 |
| | | | |||
| * | | Tree Components - Adding the tree components | Eric Guzman | 2012-02-06 |
| | | | |||
| * | | Tree Controller - Clean out unused code | Eric Guzman | 2012-02-06 |
| | | | |||
| * | | Tree Controller - Initial add | Eric Guzman | 2012-02-06 |
| | | | |||
| * | | Styles Controller - Add some methods for modifying css keyframe rules | Eric Guzman | 2012-02-06 |
| | | | |||
| * | | Styles Controller - Correct author attribution for specificity calculation | Eric Guzman | 2012-02-06 |
| | | | |||
| * | | Styles Controller - Add code to remove cache items from history (not just ↵ | Eric Guzman | 2012-02-06 |
| | | | | | | | | | | | | nullifying them) | ||
| * | | Styles Controller - First stab at group styling | Eric Guzman | 2012-02-06 |
| | | | | | | | | | | | | Split "createOverrideRule" into two methods --> now has createOverrideSelector. Also took first stab at creating a group style. | ||
* | | | Change keyframe to use element mediator when repositioning animated elements ↵ | Jonathan Duran | 2012-02-06 |
| | | | | | | | | | | | | | | | | | | on stage Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
* | | | Fix Timeline layer resizer from being inversed | Jonathan Duran | 2012-02-06 |
| | | | | | | | | | | | | | | | | | | layer resizer now works in the correct direction when dragging Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
* | | | Timeline: add new layers to top of stack instead of bottom. | Jonathan Duran | 2012-02-06 |
| | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
* | | | Fix problem with resizer set to capture all webkitTransitionEnd events. ↵ | Jonathan Duran | 2012-02-06 |
| |/ |/| | | | | | | | | | Update collapser to use namespaced webkitTransitionEnd events for forward compatibility. Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
* | | Add back keyframe selection code | Jonathan Duran | 2012-02-06 |
| | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
* | | Integrate breadcrumb component and layer handling code | Jonathan Duran | 2012-02-06 |
| | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
* | | style controller update for CSS animations | Jonathan Duran | 2012-02-06 |
| | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
* | | merge new timeline | Jonathan Duran | 2012-02-06 |
|/ | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
* | Merge pull request #15 from mqg734/ToolFixes | Valerio Virgillito | 2012-02-06 |
|\ | | | | | Adding, deleting and modifying elements now keep the element planes and PI in sync. | ||
| * | Fixing format of for loop. | Nivesh Rajbhandari | 2012-02-06 |
| | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | We were only updating the first custom section in the PI. | Nivesh Rajbhandari | 2012-02-03 |
| | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | Update element planes after shapes are created so stage grid updates. | Nivesh Rajbhandari | 2012-02-03 |
| | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | Handle delete of multiple objects. Also, have deletion go through the ↵ | Nivesh Rajbhandari | 2012-02-03 |
| | | | | | | | | | | | | mediator so elementDeleted event is fired for SnapManager, DrawUtils, etc. to clean up after deleted element(s). Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | Update grid and planes when elementChange event signifies the "matrix", ↵ | Nivesh Rajbhandari | 2012-02-03 |
| | | | | | | | | | | | | "left", "top", "width" or "height" properties have changed. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | Update grid and planes when elementChange event signifies the "matrix", ↵ | Nivesh Rajbhandari | 2012-02-03 |
| | | | | | | | | | | | | "left", "top", "width" or "height" properties have changed. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | Merge branch 'refs/heads/NiveshColor' into ToolFixes | Nivesh Rajbhandari | 2012-02-03 |
| |\ | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | Removed border special-casing from PI since the mediator now handles this ↵ | Nivesh Rajbhandari | 2012-02-01 |
| | | | | | | | | | | | | | | | | | | generically. Updated mediator's set stroke routine to use the setColor routine. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | Updated color code in the PI to go through element mediator. | Nivesh Rajbhandari | 2012-02-01 |
| | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | Updated color code to handle shapes. | Nivesh Rajbhandari | 2012-01-31 |
| | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | Merge branch 'refs/heads/Jose-Color' into NiveshColor | Nivesh Rajbhandari | 2012-01-31 |
| | |\ | |||
| | | * | IKNINJA-1083 | Jose Antonio Marquez | 2012-01-30 |
| | | | | | | | | | | | | | | | | Fixing minor bug with no color breaking on null alpha value. | ||
| * | | | Merge branch 'refs/heads/master' into ToolFixes | Nivesh Rajbhandari | 2012-02-03 |
| |\ \ \ | |||
| * | | | | Update PI when element is changed by one of the tools. | Nivesh Rajbhandari | 2012-02-02 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | | | | Fixing keyboard shortcut and tooltip for hand and 3d tools. | Nivesh Rajbhandari | 2012-02-02 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
* | | | | | IKNINJA-854 - removed cons and replaced it with var | Valerio Virgillito | 2012-02-03 |
| |/ / / |/| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* | | | | Merge branch 'montage-integration' into staging | Valerio Virgillito | 2012-02-02 |
|\ \ \ \ | |||
| * | | | | Fixed the color popups to work with m-js v6 | Jose Antonio Marquez | 2012-02-02 |
| | | | | | | | | | | | | | | | | | | | | Removed the wrapper DIV, now it's more direct to create and insert the content in the popups. Changes created DOM exceptions, so it had to be modified. | ||
| * | | | | upgrading to Montage v0.6 | Valerio Virgillito | 2012-02-02 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | | | Revert "Adding njUtils as a component and adding it to the application object" | Valerio Virgillito | 2012-02-01 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit f07bbfaa60c3fb7c2412c5aa97b49d114d6a88ea. Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | | | Fixes for montage integration | Valerio Virgillito | 2012-02-01 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> |