aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* 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
| | |\ \ \ | | |/ / / | |/| | |
| | * | | Trademark Update - added trademarked Ninja name to the splash screen and ↵John Mayhew2012-07-16
| | | | | | | | | | | | | | | | | | | | about box.
* | | | | Merge branch 'refs/heads/master' into v0.7.1Valerio Virgillito2012-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-11
| | |\| |
| | * | | 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.
| * | | | | Update Readme.md to fix some typosSan Khong2012-07-13
| | |_|_|/ | |/| | |
* | | | | Merge branch 'refs/heads/master' into v0.7.1Valerio Virgillito2012-07-12
|\| | | |
| * | | | Merge pull request #389 from ericmueller/GridFixesValerio Virgillito2012-07-12
| |\ \ \ \ | | |_|_|/ | |/| | | Grid fixes
| | * | | Merge branch 'master' of github.com:Motorola-Mobility/ninja into GridFixeshwc4872012-07-11
| | |\ \ \ | | |/ / / | |/| | | | | | | | | | | | | Conflicts: assets/shaders/radialBlur.frag.glsl
| | * | | 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
| | * | | Grid drawing fixeshwc4872012-07-10
| | | | |
| | * | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-07-09
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GridFixes Conflicts: js/helper-classes/3D/StageLine.js
| | * | | | Grid drawing fixes.hwc4872012-07-09
| | | | | |
| | * | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-07-09
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | GridFixes
| | * | | | | fix for grid drawing.hwc4872012-07-09
| | | | | | |
| | * | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-07-03
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | GridFixes
| | * | | | | | fixes for grid drawing.hwc4872012-07-03
| | | | | | | |
| | * | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-07-02
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | GridFixes
| | * \ \ \ \ \ \ Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-06-29
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GridFixes
* | | | | | | | | | Creating a v0.7.1 branch and updating the manifest.json accordinglyValerio Virgillito2012-07-12
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created a v.0.7.1 branch for critical bug fixes. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | | | | | | Update masterSan Khong2012-07-11
| | | | | | | | |
* | | | | | | | | Update masterSan Khong2012-07-11
| | | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-19 09:58:34 +0000