aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
...
| * | | | | | | | | | | | | | 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 branch 'refs/heads/master' into v0.7.1Valerio Virgillito2012-07-17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'refs/heads/master' into v0.7.1Valerio Virgillito2012-07-17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'refs/heads/master' into v0.7.1Valerio Virgillito2012-07-16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/master' into v0.7.1Valerio Virgillito2012-07-16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/master' into v0.7.1Valerio Virgillito2012-07-16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/master' into v0.7.1Valerio Virgillito2012-07-12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | | | 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>
| | | | | | | | | | | | | | | | | | * | Merge branch 'refs/heads/Ninja-Master' into DocumentJose Antonio Marquez2012-07-18
| | | | | | | | | | | | | | | | | | |\ \ | | | | | | | | | | | | | | | | | | |/ / | | | | | | | | | | | | | | | | | |/| / | | | | | | | | | | | | | | | | | | |/
| | | | | | | | | | | | | | | | | * / Update Readme.md to add info on Local Cloud settings to support installing ↵San Khong2012-07-18
| | | | | | | | |_|_|_|_|_|_|_|_|/ / | | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | multiple builds of Ninja.
| | | | | | | * | | | | | | | | | | 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/Ninja-Master' into DocumentJose Antonio Marquez2012-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>
| | | | | | | | | | | | | | | * New: Adding re-render method to switching viewJose Antonio Marquez2012-07-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This now re-renders the design view when switching from code view. There are many outstanding issues, the Time-Line completely breaks and blocks Ninja, it is unknown why, there are too many dependencies. To make it work, we disabled that feature, although this check in does not include that, so it can be fixed proper. Also, the document controller creates a new tab per switch as it does not check that it is the same document. That bug must also be fixed. Finally, we need to hook up a new code view to the document, the current code view will not work as desired, so a new code view must be built and implemented.
| | | | | | | | | | | | | | | * Merge branch 'refs/heads/Ninja-Master' into DocumentJose Antonio Marquez2012-07-16
| | | | | | | | | | | | | | | |\ | | | | | | |_|_|_|_|_|_|_|_|_|/ | | | | | |/| | | | | | | | | |
| | | | | * | | | | | | | | | | update Readme.md to add info about hidden user library folder on Lion.San Khong2012-07-16
| | | | |/ / / / / / / / / / /
| | | | | | | | | | | | | | * New: Added switching view functionality to document UIJose Antonio Marquez2012-07-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This now let's you switch between code and design views in all documents opened that support design view. Code view for these documents is currently unsupported, so this is just to hook up the UI to the new methods. Code view will be added next.
| | | | | | | | | | | | | | * New: Adding switch view methodJose Antonio Marquez2012-07-16
| | | | | |_|_|_|_|_|_|_|_|/ | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added a method to switch views from code and design. (Code is not currently supported)
| | | | * | | | | | | | | | Merge pull request #392 from joseeight/DocumentValerio Virgillito2012-07-16
| | | | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | |