Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'refs/heads/Ninja-Master' into Document | Jose Antonio Marquez | 2012-07-24 |
|\ | |||
| * | removing console log | Valerio Virgillito | 2012-07-24 |
| * | Merge branch 'TextTool-Color' of https://github.com/dhg637/ninja | Valerio Virgillito | 2012-07-24 |
| |\ | |||
| | * | Text Tool Color Change Fix | Armen Kesablyan | 2012-07-24 |
* | | | New: Adding method to switch from code to design view | Jose Antonio Marquez | 2012-07-24 |
* | | | Merge branch 'refs/heads/Ninja-Master' into Document | Jose Antonio Marquez | 2012-07-24 |
|\| | | |||
| * | | Merge branch 'TimelineUber' of https://github.com/imix23ways/ninja | Valerio Virgillito | 2012-07-24 |
| |\ \ | |||
| | * | | Remove console logs | Jonathan Duran | 2012-07-24 |
| | * | | FIX IK-1485 | Jonathan Duran | 2012-07-24 |
* | | | | Merge branch 'refs/heads/Ninja-Master' into Document | Jose Antonio Marquez | 2012-07-24 |
|\| | | | |||
| * | | | jshint cleanup on the tools directory | Valerio Virgillito | 2012-07-24 |
* | | | | New: Adding method to display document in code view | Jose Antonio Marquez Russo | 2012-07-23 |
* | | | | In Progress: Cleaning up merge | Jose Antonio Marquez Russo | 2012-07-23 |
* | | | | Merge pull request #44 from ananyasen/Document | Jose Antonio Marquez Russo | 2012-07-23 |
|\ \ \ \ | |||
| * \ \ \ | Merge branch 'refs/heads/Jose-Document' into Document | Ananya Sen | 2012-07-23 |
| |\ \ \ \ | |||
| * | | | | | show design code editor - first cut | Ananya Sen | 2012-07-23 |
| * | | | | | parameterize the parentContainer for text document | Ananya Sen | 2012-07-18 |
* | | | | | | Merge branch 'refs/heads/Ninja-master' into Document | Jose Antonio Marquez Russo | 2012-07-23 |
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | |||
| * | | | | | Merge branch 'tag-properties-fixes' of https://github.com/mencio/ninja | Valerio Virgillito | 2012-07-23 |
| |\ \ \ \ \ | |||
| | * | | | | | tag-tool: Minor styles update and some cleanup | Valerio Virgillito | 2012-07-23 |
| | | |_|_|/ | | |/| | | | |||
* | | | | | | Merge branch 'refs/heads/Ninja-Master' into Document | Jose Antonio Marquez | 2012-07-23 |
|\| | | | | | |_|_|/ / |/| | | | | |||
| * | | | | Merge branch 'SevenDotOneCommits' of https://github.com/ericmueller/ninja | Valerio Virgillito | 2012-07-23 |
| |\ \ \ \ | |||
| | * | | | | Bugs fixed: | hwc487 | 2012-07-23 |
| | |/ / / | |||
| * | | | | Fix: Adding a check for element w/h/t/l | Jose Antonio Marquez | 2012-07-23 |
* | | | | | Merge branch 'refs/heads/Ninja-Master' into Document | Jose Antonio Marquez | 2012-07-23 |
|\| | | | | |||
| * | | | | Merge branch 'minorFixes_7.1' of https://github.com/ericguzman/ninja | Valerio Virgillito | 2012-07-23 |
| |\ \ \ \ | | |_|_|/ | |/| | | | |||
| | * | | | CSS Panel - Remove data attribute to remove style tags from document. | Eric Guzman | 2012-07-20 |
| | * | | | Merge branch 'refs/heads/fixes_7.1' into minorFixes_7.1 | Eric Guzman | 2012-07-20 |
| | |\ \ \ | |||
| | | * \ \ | Merge branch 'refs/heads/master' into fixes_7.1 | Eric Guzman | 2012-07-20 |
| | | |\ \ \ | |||
| | | * | | | | CSS Panel - Fix updating when media changes, sheets are deleted. | Eric Guzman | 2012-07-20 |
| | | * | | | | Style Sheets - Show dirty marker when editing media attribute | Eric Guzman | 2012-07-18 |
| | | * | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja into fixes_7.1 | Eric Guzman | 2012-07-18 |
| | | |\ \ \ \ | |||
| | | * | | | | | CSS Panel - Handle media attribute changes | Eric Guzman | 2012-07-17 |
| | | * | | | | | Styles Controller - Re-add dirty event. Add data- attribute to keep created s... | Eric Guzman | 2012-07-17 |
| | * | | | | | | CSS Panel - Fix updating when media changes, sheets are deleted. | Eric Guzman | 2012-07-20 |
| | | |_|/ / / | | |/| | | | | |||
* | | | | | | | Merge branch 'refs/heads/Ninja-Master' into Document | Jose Antonio Marquez | 2012-07-23 |
|\| | | | | | | |||
| * | | | | | | Merge branch 'refs/heads/NINJA-master' into TimelineUber | Jonathan Duran | 2012-07-23 |
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | |||
| * | | | | | | Merge branch 'refs/heads/Timeline-local-kruti' into TimelineUber | Jonathan Duran | 2012-07-20 |
| |\ \ \ \ \ \ | |||
| | * | | | | | | The zoom slider resets.Commented some code | Kruti Shah | 2012-07-20 |
| | * | | | | | | Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-kruti | Kruti Shah | 2012-07-20 |
| | |\ \ \ \ \ \ | |||
| | * \ \ \ \ \ \ | Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-kruti | Kruti Shah | 2012-07-19 |
| | |\ \ \ \ \ \ \ | |||
| * | \ \ \ \ \ \ \ | Merge branch 'refs/heads/NINJA-master' into TimelineUber | Jonathan Duran | 2012-07-20 |
| |\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | | | |||
| * | | | | | | | | | Merge branch 'refs/heads/NINJA-master' into TimelineUber | Jonathan Duran | 2012-07-20 |
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / | | |/| | | | | | | | |||
| * | | | | | | | | | Improve keyframe selection by moving playhead marker to lower z-index | Jonathan Duran | 2012-07-19 |
| * | | | | | | | | | FIx 3D animation workflow | Jonathan Duran | 2012-07-19 |
| | |_|_|/ / / / / | |/| | | | | | | | |||
| * | | | | | | | | Merge branch 'refs/heads/Timeline-local-kruti' into TimelineUber | Jonathan Duran | 2012-07-19 |
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | | | |||
| | * | | | | | | | The zoom slider position remembered between multi doc switch | Kruti Shah | 2012-07-18 |
| | * | | | | | | | Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-kruti | Kruti Shah | 2012-07-18 |
| | |\ \ \ \ \ \ \ | |||
* | | \ \ \ \ \ \ \ | Merge branch 'refs/heads/Ninja-Master' into Document | Jose Antonio Marquez | 2012-07-23 |
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / | |/| | | | | | | | | |||
| * | | | | | | | | | Merge branch 'template-pi-breadcrumb' of https://github.com/mencio/ninja | Valerio Virgillito | 2012-07-22 |
| |\ \ \ \ \ \ \ \ \ |