aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
...
| * | | | | | | | Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-krutiKruti Shah2012-06-28
| |\ \ \ \ \ \ \ \
| | * | | | | | | | clean upJonathan Duran2012-06-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| | * | | | | | | | Merge branch 'refs/heads/timeline-local' into TimelineUberJonathan Duran2012-06-28
| | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-localJon Reid2012-06-28
| | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js Used Theirs, doesn't matter, code block is in commented-out section.
| | | * | | | | | | | | Timeline: Better deselection of tweens when selecting/deselecting layers.Jon Reid2012-06-28
| | | | | | | | | | | |
| * | | | | | | | | | | Merge branch 'refs/heads/ninjainternalmaster' into Timeline-local-krutiKruti Shah2012-06-28
| |\| | | | | | | | | |
| * | | | | | | | | | | Bug Fix : Hot text updates with keyframe selectionKruti Shah2012-06-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
| * | | | | | | | | | | Merge branch 'refs/heads/ninjainternalmaster' into Timeline-local-krutiKruti Shah2012-06-28
| |\ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/master' into v0.7.1Valerio Virgillito2012-07-17
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |
| * | | | | | | | | | | | Merge pull request #399 from joseeight/ColorValerio Virgillito2012-07-17
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | Fix: IKNINJA-1935 - Chips handling alpha 0 values
| | * | | | | | | | | | | 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/master' into v0.7.1Valerio Virgillito2012-07-17
|\| | | | | | | | | | |
| * | | | | | | | | | | Merge pull request #396 from ananyasen/codemirror2.3-upgradeValerio Virgillito2012-07-17
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | upgrade to codemirror 2.3
| | * | | | | | | | | | 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>
* | | | | | | | | | | Merge branch 'refs/heads/master' into v0.7.1Valerio Virgillito2012-07-17
|\| | | | | | | | | |
| * | | | | | | | | | update Readme.md to add info about hidden user library folder on Lion.San Khong2012-07-16
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'refs/heads/master' into v0.7.1Valerio Virgillito2012-07-16
|\| | | | | | | | | |
| * | | | | | | | | | 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.
| | * | | | | | | | | | | Merge pull request #42 from mencio/breadcrumb-containerJose Antonio Marquez Russo2012-07-12
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | adding a container around the breadcrumb button
| | | * | | | | | | | | | | 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 pull request #394 from mayhewinator/masterValerio Virgillito2012-07-16
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed incorrect comment blocks around our open source copyright notice
| | * | | | | | | | | | | | | Added back one copyright block so it is properly included in the ninja.css ↵John Mayhew2012-07-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | output file from SASS
| | * | | | | | | | | | | | | Fixed incorrect comment blocks around our open source copyright notice. ↵John Mayhew2012-07-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These incorrect comments kept us from being able to create the ninja.css file via SASS
* | | | | | | | | | | | | | | Merge branch 'refs/heads/master' into v0.7.1Valerio Virgillito2012-07-16
|\| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge pull request #393 from mayhewinator/masterValerio Virgillito2012-07-16
| |\| | | | | | | | | | | | | | | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | Trademark Update-Added trademarked Ninja app name to about box and splash screen
| | * | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninjaJohn Mayhew2012-07-16
| | |\ \ \ \ \ \ \ \ \ \