aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge branch 'refs/heads/Ninja-Master' into DocumentJose Antonio Marquez2012-07-24
|\
| * Merge branch 'TimelineUber' of https://github.com/imix23ways/ninjaValerio Virgillito2012-07-24
| |\
| | * Remove console logsJonathan Duran2012-07-24
| | * FIX IK-1485Jonathan Duran2012-07-24
* | | Merge branch 'refs/heads/Ninja-Master' into DocumentJose Antonio Marquez2012-07-24
|\| |
| * | jshint cleanup on the tools directoryValerio Virgillito2012-07-24
* | | New: Adding method to display document in code viewJose Antonio Marquez Russo2012-07-23
* | | In Progress: Cleaning up mergeJose Antonio Marquez Russo2012-07-23
* | | Merge pull request #44 from ananyasen/DocumentJose Antonio Marquez Russo2012-07-23
|\ \ \
| * \ \ Merge branch 'refs/heads/Jose-Document' into DocumentAnanya Sen2012-07-23
| |\ \ \
| * | | | show design code editor - first cutAnanya Sen2012-07-23
| * | | | parameterize the parentContainer for text documentAnanya Sen2012-07-18
* | | | | Merge branch 'refs/heads/Ninja-master' into DocumentJose Antonio Marquez Russo2012-07-23
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge branch 'tag-properties-fixes' of https://github.com/mencio/ninjaValerio Virgillito2012-07-23
| |\ \ \ \
| | * | | | tag-tool: Minor styles update and some cleanupValerio Virgillito2012-07-23
* | | | | | Merge branch 'refs/heads/Ninja-Master' into DocumentJose Antonio Marquez2012-07-23
|\| | | | | | |_|_|/ / |/| | | |
| * | | | Merge branch 'SevenDotOneCommits' of https://github.com/ericmueller/ninjaValerio Virgillito2012-07-23
| |\ \ \ \
| | * | | | Bugs fixed:hwc4872012-07-23
| | |/ / /
| * | | | Fix: Adding a check for element w/h/t/lJose Antonio Marquez2012-07-23
* | | | | Merge branch 'refs/heads/Ninja-Master' into DocumentJose Antonio Marquez2012-07-23
|\| | | |
| * | | | Merge branch 'minorFixes_7.1' of https://github.com/ericguzman/ninjaValerio Virgillito2012-07-23
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | CSS Panel - Remove data attribute to remove style tags from document.Eric Guzman2012-07-20
| | * | | Merge branch 'refs/heads/fixes_7.1' into minorFixes_7.1Eric Guzman2012-07-20
| | |\ \ \
| | | * \ \ Merge branch 'refs/heads/master' into fixes_7.1Eric Guzman2012-07-20
| | | |\ \ \
| | | * | | | CSS Panel - Fix updating when media changes, sheets are deleted.Eric Guzman2012-07-20
| | | * | | | Style Sheets - Show dirty marker when editing media attributeEric Guzman2012-07-18
| | | * | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja into fixes_7.1Eric Guzman2012-07-18
| | | |\ \ \ \
| | | * | | | | CSS Panel - Handle media attribute changesEric Guzman2012-07-17
| | | * | | | | Styles Controller - Re-add dirty event. Add data- attribute to keep created s...Eric Guzman2012-07-17
| | * | | | | | CSS Panel - Fix updating when media changes, sheets are deleted.Eric Guzman2012-07-20
| | | |_|/ / / | | |/| | | |
* | | | | | | Merge branch 'refs/heads/Ninja-Master' into DocumentJose Antonio Marquez2012-07-23
|\| | | | | |
| * | | | | | Merge branch 'refs/heads/NINJA-master' into TimelineUberJonathan Duran2012-07-23
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| * | | | | | Merge branch 'refs/heads/Timeline-local-kruti' into TimelineUberJonathan Duran2012-07-20
| |\ \ \ \ \ \
| | * | | | | | The zoom slider resets.Commented some codeKruti Shah2012-07-20
| | * | | | | | Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-krutiKruti Shah2012-07-20
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-krutiKruti Shah2012-07-19
| | |\ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ Merge branch 'refs/heads/NINJA-master' into TimelineUberJonathan Duran2012-07-20
| |\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | |
| * | | | | | | | | Merge branch 'refs/heads/NINJA-master' into TimelineUberJonathan Duran2012-07-20
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / | | |/| | | | | | |
| * | | | | | | | | Improve keyframe selection by moving playhead marker to lower z-indexJonathan Duran2012-07-19
| * | | | | | | | | FIx 3D animation workflowJonathan Duran2012-07-19
| | |_|_|/ / / / / | |/| | | | | | |
| * | | | | | | | Merge branch 'refs/heads/Timeline-local-kruti' into TimelineUberJonathan Duran2012-07-19
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | |
| | * | | | | | | The zoom slider position remembered between multi doc switchKruti Shah2012-07-18
| | * | | | | | | Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-krutiKruti Shah2012-07-18
| | |\ \ \ \ \ \ \
* | | \ \ \ \ \ \ \ Merge branch 'refs/heads/Ninja-Master' into DocumentJose Antonio Marquez2012-07-23
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / | |/| | | | | | | |
| * | | | | | | | | Merge branch 'template-pi-breadcrumb' of https://github.com/mencio/ninjaValerio Virgillito2012-07-22
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Unifying the banner and animation template display of ninja-contentValerio Virgillito2012-07-20
| | | |_|_|/ / / / / | | |/| | | | | | |
* | | | | | | | | | Merge branch 'refs/heads/Ninja-Master' into DocumentJose Antonio Marquez2012-07-20
|\| | | | | | | | |
| * | | | | | | | | Merge branch 'Fixes_071' of https://github.com/mqg734/ninjaValerio Virgillito2012-07-20
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | If no material was defined, use Flat material when switching from 2d to WebGL...Nivesh Rajbhandari2012-07-20
| | * | | | | | | | | IKNINJA-1780 - [Shape] Error when opening document that contains a shape with...Nivesh Rajbhandari2012-07-19
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-23 17:12:33 +0000