janishutz/color-thief
1
0
Fork 0
mirror of https://github.com/janishutz/color-thief.git synced 2026-07-27 17:29:10 +02:00
Code Issues Packages Projects Releases Wiki Activity
131 Commits 1 Branch 1 Tag
654ae6ae664740ed3afe0e1c7df5213ea5fbf73e
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Lokesh DhakarandGitHub 654ae6ae66 Merge pull request #160 from lokesh/dev 
chore: Merging dev into master for minor release v2.1
 2019-07-14 09:30:40 -07:00
Lokesh DhakarandGitHub 18ccfb4cff Merge pull request #159 from lokesh/docs-cypress-test 
docs: Info on adding Cypress browser tests
 2019-07-14 09:28:28 -07:00
Lokesh Dhakar e9829f6514 docs: Info on adding Cypress browser tests 2019-07-14 09:27:49 -07:00
Lokesh DhakarandGitHub d957f73e6f Merge pull request #158 from lokesh/feat-demo-page 
feat: Demo page
 2019-07-14 09:21:30 -07:00
Lokesh Dhakar a271686ab9 fix: Test tpl using wrong elapsedTime var 2019-07-14 09:19:57 -07:00
Lokesh Dhakar b41cd65747 feat: Add demo page back index.html 2019-07-14 09:19:41 -07:00
Lokesh DhakarandGitHub ced6b5300d Merge pull request #157 from lokesh/test-folder-refactor 
refactor: Move test files into cypress+
 2019-07-14 08:41:59 -07:00
Lokesh Dhakar 44d7870641 chore: Add license to package.json and use mustache from node_modules 2019-07-14 08:39:50 -07:00
Lokesh Dhakar 3e7554b321 refactor: Move test demo page and assets into cypress folder 2019-07-14 08:38:57 -07:00
Lokesh Dhakar 50df0f30ef chore: Update node version in nvmrc 2019-07-14 08:38:18 -07:00
Lokesh DhakarandGitHub e8dc8e1670 Merge pull request #151 from lokesh/add-eslint 
style: Add eslint
 2019-05-26 22:16:31 -07:00
Lokesh Dhakar f31f148e0a style: Fixing var declarations and aligning to eslint rules 2019-05-26 22:13:05 -07:00
Lokesh Dhakar d82f147343 style: Add eslint 2019-05-26 22:12:17 -07:00
Lokesh DhakarandGitHub 47cdb18e14 Merge pull request #150 from lokesh/dont-append-dom 
refactor: Dont append canvas tag to DOM
 2019-05-26 20:34:15 -07:00
Lokesh Dhakar a921953d1a refactor: Don't append canvas to DOM 2019-05-26 20:31:37 -07:00
Lokesh Dhakar b61e6406a1 refactor: Remove console log from demo js 2019-05-26 20:30:33 -07:00
Lokesh Dhakar 9cea24a6bf refactor: Remove unused canvas methods 2019-05-26 20:28:38 -07:00
Lokesh Dhakar 20c33cc3bb chore: Upgrade Cypress and docs on how to run tests 2019-05-25 19:18:34 -07:00
Lokesh Dhakar 7a4e672b8c test: Add getPalette() tets 2019-05-02 09:04:23 -07:00
Lokesh Dhakar eef8742c0b docs: Add palette count calls to example page 2019-05-02 08:43:05 -07:00
Lokesh Dhakar fed4154d29 docs: Add API table 2019-05-02 08:23:32 -07:00
Lokesh Dhakar eb38ecf0dc chore: Update npm dev task to ref http-server in local node_modules 2019-05-02 08:23:15 -07:00
Lokesh DhakarandGitHub fa0ada7c33 Merge pull request #146 from lokesh/add-tests 
Add Cypress tests
 2019-05-02 07:47:45 -07:00
Lokesh Dhakar 8e77715d5d Add tests: getColor on black, red, color, transparent, white image 2019-04-29 08:24:09 -07:00
Lokesh Dhakar 2ffa707ae0 Cleanup: remove unused jquery, tabs to spaces 2019-04-28 22:10:32 -07:00
Lokesh Dhakar e251daa01f Update demo code to be test specific. Remove jQuery 2019-04-28 21:12:48 -07:00
Lokesh Dhakar 621ae20cd3 Discontinue using SASS. Simplify CSS for test page 2019-04-28 21:12:26 -07:00
Lokesh Dhakar 2563e20099 Strip example page. Simplify for test cases 2019-04-28 21:11:29 -07:00
Lokesh Dhakar 43d8a74e6d wip tests: api spec stub, add test image 2019-04-28 21:10:58 -07:00
Lokesh Dhakar f63d533d65 Add more example images for testing 2019-04-28 19:36:28 -07:00
Lokesh Dhakar 42da5347b2 Fix color-thief version. Accidentally bumped prev 2019-04-28 14:07:51 -07:00
Lokesh Dhakar 5fbe83db15 Discontinue support for Bower 2019-04-28 14:07:39 -07:00
Lokesh Dhakar 7fb3680a92 Remove unused lint config files 2019-04-28 14:07:30 -07:00
Lokesh Dhakar e2db15e67a remove DEPLOY.md 2019-04-28 14:05:38 -07:00
Lokesh Dhakar b94c175a7a Move deploy notes to contributing.md 2019-04-28 14:05:23 -07:00
Lokesh DhakarandGitHub 4f980ae788 Merge pull request #145 from lokesh/replace-grunt 
Replace Grunt and use npm tasks
 2019-04-28 14:01:53 -07:00
Lokesh Dhakar e0ff746a2d Switch to uglify-es for minification 2019-04-28 13:59:49 -07:00
Lokesh Dhakar 9a4443097c Replace Grunt w/node deps: http-server, node-minify, uglify 2019-04-28 13:58:49 -07:00
Lokesh Dhakar dadaba619a testing: Remove Cypress examples 2019-04-27 23:00:07 -07:00
Lokesh Dhakar 2b04a97f79 add: editorconfig 2019-04-27 22:59:45 -07:00
Lokesh Dhakar f319e54b19 Add Cypress dep for testing 2019-04-27 20:52:10 -07:00
Lokesh Dhakar 105c888e73 Add node engine req to package.json 2019-04-27 20:51:13 -07:00
Lokesh Dhakar 9cf5e33ecd Add nvmrc file 2019-04-27 20:50:53 -07:00
Lokesh DhakarandGitHub 0951178b1b Merge pull request #136 from nbwsc/master 
fix a bug in VBOX.contains
 2019-04-22 21:04:15 -07:00
Lokesh DhakarandGitHub 4f0acc1759 Merge pull request #143 from ajmeese7/master 
Implemented detectmobilebrowsers
 2019-04-22 21:01:50 -07:00
Lokesh DhakarandGitHub d05ec978b0 Merge pull request #81 from ibobo/master 
Fixed getColor description in README
 2016-11-06 18:36:35 -08:00
Lokesh DhakarandGitHub b011513147 Merge pull request #57 from mhahmadi/mhahmadi_fix_getpalette_validation 
fixes #56
 2016-11-06 15:41:06 -08:00
Lokesh DhakarandGitHub 5d1b4d0dc6 Merge pull request #99 from ali-bugdayci/master 
Fix the 'ReferenceError: index is not defined' for the index variable
 2016-11-06 15:38:36 -08:00
Lokesh DhakarandGitHub 28f22b97d1 Merge pull request #103 from patrickkeenan/master 
cross-domain and url
 2016-11-06 15:35:24 -08:00
Lokesh Dhakar e1908027bf JS listing rules. Not currently used 2016-10-30 20:24:05 -07:00
Lokesh Dhakar 65fc4c26b5 Cleaned up gruntfile and am considering js lint 2016-10-30 20:23:54 -07:00
Lokesh Dhakar c9236b189d Add DEPLOY.md because I have a bad memory 2016-10-30 20:23:32 -07:00
Lokesh Dhakar e3670978a9 Add @license directive for preserving comments w/uglify 2016-10-30 20:22:50 -07:00
Lokesh Dhakar 30f791290a readme 2016-10-30 20:21:29 -07:00
Lokesh Dhakar af478eb09c Remove private boolean from package.json. Upgrade deps. 2016-10-30 20:21:15 -07:00
Lokesh Dhakar de968be816 2.0.1: readme and version # 2015-10-05 08:35:57 -07:00
Lokesh Dhakar 36a3c4171e Remove CC License refs. MIT all-around. 2015-10-05 08:33:52 -07:00
Lokesh Dhakar 050157dc19 Switch to MIT License. Move demo page items out of repo. 2015-06-29 17:53:07 -07:00
Lokesh Dhakar 5a62eff143 Move Changelog into README.md from HISTORY.md 2015-06-29 17:48:38 -07:00
Lokesh Dhakar bf471cf160 Merge pull request #37 from chellem/patch-1 
Update bower.json
 2015-06-29 17:14:45 -07:00
Lokesh Dhakar 0511b9d531 Merge pull request #55 from mhahmadi/mhahmadi_fix_mmcq_return_value 
fixes #54
 2015-06-29 17:12:24 -07:00
Lokesh Dhakar 747cf9d724 Merge pull request #33 from nteike/patch-1 
Fixes issue #32
 2015-06-29 17:09:21 -07:00
Lokesh Dhakar 4a083ade33 Merge pull request #59 from dkushner/master 
Fix Bower config.
 2015-06-29 16:58:55 -07:00
Lokesh Dhakar 98f2f86f7b Merge pull request #64 from joscha/patch-1 
Fix main file path
 2015-06-29 16:58:25 -07:00
Lokesh Dhakar 26a43bdb80 Merge pull request #70 from kkirsche/patch-1 
Remove moot `version` property from bower.json
 2015-06-29 16:57:51 -07:00
Lokesh Dhakar d515f4c344 Dropped sourcemap from repo 2014-04-17 11:42:15 -07:00
Lokesh Dhakar 9cbad46067 Reorganize files for Bower distro 2014-04-17 11:07:23 -07:00
Lokesh Dhakar cb5c9c6ca8 Updated demo page. Added package.json and bower.json. 2014-04-08 01:22:14 -04:00
Lokesh Dhakar a2b283ae68 Merge pull request #21 from kraftner/patch-1 
Add bang to keep copyright info on minification
 2014-03-26 22:40:11 -07:00
Lokesh Dhakar e1bb8f2dc8 Merge pull request #16 from nobodypb/patch-1 
Fixed issues in MMCQ
 2013-07-29 08:14:08 -07:00
Lokesh Dhakar 355a5119a7 Fixed twitter link in read me. Cleaned up css and removed unused font. 2013-06-30 22:31:44 -07:00
Lokesh Dhakar 16aa015588 Demo page edits: description and author meta tags and addition of Google Analytics 2013-06-24 23:25:17 -07:00
Lokesh Dhakar 9baa251095 readme style 2013-06-23 22:37:24 -07:00
Lokesh Dhakar 83252ac217 Updated read me 2013-06-23 22:34:11 -07:00
Lokesh Dhakar 0adb00daf1 Make colorCount arg optional in getPalette function. 2013-06-23 22:32:28 -07:00
Lokesh Dhakar 0f590b91ee Updated read me 2013-06-23 22:27:41 -07:00
Lokesh Dhakar b088790b8d - Removed jquery dependency for color-thief.js 
- Updated jquery and modernizr for demo page.
 2013-06-23 22:18:58 -07:00
Lokesh Dhakar 4272252db9 Drag'n'drop working again. Appending quantize.js code into color-thief.js 2013-06-23 18:26:36 -07:00
Lokesh Dhakar d3800d634d Drag-n-drop support+. Thanks nspady. 
- Updated to higher res demo images.
- Split template into two.
- Style clean up in color-thief.js
 2013-06-23 12:33:07 -07:00
Lokesh Dhakar d468c7f08a Merge pull request #12 from nspady/drag-drop 
Drag drop
 2013-06-07 00:07:57 -07:00
Lokesh Dhakar 681cfe8b0d Merge branch 'dev' 2012-04-23 17:38:17 -04:00
Lokesh Dhakar 0043a335d8 . 2012-04-23 17:36:38 -04:00
Lokesh Dhakar 4f41b5afcf Merge branch 'release-1.0' 2012-04-23 17:16:04 -04:00
Lokesh Dhakar d6181e84cc js file had incorrect script name at top 2012-04-23 17:14:06 -04:00
Lokesh Dhakar 79d4c70838 FIX: issue #9 - applying css attribs over img ruins the palette function. FIX: issue #3- update README regarding createPalette return val 2012-04-23 17:13:05 -04:00
Lokesh Dhakar 5cf0e60319 Merge commit 'v1.0' into dev 2012-04-22 01:29:55 -04:00
Lokesh Dhakar 80d4f00208 release v1.0 with all of jfsiii edits 2012-04-22 01:04:48 -04:00
Lokesh Dhakar c7f31eaa35 github pull requests all added manually 2012-04-22 00:55:39 -04:00
Lokesh Dhakar 0123a7bff0 All of jfsiii awesome edits are now in place. 2012-04-22 00:48:46 -04:00
Lokesh Dhakar 6c351ce0e8 test 2012-04-21 22:04:09 -04:00
Lokesh Dhakar bfd9412153 Merge pull request #8 from michaelhart/master 
Fix for Quantize Returning false
 2012-04-21 17:43:11 -07:00
Lokesh Dhakar fb1bba5df2 text updates to the demo page, minor 2011-11-26 13:11:28 -05:00
Lokesh Dhakar 6abadd8cf0 text tweaks 2011-11-03 23:04:51 -04:00
Lokesh Dhakar c7557d8b1f updated link to blog 2011-11-03 20:55:43 -04:00
Lokesh Dhakar 2929c9db1d .gitignore mess up, back to normal 2011-11-03 20:51:20 -04:00
Lokesh Dhakar 35e95c66af design improvements to demo page 2011-11-03 20:40:46 -04:00
Lokesh Dhakar 0d06405241 more rm updates 2011-11-03 18:06:32 -04:00
Lokesh Dhakar 24193647d8 more rm updates 2011-11-03 18:04:47 -04:00
Lokesh Dhakar c906e16fec more rm updates 2011-11-03 18:04:23 -04:00
Lokesh Dhakar d4d7c0f6c9 more rm updates 2011-11-03 18:02:32 -04:00