| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | Merge branch 'refs/heads/NINJA-master' into TimelineUber | Jonathan Duran | 2012-07-20 |
| |\ | | | | | | | | | | | | | | | Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| | * | Timeline: updated livePreview to timeline play. Hide canvas and draw red outline | Valerio Virgillito | 2012-07-19 |
| | | | | | | | | | | | | | | | | | - Changed the play button to a toggle button - livePreview code in stage activated via bindings - Draw a red outline of the canvas when in play Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | The zoom slider position remembered between multi doc switch | Kruti Shah | 2012-07-18 |
| |/ | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> | ||
| * | Merge branch 'refs/heads/NINJA-master' into TimelineUber | Jonathan Duran | 2012-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 html | John Mayhew | 2012-07-09 |
| | | | |||
| | * | Normalize HTML DOCTYPE | Kris Kowal | 2012-07-09 |
| | | | | | | | | | | | | | | | Was lower-case. Now upper-case. Also fixed BOMs, trailing white-space, DOS line terminators. Did not expand tabs to spaces. | ||
| | * | BSD License | Kris Kowal | 2012-07-09 |
| | | | |||
| | * | Normalize HTML doctype | Kris Kowal | 2012-07-06 |
| | | | |||
| | * | Remove byte order markers (BOM) | Kris Kowal | 2012-07-06 |
| | | | |||
| | * | Remove trailing spaces | Kris Kowal | 2012-07-06 |
| | | | |||
| | * | Expand tabs | Kris Kowal | 2012-07-06 |
| | | | |||
| * | | Styling of Zoom Slider + Grid Cut off limit taken care of + Hot text Bug ↵ | Kruti Shah | 2012-07-16 |
| |/ | | | | | | (left,top,width,height) changing it now changes the element on stage Signed-off-by: Kruti Shah <kruti.shah@motorola.com> | ||
| * | Update copyright boilerplate | Kris Kowal | 2012-07-06 |
| | | |||
| * | FIx - hook up play button in timeline to live preview | Jonathan Duran | 2012-06-26 |
| | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| * | Locked Elements. Layer Controls | Kruti Shah | 2012-06-19 |
| | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> | ||
| * | Remove obsolete absolute/relative options from timeline config menu | Jonathan Duran | 2012-06-15 |
| | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| * | Timeline: fix serialization error. | Jon Reid | 2012-06-14 |
| | | |||
| * | Timeline: New popup menu for easing choices. | Jon Reid | 2012-06-12 |
| | | |||
| * | Timeline: Bug fix: Account for horizontal scroll when dragging keyframes. | Jon Reid | 2012-05-08 |
| | | |||
| * | Timeline: Initial keyframe drag-and-drop interaction. | Jon Reid | 2012-05-01 |
| | | |||
| * | Timeline: Replace id with data-montage-id in all reels. | Jon Reid | 2012-04-27 |
| | | |||
| * | Merge cleanup | Valerio Virgillito | 2012-04-27 |
| | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | Merge branch 'refs/heads/serialization' | Valerio Virgillito | 2012-04-27 |
| |\ | |||
| | * | Removing all "module" declarations and replaced with "prototype" in ↵ | John Mayhew | 2012-04-26 |
| | | | | | | | | | preparation for montage converting to the new "prototype" format fully | ||
| * | | Add flag for abs/rel position | Jonathan Duran | 2012-04-18 |
| | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| * | | Timeline: Change Master Layer configuration menu to be on click; bug fix: | Jon Reid | 2012-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. | ||
| * | | Timeline: New Features: Tag name now present in each layer. Configuration | Jon Reid | 2012-04-10 |
| | | | | | | | | | dropdown in Master Layer; Show Only Animated Layers toggle. | ||
| * | | Merge branch 'Timeline-latest-change' of github.com:ntfx47/ninja-internal ↵ | Jonathan Duran | 2012-03-27 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | into TimelineUber Conflicts: js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| | * | | Timeline : Adding Zoom Slider | Kruti Shah | 2012-03-26 |
| | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> | ||
| * | | | Timeline: Drag and Drop of layers. | Jon Reid | 2012-03-26 |
| |/ / | |||
| * | | Timeline: fix layer and style select problems. | Jon Reid | 2012-03-20 |
| | | | |||
| * | | Merge branch 'Timeline-local' into Timeline-local-2 | Jon Reid | 2012-03-16 |
| |\ \ | | | | | | | | | | | | | Conflicts: js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js | ||
| | * | | Timeline: Hook up data binding for changes on subproperties. | Jon Reid | 2012-03-16 |
| | |/ | |||
| * / | Bug fix and cleanup | Jonathan Duran | 2012-03-16 |
| |/ | | | | | | Cleaning up unneeded code for one element per layer support and fixing some bugs with selection and layer sync. Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| * | Timeline: new enablePanel() method on TimelinePanel class. | Jon Reid | 2012-03-09 |
| | | |||
| * | Timeline: Fixes for layer numbering problem, document switching events. | Jon Reid | 2012-03-08 |
| | | |||
| * | Optimize Timeline serialization | Jonathan Duran | 2012-03-07 |
| | | | | | | | Change all serialized properties into one big object to reduce bindings Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| * | Timeline: Code cleanup. Fix bug with unfound property in serialization. | Jon Reid | 2012-03-06 |
| | | |||
| * | Timeline: Serialization of all Collapser components | Jon Reid | 2012-03-02 |
| | | |||
| * | Timeline: Merge arrlayers and arrtracks into one object. | Jon Reid | 2012-03-01 |
| | | | | | Redefine collapser to use property binding instead of events. | ||
| * | Timeline: Document switching and code restructuring. | Jon Reid | 2012-03-01 |
| | | |||
| * | Merge remote-tracking branch 'ninja-jduran/Timeline' into Timeline-local | Jon Reid | 2012-02-27 |
| |\ | |||
| | * | Merge branch 'refs/heads/integration-candidate' into Timeline | Jonathan Duran | 2012-02-27 |
| | |\ | |||
| | | * | clearing the old local setting and using the new version/prefix local settings. | Valerio Virgillito | 2012-02-24 |
| | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | | Timeline: further work on clearTimeline method. | Jon Reid | 2012-02-27 |
| |/ / | |||
| * | | Merge remote-tracking branch 'ninja-internal/master' into Timeline-local | Jon Reid | 2012-02-24 |
| |\| | |||
| | * | Adding some missing copyrights | Valerio Virgillito | 2012-02-24 |
| | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | Timeline: Add hottext fields to layers and serialize them throughout. | Jon Reid | 2012-02-23 |
| |/ | |||
| * | Redo timeline resize code | Jonathan Duran | 2012-02-23 |
| | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| * | Timeline Reset to clean Master branch. Code scrub. | Jonathan Duran | 2012-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> | ||