aboutsummaryrefslogtreecommitdiff
path: root/js
Commit message (Collapse)AuthorAge
...
| | * | | | | | Merge branch 'menu-fixes' of github.com:mencio/ninja into menu-fixesValerio Virgillito2012-07-17
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/ui/menu/menu-controller.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | | * | | | | | menu design update and bug fixes - Moved Preview to the document barValerio Virgillito2012-07-17
| | | | |_|/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Redesigned the menu and improved DOM structure. - Removed un-used entires - Fixed layout and snap entries - Moved the preview button to the document bar. - Fixes for bugs: #1750, #1867, #1876, #1895 Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * / | | | | removed left over comments.Valerio Virgillito2012-07-17
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | | | Merge branch 'Tracking' of https://github.com/joseeight/ninjaValerio Virgillito2012-07-18
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge branch 'refs/heads/Ninja-Master' into TrackingJose Antonio Marquez2012-07-18
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | |
| | * | | | | | Fix: Improved download UX for cloud appJose Antonio Marquez2012-07-18
| | | |_|_|/ / | | |/| | | | | | | | | | | | | | | | | | Added a fix to prevent the on close dialog of Chrome from appearing when an user has to download the Ninja Cloud app. Everything should work the same, only no dialog appears when clicking on download.
| * | | | | | Merge branch 'copy-paste-bugfix' of https://github.com/ananyasen/ninjaValerio Virgillito2012-07-18
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | perform clipboard operations only if selection tool is selected since other ↵Ananya Sen2012-07-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tools have different conflicting session state Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * | | | | Merge branch 'refs/heads/ninja-internal-master' into copy-paste-bugfixAnanya Sen2012-07-18
| | |\| | | |
| | * | | | | removing iframes from pasted content to prevent frame injection attackAnanya Sen2012-07-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * | | | | Try pasting the binary image first, since Windows Chrome places both binary ↵Ananya Sen2012-07-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and html for copying an image. Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * | | | | Merge branch 'refs/heads/ninja-internal-master' into copy-paste-bugfixAnanya Sen2012-07-17
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | |
| | * | | | | Fixes : resize wrapper for content, prevent duplicate pastesAnanya Sen2012-07-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * | | | | Fixed copy paste from external applicationsAnanya Sen2012-07-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | | | | | | Merge branch 'refs/heads/Ninja-Master' into DocumentJose Antonio Marquez2012-07-18
|\| | | | | |
| * | | | | | fixing the copyrights on the timeline branch pull request.Valerio Virgillito2012-07-18
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | | Merge branch 'refs/heads/NINJA-master' into TimelineUberJonathan Duran2012-07-18
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| * | | | | Merge branch 'refs/heads/Timeline-local-kruti' into TimelineUberJonathan Duran2012-07-17
| |\ \ \ \ \
| | * | | | | Multi Doc Zoom Slider HandlingKruti Shah2012-07-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
| * | | | | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-localJon Reid2012-07-17
| |\| | | | |
| | * | | | | Merge branch 'refs/heads/NINJA-master' into TimelineUberJonathan Duran2012-07-17
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | |
| * | / | | | Timeline: Possible fix for new file/new style crash problem.Jon Reid2012-07-17
| |/ / / / /
| * | | | | Timeline: Style zoom slider.Jon Reid2012-07-17
| | | | | |
| * | | | | Timeline: Bug fix: Now able to add first keyframe to an element usingJon Reid2012-07-17
| | | | | | | | | | | | | | | | | | | | | | | | function key.
| * | | | | 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>
| * | | | | Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-krutiKruti Shah2012-07-16
| |\ \ \ \ \
| | * | | | | Timeline: Ameliorate slowness when adding first keyframe to an element.Jon Reid2012-07-16
| | | | | | |
| | * | | | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-localJon Reid2012-07-16
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js Resolved by using both; both were needed.
| | * | | | | | Timeline: Disable drag-and-drop on subproperty keyframes. Better errorJon Reid2012-07-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | handling. Fix some minor bugs.
| | * | | | | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-localJon Reid2012-07-11
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-localJon Reid2012-07-09
| | |\ \ \ \ \ \ \
| | * | | | | | | | Timeline: Delete unused file.Jon Reid2012-07-09
| | | | | | | | | |
| * | | | | | | | | 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>
| * | | | | | | | Zooming the tweensKruti Shah2012-07-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
| * | | | | | | | Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-krutiKruti Shah2012-07-11
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | |
| | * | | | | | | Fix layer arrayJonathan Duran2012-07-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| | * | | | | | | Fix more missing charJonathan Duran2012-07-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| | * | | | | | | Fix missing char and Temp fix missing imageJonathan Duran2012-07-10
| | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * / | | | | | Adding Zoom Control to Property TracksKruti Shah2012-07-10
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>