Commit Graph

112 Commits

Author SHA1 Message Date
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
Nathan Spady
9ba67b93f0 Update jQuery version from 1.6.2 to 1.8.3. 2012-12-21 13:19:37 -06: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
Michael Hart
a543586e7a Fix for lack of quantize response 2012-04-01 00:23:21 -03: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