Commit message (Expand) | Author | Age | ||
---|---|---|---|---|
... | ||||
* | | | | | 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/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 | |
* | | | | | | | 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/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/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 | |
| |\ \ \ \ \ \ \ \ | ||||
| | * | | | | | | | | Unifying the banner and animation template display of ninja-content | Valerio Virgillito | 2012-07-20 | |
| | | |_|/ / / / / | | |/| | | | | | | ||||
* | | | | | | | | | Merge branch 'refs/heads/Ninja-Master' into Document | Jose Antonio Marquez | 2012-07-20 | |
|\| | | | | | | | | ||||
| * | | | | | | | | Merge branch 'Fixes_071' of https://github.com/mqg734/ninja | Valerio Virgillito | 2012-07-20 | |
| |\ \ \ \ \ \ \ \ | ||||
| | * | | | | | | | | If no material was defined, use Flat material when switching from 2d to WebGL... | Nivesh Rajbhandari | 2012-07-20 | |
| | * | | | | | | | | IKNINJA-1780 - [Shape] Error when opening document that contains a shape with... | Nivesh Rajbhandari | 2012-07-19 | |
| | * | | | | | | | | IKNINJA-1899 - Fixed runtime error when undoing a delete shape action. | Nivesh Rajbhandari | 2012-07-19 | |
| | * | | | | | | | | IKNINJA-1924 - Hovering over panel resizers after collapsing and expanding pa... | Nivesh Rajbhandari | 2012-07-19 | |
| | * | | | | | | | | Restrict materials popup to appear within our page. | Nivesh Rajbhandari | 2012-07-19 | |
| * | | | | | | | | | Binding view: fixed mouse move event outside the hud | Valerio Virgillito | 2012-07-20 | |
| | |_|_|_|/ / / / | |/| | | | | | | | ||||
* | | | | | | | | | Merge branch 'refs/heads/Ninja-Master' into Document | Jose Antonio Marquez | 2012-07-20 | |
|\| | | | | | | | | ||||
| * | | | | | | | | Merge branch 'refs/heads/ninja-internal-master' into copy-paste-bugfix | Ananya Sen | 2012-07-20 | |
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | ||||
| * | | | | | | | | fixing logical error which was a side-effect of SHA:819348eaf3ff6b4a8c38ecca7... | Ananya Sen | 2012-07-20 | |
| * | | | | | | | | copy/paste from external apps - removed unnecessary selection change to fix P... | Ananya Sen | 2012-07-19 | |
* | | | | | | | | | Merge branch 'refs/heads/Ninja-Master' into Document | Jose Antonio Marquez | 2012-07-20 | |
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | ||||
| * | | | | | | | | Merge branch 'timeline-play' of https://github.com/mencio/ninja | Valerio Virgillito | 2012-07-19 | |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | ||||
| | * | | | | | | | Timeline: updated livePreview to timeline play. Hide canvas and draw red outline | Valerio Virgillito | 2012-07-19 | |
| | |/ / / / / / | ||||
| * | | | | | | | Merge branch 'RadialBlur' of https://github.com/ericmueller/ninja | Valerio Virgillito | 2012-07-19 | |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | |