aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/Layer.reel
Commit message (Collapse)AuthorAge
* Fix the paths to be case sensitive.Pacien TRAN-GIRARD2012-09-28
|
* Merge branch 'refs/heads/NINJA-master' into TimelineUberJonathan Duran2012-07-17
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/panels/Timeline/DragDrop.js js/panels/Timeline/Keyframe.reel/Keyframe.js js/panels/Timeline/Layer.reel/Layer.js js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js js/panels/Timeline/Span.reel/Span.js js/panels/Timeline/Style.reel/Style.js js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js js/panels/Timeline/Track.reel/Track.html js/panels/Timeline/Track.reel/Track.js js/panels/Timeline/Track.reel/css/Track.css js/panels/Timeline/TrackSpacer.reel/TrackSpacer.html js/panels/Timeline/TrackSpacer.reel/TrackSpacer.js js/panels/Timeline/TrackSpacer.reel/css/TrackSpacer.css js/panels/Timeline/Tween.reel/Tween.js Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * fixed incorrect capitalization for DOCTYPE htmlJohn Mayhew2012-07-09
| |
| * Normalize HTML DOCTYPEKris Kowal2012-07-09
| | | | | | | | | | | | | | Was lower-case. Now upper-case. Also fixed BOMs, trailing white-space, DOS line terminators. Did not expand tabs to spaces.
| * BSD LicenseKris Kowal2012-07-09
| |
| * Normalize HTML doctypeKris Kowal2012-07-06
| |
| * Remove byte order markers (BOM)Kris Kowal2012-07-06
| |
| * Remove trailing spacesKris Kowal2012-07-06
| |
| * Remove trailing spacesKris Kowal2012-07-06
| |
| * Expand tabsKris Kowal2012-07-06
| |
* | Styling of Zoom Slider + Grid Cut off limit taken care of + Hot text Bug ↵Kruti Shah2012-07-16
| | | | | | | | | | | | (left,top,width,height) changing it now changes the element on stage Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
* | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-07-09
|\| | | | | | | | | | | | | Conflicts: js/panels/Timeline/Layer.reel/Layer.js Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * Update copyright boilerplateKris Kowal2012-07-06
| |
* | Timeline: Code refactor for Layer.jsJon Reid2012-07-03
| |
* | Bug Fix : Hot text updates with keyframe selectionKruti Shah2012-06-28
|/ | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
* Fix missing serialization in Layer.jsJonathan Duran2012-06-26
| | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* Timeline: Bug fix: Indexing on styles when loading files.Jon Reid2012-06-26
|
* Timeline: Bug fix IKNINJA-1816Jon Reid2012-06-26
|
* Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-krutiKruti Shah2012-06-20
|\
| * remove unneeded filesJonathan Duran2012-06-20
| | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | LockedElements - LayersKruti Shah2012-06-19
| | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
* | Layer LockKruti Shah2012-06-19
| | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
* | Lock ElementsKruti Shah2012-06-19
|/ | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
* Timeline: Bug fix: Document switching no longer causes multiple styles to beJon Reid2012-06-15
| | | | added.
* 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
| * montage v10 serialization updates for timelineJonathan Duran2012-06-12
| | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * Timeline: Fix document switching under Montage v.10Jon Reid2012-06-12
| |
| * fixing a timeline issueValerio Virgillito2012-06-12
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * adding more missing properties to the timelineValerio Virgillito2012-06-12
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * document bindings phase 1Valerio Virgillito2012-05-29
| | | | | | | | | | | | | | | | - using array controller to bind the current document to all ninja components - removed open document event - removed references to the document controller Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | Fix the broken animationKruti 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>
| * | montage v10 serialization updates for timelineJonathan Duran2012-06-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> Conflicts: js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * | changes to reopen sub property functionsJonathan Duran2012-06-11
| | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * | Fix references to documentController.activeDocument to currentDocument.modelJonathan Duran2012-06-06
| | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@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>
* | | 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>
* | | LayerControlKruti 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>
| * | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-05-31
| |\| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/panels/Timeline/Layer.reel/Layer.js js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js js/panels/properties.reel/properties.js Signed-off-by: Jonathan Duran <jduran@motorola.com>
| | * Timeline triggerBinding needs to be set to false in the track data.Nivesh Rajbhandari2012-05-23
| | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * Fixing the dirty document flag. Disabling the stylesheets dirty flag because ↵Valerio Virgillito2012-05-10
| | | | | | | | | | | | | | | | | | === true on document open. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | Timeline: bug fix: better selection/deselection of styles within layers.Jon Reid2012-05-25
| | |
| * | Timeline: Better fix for keeping styles/tracks in synch when adding stylesJon Reid2012-05-25
| | | | | | | | | | | | on document open.
| * | Timeline: bug fix "Layer name gets doubled" (Spreadsheet)Jon Reid2012-05-24
| | |