aboutsummaryrefslogtreecommitdiff
path: root/js
Commit message (Expand)AuthorAge
* Merge branch 'refs/heads/ninja-internal-master' into copy-paste-bugfixAnanya Sen2012-07-18
|\
| * Fix: IKNINJA-1935 - Chips handling alpha 0 valuesJose Antonio Marquez2012-07-17
* | removing iframes from pasted content to prevent frame injection attackAnanya Sen2012-07-18
* | Try pasting the binary image first, since Windows Chrome places both binary a...Ananya Sen2012-07-17
* | Merge branch 'refs/heads/ninja-internal-master' into copy-paste-bugfixAnanya Sen2012-07-17
|\|
| * upgrade to codemirror 2.3Ananya Sen2012-07-16
* | Fixes : resize wrapper for content, prevent duplicate pastesAnanya Sen2012-07-17
* | Fixed copy paste from external applicationsAnanya Sen2012-07-16
|/
* Merge pull request #392 from joseeight/DocumentValerio Virgillito2012-07-16
|\
| * CSS Fixes for WindowsJose Antonio Marquez2012-07-16
| * Merge branch 'refs/heads/Ninja-Master' into DocumentJose Antonio Marquez2012-07-16
| |\
| * | New: Added knob to timeline resizerJose Antonio Marquez2012-07-13
| * | New: Improved Breadcrumb LayoutJose Antonio Marquez2012-07-13
| * | adding a container around the breadcrumb buttonValerio Virgillito2012-07-12
| * | Merge branch 'refs/heads/Ninja-Master' into DocumentJose Antonio Marquez2012-07-12
| |\ \
| * | | Improving Document Bar UIJose Antonio Marquez2012-07-12
* | | | Merge branch 'master' of github.com:Motorola-Mobility/ninjaJohn Mayhew2012-07-16
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge pull request #391 from joseeight/ColorValerio Virgillito2012-07-14
| |\ \ \ | | |_|/ | |/| |
| | * | Merge branch 'refs/heads/Ninja-Master' into ColorJose Antonio Marquez2012-07-10
| | |\|
| | * | Fixing IKNINJA-1634Jose Antonio Marquez2012-07-10
* | | | Trademark Update - added trademarked Ninja name to the splash screen and abou...John Mayhew2012-07-16
|/ / /
* | | Merge branch 'master' of github.com:Motorola-Mobility/ninja into GridFixeshwc4872012-07-11
|\ \ \ | | |/ | |/|
| * | Removed the shaders that we do not have rights to.hwc4872012-07-10
| |/
* | re-wrote the radial blur shader. Changed tolerances in the deformation shaders.hwc4872012-07-11
* | Tweak to an edge case in grid drawing.hwc4872012-07-10
* | Grid drawing changeshwc4872012-07-10
* | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Gri...hwc4872012-07-10
|\|
| * fixed incorrect capitalization for DOCTYPE htmlJohn Mayhew2012-07-09
| * cleaned up remaining copyrights for releaseJohn Mayhew2012-07-09
| * Merge pull request #381 from kriskowal/normalizeValerio Virgillito2012-07-09
| |\
| | * Normalize HTML DOCTYPEKris Kowal2012-07-09
| * | Merge branch 'refs/heads/ninja-internal-master' into codemirror-custom-theme-...Ananya Sen2012-07-09
| |\|
| | * Merge branch 'refs/heads/Ninja-Internal' into AnalyticsJose Antonio Marquez2012-07-09
| | |\
| | | * BSD LicenseKris Kowal2012-07-09
| | * | Adding Google AnalyticsJose Antonio Marquez2012-07-09
| | |/
| * | removed unnecessary todo commentsAnanya Sen2012-07-09
| * | Removed the customized xq-dark and lesser-dark themes temporarily until copyr...Ananya Sen2012-07-09
* | | Grid drawing fixeshwc4872012-07-10
* | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Gri...hwc4872012-07-09
|\ \ \ | | |/ | |/|
| * | Merge branch 'normalize' of https://github.com/kriskowal/ninja-internalValerio Virgillito2012-07-09
| |\ \
| | * | Normalize HTML doctypeKris Kowal2012-07-06
| | * | Remove byte order markers (BOM)Kris Kowal2012-07-06
| | * | Remove trailing spacesKris Kowal2012-07-06
| | * | Normalize to unix line terminatorsKris Kowal2012-07-06
| | * | Remove trailing spacesKris Kowal2012-07-06
| | * | Expand tabsKris Kowal2012-07-06
| | |/
| * | Merge branch 'GIO-TextTool' of https://github.com/dhg637/ninja-internalValerio Virgillito2012-07-09
| |\ \
| | * \ Merge branch 'refs/heads/master' into GIO-TextToolArmen Kesablyan2012-07-03
| | |\ \
| | * | | Text Tool 2Armen Kesablyan2012-07-03
| | * | | Merge branch 'refs/heads/master' into GIO-TextToolArmen Kesablyan2012-07-02
| | |\ \ \