aboutsummaryrefslogtreecommitdiff
path: root/js
Commit message (Expand)AuthorAge
* fixing uppercase name.v0.7.1Valerio Virgillito2012-07-25
* Merge branch 'master' of https://github.com/mayhewinator/ninja into v0.7.1Valerio Virgillito2012-07-24
|\
| * Merge branch 'master' of github.com:Motorola-Mobility/ninjaJohn Mayhew2012-07-24
| |\
| | * removing console logValerio Virgillito2012-07-24
| | * Merge branch 'TextTool-Color' of https://github.com/dhg637/ninjaValerio Virgillito2012-07-24
| | |\
| * | | Updated manifest.json, page title, about box and splash screen to indicate th...John Mayhew2012-07-24
* | | | Merge branch 'IKNinja_1980' of https://github.com/mqg734/ninja into v0.7.1Valerio Virgillito2012-07-24
|\ \ \ \
| * | | | IKNinja-1980 - [Shape] changing the stroke size of the object doesn't update ...Nivesh Rajbhandari2012-07-24
| | |/ / | |/| |
* | | | Merge branch 'IKNinja_1974' of https://github.com/mqg734/ninja into v0.7.1Valerio Virgillito2012-07-24
|\ \ \ \
| * | | | IKNinja-1974 - Bounding box gets separated from elements when zooming in/out ...Nivesh Rajbhandari2012-07-24
| |/ / /
| * | | Merge branch 'TimelineUber' of https://github.com/imix23ways/ninjaValerio Virgillito2012-07-24
| |\ \ \
* | | | | removed console logValerio Virgillito2012-07-24
* | | | | Merge branch 'TextTool-Color' of https://github.com/dhg637/ninja into v0.7.1Valerio Virgillito2012-07-24
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Text Tool Color Change FixArmen Kesablyan2012-07-24
* | | | | Merge branch 'TimelineUber' of https://github.com/imix23ways/ninja into v0.7.1Valerio Virgillito2012-07-24
|\ \ \ \ \ | |_|/ / / |/| | / / | | |/ / | |/| |
| * | | Remove console logsJonathan Duran2012-07-24
| * | | FIX IK-1485Jonathan Duran2012-07-24
* | | | jshint cleanup on the tools directoryValerio Virgillito2012-07-24
* | | | 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 '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 '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/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
* | | | | Merge branch 'refs/heads/NINJA-master' into TimelineUberJonathan Duran2012-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 '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
| | * | | | IKNINJA-1899 - Fixed runtime error when undoing a delete shape action.Nivesh Rajbhandari2012-07-19
| | * | | | IKNINJA-1924 - Hovering over panel resizers after collapsing and expanding pa...Nivesh Rajbhandari2012-07-19
| | * | | | Restrict materials popup to appear within our page.Nivesh Rajbhandari2012-07-19
| * | | | | Binding view: fixed mouse move event outside the hudValerio Virgillito2012-07-20
* | | | | | 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/NINJA-master' into TimelineUberJonathan Duran2012-07-20
|\ \ \ \ \ \ \ | |/ / / / / / |/| / / / / / | |/ / / / /
| * | | | | Merge branch 'refs/heads/ninja-internal-master' into copy-paste-bugfixAnanya Sen2012-07-20
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| * | | | | fixing logical error which was a side-effect of SHA:819348eaf3ff6b4a8c38ecca7...Ananya Sen2012-07-20
| * | | | | copy/paste from external apps - removed unnecessary selection change to fix P...Ananya Sen2012-07-19
* | | | | | Merge branch 'refs/heads/NINJA-master' into TimelineUberJonathan Duran2012-07-20
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge branch 'timeline-play' of https://github.com/mencio/ninjaValerio Virgillito2012-07-19
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Timeline: updated livePreview to timeline play. Hide canvas and draw red outlineValerio Virgillito2012-07-19
| | |/ / /