aboutsummaryrefslogtreecommitdiff
path: root/js
Commit message (Collapse)AuthorAge
* 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>
* | | | 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
|\ \ \ \ | | |_|/ | |/| |
| * | | Fix: IKNINJA-1935 - Chips handling alpha 0 valuesJose Antonio Marquez2012-07-17
| | |/ | |/| | | | | | | Fixed an issue where alpha value was not checked for value and was evaluated in an if statement causing false to trigger, although it had a value. Oversight, this checked allow setting/getting 0 alpha value from chip and fixes issues with the gradient stops not handling 0 alpha.
* | | 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
| |\| |
| | * | upgrade to codemirror 2.3Ananya Sen2012-07-16
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> Conflicts: js/code-editor/codemirror-ninja/theme/lesser-dark-ninja.css Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | / 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 pull request #392 from joseeight/DocumentValerio Virgillito2012-07-16
| |\ | | | | | | New: Improved layout of components for breadcrumb and UI buttons for views
| | * CSS Fixes for WindowsJose Antonio Marquez2012-07-16
| | | | | | | | | | | | Font size is not inherited in Chrome for Windows, but does inherit in Mac, adding size for avoid inconsistency.
| | * Merge branch 'refs/heads/Ninja-Master' into DocumentJose Antonio Marquez2012-07-16
| | |\
| | * | New: Added knob to timeline resizerJose Antonio Marquez2012-07-13
| | | | | | | | | | | | | | | | Added visual feedback for the timeline resizer
| | * | New: Improved Breadcrumb LayoutJose Antonio Marquez2012-07-13
| | | | | | | | | | | | | | | | Added new CSS/HTML layout for the breadcrumb component.
| | * | adding a container around the breadcrumb buttonValerio Virgillito2012-07-12
| | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | Merge branch 'refs/heads/Ninja-Master' into DocumentJose Antonio Marquez2012-07-12
| | |\ \
| | * | | Improving Document Bar UIJose Antonio Marquez2012-07-12
| | | | | | | | | | | | | | | | | | | | Setting up new document bar UI to then set up switching document view modes. Improving layout of component and cleaning up. Added icons and button UI.
| * | | | Merge branch 'master' of github.com:Motorola-Mobility/ninjaJohn Mayhew2012-07-16
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Merge pull request #391 from joseeight/ColorValerio Virgillito2012-07-14
| | |\ \ \ | | | |_|/ | | |/| | Fix: IKNINJA-1634
| | | * | Merge branch 'refs/heads/Ninja-Master' into ColorJose Antonio Marquez2012-07-10
| | | |\|
| | | * | Fixing IKNINJA-1634Jose Antonio Marquez2012-07-10
| | | | | | | | | | | | | | | | | | | | Adding a fix for referencing the stop from all elements on the gradient stop itself.
| * | | | Trademark Update - added trademarked Ninja name to the splash screen and ↵John Mayhew2012-07-16
| |/ / / | | | | | | | | | | | | about box.
| * | | Merge branch 'master' of github.com:Motorola-Mobility/ninja into GridFixeshwc4872012-07-11
| |\ \ \ | | | |/ | | |/| | | | | | | | | Conflicts: assets/shaders/radialBlur.frag.glsl
| | * | Removed the shaders that we do not have rights to.hwc4872012-07-10
| | |/
| * | re-wrote the radial blur shader. Changed tolerances in the deformation shaders.hwc4872012-07-11
| | |
| * | Tweak to an edge case in grid drawing.hwc4872012-07-10
| | |
| * | Grid drawing changeshwc4872012-07-10
| | |
| * | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-07-10
| |\| | | | | | | | | | GridFixes
| | * fixed incorrect capitalization for DOCTYPE htmlJohn Mayhew2012-07-09
| | |
| | * cleaned up remaining copyrights for releaseJohn Mayhew2012-07-09
| | |
| | * Merge pull request #381 from kriskowal/normalizeValerio Virgillito2012-07-09
| | |\ | | | | | | | | Normalize HTML DOCTYPE
| | | * 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.
| | * | Merge branch 'refs/heads/ninja-internal-master' into ↵Ananya Sen2012-07-09
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | codemirror-custom-theme-removal Conflicts: js/code-editor/codemirror-ninja/theme/lesser-dark-ninja.css js/code-editor/codemirror-ninja/theme/xq-dark-ninja.css Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | | * Merge branch 'refs/heads/Ninja-Internal' into AnalyticsJose Antonio Marquez2012-07-09
| | | |\ | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | | | * BSD LicenseKris Kowal2012-07-09
| | | | |
| | | * | Adding Google AnalyticsJose Antonio Marquez2012-07-09
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: index.html js/ninja.reel/ninja.html
| | * | removed unnecessary todo commentsAnanya Sen2012-07-09
| | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * | Removed the customized xq-dark and lesser-dark themes temporarily until ↵Ananya Sen2012-07-09
| | | | | | | | | | | | | | | | | | | | | | | | copyright legalities determined Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | | Grid drawing fixeshwc4872012-07-10
| | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 08:32:23 +0000