Raymond Yee
|
2959b68549
|
Merge pull request #246 from Gluejar/b2u_ungluify
B2u ungluify
|
2013-11-15 15:59:05 -08:00 |
|
Raymond Yee
|
90a6cb33ca
|
Merge pull request #248 from Gluejar/work_lang_fix
replace example book with one recognized now by Google Books
|
2013-11-15 15:48:05 -08:00 |
|
Raymond Yee
|
a98b43ede3
|
replace example book with one recognized now by Google Books
|
2013-11-15 15:47:02 -08:00 |
|
Raymond Yee
|
671c863a21
|
Merge pull request #247 from Gluejar/faq_payment
faq: Why don't you use Paypal or Amazon?
|
2013-11-15 11:46:11 -08:00 |
eric
|
6787ccd5d8
|
faq: Why don't you use Paypal or Amazon?
|
2013-11-15 13:43:38 -05:00 |
|
eric
|
47dd298a78
|
update campaign successful notifications
|
2013-11-15 12:06:06 -05:00 |
|
eric
|
188d34ea51
|
added test for b2u ungluify
(also tests now invoke booxtream in test mode)
|
2013-11-15 11:25:41 -05:00 |
|
eric
|
a701edf3b2
|
make ebook entries yay
|
2013-11-15 02:10:14 -05:00 |
|
eric
|
efea7d0198
|
on success, add a cc license, watermark (and generate mobi), and save
|
2013-11-14 23:16:55 -05:00 |
|
eric
|
c6edd83884
|
Merge branch 'master' into b2u_ungluify
|
2013-11-14 14:58:22 -05:00 |
|
eric
|
c5eee08034
|
edit wording
|
2013-11-14 14:58:02 -05:00 |
|
eric
|
5d4539b305
|
enable ebookfile download and secure ebookfile storage
|
2013-11-14 14:48:16 -05:00 |
|
eric
|
9cf7385324
|
move campaign completion logic to campaign
|
2013-11-14 12:40:01 -05:00 |
|
eric
|
0dad79a3d4
|
fix bug comparing dates with times
|
2013-11-14 12:38:58 -05:00 |
|
Raymond Yee
|
3b919bd577
|
Merge pull request #245 from Gluejar/b2u_server_errors
fix the problem writing unicode to zipfile
|
2013-11-13 09:58:54 -08:00 |
|
eric
|
2e5bcb3119
|
fix the problem writing unicode to zipfile
|
2013-11-13 12:56:18 -05:00 |
|
Raymond Yee
|
8f5475ad36
|
Merge pull request #244 from Gluejar/b2u_server_errors
StringIO should be fed a unicode string if possible
|
2013-11-12 15:51:34 -08:00 |
|
eric
|
a64c9470e2
|
StringIO should be fed a unicode string if possible
|
2013-11-12 18:48:43 -05:00 |
|
Raymond Yee
|
eabd8d1ecc
|
Merge pull request #243 from Gluejar/b2u_server_errors
somehow the "borrow" function wasn't tested in "reserves"
|
2013-11-12 15:31:31 -08:00 |
|
eric
|
8bb514a401
|
somehow the "borrow" function wasn't tested in "reserves"
|
2013-11-12 17:28:07 -05:00 |
|
eric
|
e4b3d387fe
|
correct documentation notes
|
2013-11-12 14:58:29 -05:00 |
|
eric
|
e9de656bfc
|
make sure current_total gets updated
|
2013-11-12 14:58:11 -05:00 |
|
eric
|
c07f9da538
|
Merge branch 'master' into b2u_ungluify
|
2013-11-12 14:49:12 -05:00 |
|
eric
|
2786b871d3
|
update status now works for b2u
|
2013-11-12 14:48:04 -05:00 |
|
Raymond Yee
|
0875482611
|
Merge pull request #242 from Gluejar/library_agreement
added docracy links
|
2013-11-12 10:55:14 -08:00 |
|
Raymond Yee
|
dd5d1630b5
|
Merge pull request #238 from Gluejar/fix_email_change
didn't have a template for a failed email-change
|
2013-11-12 10:49:15 -08:00 |
|
Raymond Yee
|
9bbcf8ac57
|
Merge pull request #237 from Gluejar/onhover_explainers
add onhover explainers to ungluing date and amount to go
|
2013-11-12 10:46:51 -08:00 |
|
eric
|
510f0a2d41
|
added docracy links
|
2013-11-12 11:35:12 -05:00 |
|
Raymond Yee
|
92cc2c3568
|
Merge pull request #241 from Gluejar/fix_just_crontab
drop emit_notifications from celery right now since we're using crontab ...
|
2013-11-12 06:41:51 -08:00 |
|
Raymond Yee
|
d3a784812c
|
drop emit_notifications from celery right now since we're using crontab for now
|
2013-11-12 06:40:34 -08:00 |
|
Raymond Yee
|
f016bbb4c1
|
Merge pull request #240 from Gluejar/reserves
fix silly method of turning off notifications
|
2013-11-12 06:01:53 -08:00 |
|
Raymond Yee
|
5bcab49976
|
Merge pull request #239 from Gluejar/fix_just_crontab
get rid of referene to regluit.settings.please in the just crontab
|
2013-11-11 18:01:13 -08:00 |
|
Raymond Yee
|
7f35d0b74d
|
/opt/regluit/ENV/bin/django-admin.py emit_notices --settings=regluit.settings.please ->
/opt/regluit/ENV/bin/django-admin.py emit_notices --settings=regluit.settings.just
|
2013-11-11 17:58:19 -08:00 |
|
eric
|
1713a9fbb2
|
prettier
|
2013-11-11 14:09:41 -05:00 |
|
eric
|
264c7c9946
|
didn't have a template for a failed email-change
|
2013-11-11 14:01:40 -05:00 |
|
eric
|
ffd6796bfd
|
fix silly method of turning off notifications
|
2013-11-10 10:28:22 -05:00 |
|
eric
|
4582537f05
|
add onhover explainers to ungluing date and amount to go
on work and purchase pages
|
2013-11-09 20:34:13 -05:00 |
|
Raymond Yee
|
b51e901149
|
Merge pull request #236 from Gluejar/importfix1108
must preface timedelta with datetime
|
2013-11-08 21:32:04 -08:00 |
|
Raymond Yee
|
073b618fd8
|
must preface timedelta with datetime
|
2013-11-08 21:30:18 -08:00 |
|
Raymond Yee
|
3b03f7a23f
|
Merge pull request #234 from Gluejar/reserves
Reserves
|
2013-11-08 14:07:39 -08:00 |
|
eric
|
00693f7a23
|
Merge branch 'master' into reserves
Conflicts:
core/models.py
|
2013-11-08 16:07:29 -05:00 |
|
Raymond Yee
|
ffbe93d860
|
Merge pull request #235 from Gluejar/b2u_alert
change alert messages -> Se tests work (no surprise since HTML change only) -> send to Jenkins
|
2013-11-08 11:49:41 -08:00 |
|
eric
|
e5a9b5384f
|
change alert messages
|
2013-11-08 13:38:07 -05:00 |
|
eric
|
b14122613e
|
fix tests
|
2013-11-08 12:49:22 -05:00 |
|
eric
|
0840a1fd71
|
implement holds. Also fix borrow view that didn't specify work.
|
2013-11-08 12:13:34 -05:00 |
|
Raymond Yee
|
fe17499af8
|
Merge pull request #233 from Gluejar/epub_errors
improve bad epub error handling -- Se test runs -- passing to Jenkins
|
2013-11-08 08:20:19 -08:00 |
|
Raymond Yee
|
5a7a2dd27a
|
Merge pull request #232 from Gluejar/acq_admin
add Acq to admin system [#59972686] -> Se test ok; pass to Jenkins
|
2013-11-08 07:56:35 -08:00 |
|
eric
|
275f299f81
|
campaign setup cleanup: was broken when more than one claim existed
|
2013-11-07 13:35:35 -05:00 |
|
eric
|
e6692f7932
|
This was causing reserved licenses to be immediately borrowed
|
2013-11-07 13:32:00 -05:00 |
|
eric
|
2d86584129
|
add Acq to admin system
|
2013-11-06 23:25:52 -05:00 |