aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/Style.reel
Commit message (Collapse)AuthorAge
* Merge branch 'refs/heads/timeline-local' into TimelineUberJonathan Duran2012-07-09
|\ | | | | | | | | | | | | | | | | Conflicts: js/panels/Timeline/Layer.reel/Layer.js js/panels/Timeline/Style.reel/Style.js js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * Timeline: Refactor style and layer to use pointers to parent components.Jon Reid2012-07-03
| |
| * Timeline: Code refactor for Style.jsJon Reid2012-07-03
| |
* | Update copyright boilerplateKris Kowal2012-07-06
|/
* Timeline: Bug fix: Hintable should work better now.Jon Reid2012-06-27
|
* Bug Fix : Color Chip PositionKruti Shah2012-06-26
| | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
* BugFix - Color Chip Positioning & Checking for null value of the current colorKruti Shah2012-06-26
| | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
* Merge remote-tracking branch 'ninja-internal/master' into test-mergeJon Reid2012-06-15
|\ | | | | | | | | | | | | Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
| * adding more missing properties to the timelineValerio Virgillito2012-06-12
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | Clean upKruti Shah2012-06-12
| | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
* | Merge branch 'refs/heads/TimelineUberjd' into TimelineUberKruti Shah2012-06-12
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/controllers/elements/element-controller.js js/document/_toDelete/html-document.js js/panels/Timeline/Layer.reel/Layer.js Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
| * | Timeline: Better style selection and deselection. Automatic re-selection ofJon Reid2012-06-01
| | | | | | | | | | | | previously selected style when parent layer is reselected.
| * | Timeline: Bug fixes for deleting styles and their associated tracksJon Reid2012-05-31
| | | | | | | | | | | | correctly.
* | | Sub PropsKruti Shah2012-06-12
| | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
* | | Color chip in TPKruti Shah2012-06-08
| | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
* | | Sub propertyKruti Shah2012-06-07
| | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
* | | LCKruti Shah2012-06-04
| | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
* | | Clean upKruti Shah2012-06-01
| | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
* | | Layer ControlsKruti Shah2012-06-01
| | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
* | | Color ChipKruti Shah2012-05-31
| | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
* | | Merge branch 'refs/heads/TimelineUberjd' into TimelineUberKruti Shah2012-05-31
|\| | | | | | | | | | | | | | | | | | | | Conflicts: js/panels/Timeline/Layer.reel/Layer.js Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
| * | Timeline: bug fix: better selection/deselection of styles within layers.Jon Reid2012-05-25
| | |
| * | Timeline: Bug fix IKNINJA 1566: Adding a css style property makes the blowJon Reid2012-05-24
| |/ | | | | | | layer name disappear.
* | Style Layer ControlKruti Shah2012-05-22
| | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
* | Layer ControlKruti Shah2012-05-22
|/ | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
* Timeline: Change serialization parameters for some component properties.Jon Reid2012-04-30
|
* Timeline: Replace id with data-montage-id in all reels.Jon Reid2012-04-27
|
* Removing all "module" declarations and replaced with "prototype" in ↵John Mayhew2012-04-26
| | | | preparation for montage converting to the new "prototype" format fully
* Adding some missing copyrightsValerio Virgillito2012-02-24
| | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* Timeline Reset to clean Master branch. Code scrub.Jonathan Duran2012-02-23
| | | | | | Fresh copy of ninja-internal/master with Timeline folder copied in to resolved merge issues. Signed-off-by: Jonathan Duran <jduran@motorola.com>
* Squashed commit of the following:Jonathan Duran2012-02-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 46292bddbfbe7415c6852142dd10fd02a276722a Author: Jon Reid <tjh487@motorola.com> Date: Wed Feb 8 14:32:22 2012 -0800 Timeline: turn off console logging. commit b8de88393182bc6e819c3d6a290ade2f804236ac Merge: e651344 37b952c Author: Jon Reid <tjh487@motorola.com> Date: Wed Feb 8 14:10:06 2012 -0800 Merge branch 'Timeline-jduran' into Timeline-jreid commit e651344d5d6c2911b31a54510c65a349c4d52db2 Author: Jon Reid <tjh487@motorola.com> Date: Wed Feb 8 14:08:25 2012 -0800 Timeline: Bug fixes IKNINJA-947: Weird behavior with adding layers with an empty layer name selected IKNINJA-990: Multiple styles can be highlighted at the same time even when they are under different layers IKNINJA-1063: Styles can be added while style column is collapsed IKNINJA-970: When there is no style added yet, the arrow sign should be in a collapsed mode Signed-off-by: Jonathan Duran <jduran@motorola.com>
* Timeline: select/deselect layers. Work on focus/blur for layers.Jon Reid2012-02-07
|
* Fix problem with resizer set to capture all webkitTransitionEnd events. ↵Jonathan Duran2012-02-06
| | | | | | Update collapser to use namespaced webkitTransitionEnd events for forward compatibility. Signed-off-by: Jonathan Duran <jduran@motorola.com>
* merge new timelineJonathan Duran2012-02-06
Signed-off-by: Jonathan Duran <jduran@motorola.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-18 13:30:29 +0000