| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | Merge branch 'refs/heads/master' into v0.7.1 | Valerio Virgillito | 2012-07-17 |
| |\ | |||
| | * | Merge pull request #396 from ananyasen/codemirror2.3-upgrade | Valerio Virgillito | 2012-07-17 |
| | |\ | | | | | | | upgrade to codemirror 2.3 | ||
| | | * | upgrade to codemirror 2.3 | Ananya Sen | 2012-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.1 | Valerio Virgillito | 2012-07-17 |
| |\| | |||
| | * | update Readme.md to add info about hidden user library folder on Lion. | San Khong | 2012-07-16 |
| | | | |||
| * | | Merge branch 'refs/heads/master' into v0.7.1 | Valerio Virgillito | 2012-07-16 |
| |\| | |||
| | * | Merge pull request #392 from joseeight/Document | Valerio Virgillito | 2012-07-16 |
| | |\ | | | | | | | New: Improved layout of components for breadcrumb and UI buttons for views | ||
| | | * | CSS Fixes for Windows | Jose Antonio Marquez | 2012-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 Document | Jose Antonio Marquez | 2012-07-16 |
| | | |\ | |||
| | | * | | New: Added knob to timeline resizer | Jose Antonio Marquez | 2012-07-13 |
| | | | | | | | | | | | | | | | | | Added visual feedback for the timeline resizer | ||
| | | * | | New: Improved Breadcrumb Layout | Jose Antonio Marquez | 2012-07-13 |
| | | | | | | | | | | | | | | | | | Added new CSS/HTML layout for the breadcrumb component. | ||
| | | * | | Merge pull request #42 from mencio/breadcrumb-container | Jose Antonio Marquez Russo | 2012-07-12 |
| | | |\ \ | | | | | | | | | | | adding a container around the breadcrumb button | ||
| | | | * | | adding a container around the breadcrumb button | Valerio Virgillito | 2012-07-12 |
| | | |/ / | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | * | | Merge branch 'refs/heads/Ninja-Master' into Document | Jose Antonio Marquez | 2012-07-12 |
| | | |\ \ | |||
| | | * | | | Improving Document Bar UI | Jose Antonio Marquez | 2012-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/master | Valerio Virgillito | 2012-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 Mayhew | 2012-07-16 |
| | | | | | | | | | | | | | | | | | | | | | | | | | output file from SASS | ||
| | | * | | | | Fixed incorrect comment blocks around our open source copyright notice. ↵ | John Mayhew | 2012-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.1 | Valerio Virgillito | 2012-07-16 |
| |\| | | | | | |||
| | * | | | | | Merge pull request #393 from mayhewinator/master | Valerio Virgillito | 2012-07-16 |
| | |\| | | | | | |_|_|/ | |/| | | | Trademark Update-Added trademarked Ninja app name to about box and splash screen | ||
| | | * | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja | John Mayhew | 2012-07-16 |
| | | |\ \ \ | | |/ / / | |/| | | | |||
| | | * | | | Trademark Update - added trademarked Ninja name to the splash screen and ↵ | John Mayhew | 2012-07-16 |
| | | | | | | | | | | | | | | | | | | | | | about box. | ||
| * | | | | | Merge branch 'refs/heads/master' into v0.7.1 | Valerio Virgillito | 2012-07-16 |
| |\| | | | | |||
| | * | | | | Merge pull request #391 from joseeight/Color | Valerio Virgillito | 2012-07-14 |
| | |\ \ \ \ | | |/ / / | |/| | | | Fix: IKNINJA-1634 | ||
| | | * | | | Merge branch 'refs/heads/Ninja-Master' into Color | Jose Antonio Marquez | 2012-07-11 |
| | | |\| | | |||
| | | * | | | Merge branch 'refs/heads/Ninja-Master' into Color | Jose Antonio Marquez | 2012-07-10 |
| | | |\ \ \ | |||
| | | * | | | | Fixing IKNINJA-1634 | Jose Antonio Marquez | 2012-07-10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Adding a fix for referencing the stop from all elements on the gradient stop itself. | ||
| | * | | | | | Update Readme.md to fix some typos | San Khong | 2012-07-13 |
| | | |_|_|/ | |/| | | | |||
| * | | | | | Merge branch 'refs/heads/master' into v0.7.1 | Valerio Virgillito | 2012-07-12 |
| |\| | | | | |||
| | * | | | | Merge pull request #389 from ericmueller/GridFixes | Valerio Virgillito | 2012-07-12 |
| | |\ \ \ \ | | |_|_|/ | |/| | | | Grid fixes | ||
| | | * | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja into GridFixes | hwc487 | 2012-07-11 |
| | | |\ \ \ | | |/ / / | |/| | | | | | | | | | | | | | Conflicts: assets/shaders/radialBlur.frag.glsl | ||
| | | * | | | re-wrote the radial blur shader. Changed tolerances in the deformation shaders. | hwc487 | 2012-07-11 |
| | | | | | | |||
| | | * | | | Tweak to an edge case in grid drawing. | hwc487 | 2012-07-10 |
| | | | | | | |||
| | | * | | | Grid drawing changes | hwc487 | 2012-07-10 |
| | | | | | | |||
| | | * | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-07-10 |
| | | |\| | | | | | | | | | | | | | | | | | GridFixes | ||
| | | * | | | Grid drawing fixes | hwc487 | 2012-07-10 |
| | | | | | | |||
| | | * | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-07-09 |
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GridFixes Conflicts: js/helper-classes/3D/StageLine.js | ||
| | | * | | | | Grid drawing fixes. | hwc487 | 2012-07-09 |
| | | | | | | | |||
| | | * | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-07-09 |
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | GridFixes | ||
| | | * | | | | | fix for grid drawing. | hwc487 | 2012-07-09 |
| | | | | | | | | |||
| | | * | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-07-03 |
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | GridFixes | ||
| | | * | | | | | | fixes for grid drawing. | hwc487 | 2012-07-03 |
| | | | | | | | | | |||
| | | * | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-07-02 |
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | GridFixes | ||
| | | * \ \ \ \ \ \ | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-06-29 |
| | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GridFixes | ||
| * | | | | | | | | | | Creating a v0.7.1 branch and updating the manifest.json accordingly | Valerio Virgillito | 2012-07-12 |
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created a v.0.7.1 branch for critical bug fixes. Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | | | | | | | | Update master | San Khong | 2012-07-11 |
| | | | | | | | | | | |||
| * | | | | | | | | | Update master | San Khong | 2012-07-11 |
| | | | | | | | | | | |||
| * | | | | | | | | | Update master | San Khong | 2012-07-11 |
| | | | | | | | | | | |||
| * | | | | | | | | | Merge pull request #388 from mayhewinator/master | Valerio Virgillito | 2012-07-10 |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | final updates for Chrome App store release | ||
| | * | | | | | | | | | Fix for incorrect doctype in last commit | John Mayhew | 2012-07-10 |
| | | | | | | | | | | | |||