Commit Graph

84 Commits

Author SHA1 Message Date
Lokesh Dhakar
d05ec978b0 Merge pull request #81 from ibobo/master
Fixed getColor description in README
2016-11-06 18:36:35 -08:00
Lokesh Dhakar
b011513147 Merge pull request #57 from mhahmadi/mhahmadi_fix_getpalette_validation
fixes #56
2016-11-06 15:41:06 -08:00
Lokesh Dhakar
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 Dhakar
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
Patrick Keenan
be918bbaef cross-domain and url
getColorFromUrl gets color from an image served from the same domain,
so you don't have to create an image element to get the color.

getColorAsync gets the color from another domain that has an open
cross-domain policy.
2016-05-27 12:32:31 -07:00
Ali Bugdayci
f0e57ddebe Fix the 'ReferenceError: index is not defined' for the index variable 2016-04-20 14:00:24 +03: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
iBobo
b0bde62d91 Fixed getColor description in README
The README erroneously stated that getColor would return a js object with 'r', 'g' and 'b' members, instead it returns an array just like getPalette.
2015-08-17 12:36:21 +02: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
Kevin Kirsche
bfdd1c3dc0 Remove moot version property from bower.json
Per bower/bower.json-spec@a325da3
2015-06-10 19:48:33 -04:00
Joscha Feth
7afed6a0cf Fix main file path 2015-04-23 15:57:43 +02:00
Dave Kushner
cc2363adaf Fix Bower config. 2015-03-24 13:59:03 -07:00
Mohamad Ahmadi
aff2b1483f fixes #56
Signed-off-by: Mohamad Ahmadi <mohamadhasan.ahmadi@gmail.com>
2015-02-15 12:29:24 -05:00
Mohamad Ahmadi
e08df6c316 fixes #54
Signed-off-by: Mohamad Ahmadi <mohamadhasan.ahmadi@gmail.com>
2015-02-15 12:01:47 -05:00
Dickriven Chellemboyee
9b1382f6bb Update bower.json
change js to src
2014-06-20 14:58:23 +04:00
nteike
fb256832b8 Fixes issue #32 2014-05-19 15:29:04 +02: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
kraftner
1148fa1842 Add bang to keep copyright info on minification 2013-11-15 13:48:11 +01:00
Lokesh Dhakar
e1bb8f2dc8 Merge pull request #16 from nobodypb/patch-1
Fixed issues in MMCQ
2013-07-29 08:14:08 -07:00
nobodypb
21d3f14b4b Fixed issues in MMCQ
Nick Rabinowitz made some ridiculous mistakes, that really have to be fixed.
2013-07-16 02:14:59 +02: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
Nathan Spady
b23a475248 Fixed inital image upload bug and image centering issues 2013-05-11 18:50:33 -07:00
Nathan Spady
1dd3764fd2 Added support for multiple drag/drop images, as well as successive images. 2012-12-22 17:50:42 -06:00
Nathan Spady
bdbaf8c5d0 Basic drag and drop functionality added. 2012-12-21 13:47:34 -06:00