6fe4a2dc6e
Merge pull request #209 from Gluejar/just_settings
...
not using unglueit.com any more
2013-09-11 15:13:46 -07:00
e075fd0081
not using unglueit.com any more
2013-09-11 13:43:49 -04:00
b78fb2fad4
Merge pull request #208 from Gluejar/unmix_readmill
...
readmill downloads can't have mixed redirects -- looks ok to try out
2013-09-11 08:33:30 -07:00
2e58255e6c
readmill downloads can't have mixed redirects
2013-09-11 11:31:20 -04:00
424ecf3034
Merge pull request #207 from Gluejar/fix_kindle_send
...
only 2 o's in ebook
2013-09-09 13:57:17 -07:00
4038ea53e7
fix Kindle_config 404
2013-09-09 15:48:27 -04:00
4509cea6dd
only 2 o's in ebook
2013-09-09 15:20:58 -04:00
789c9623d4
Merge pull request #206 from Gluejar/preview_pledge
...
looks right -- Se tests run ok -- so worth doing the merge to see what jenkins thinks. (Remove pledge form error when campaign is not active. [#56565596 ])
2013-09-09 08:37:31 -07:00
2329f9b088
Merge branch 'master' into preview_pledge
2013-09-09 08:32:56 -07:00
2b11153fc6
Merge pull request #205 from Gluejar/messages_notices
...
Notices, not Messages
2013-09-09 08:30:38 -07:00
63f0ee3794
Remove pledge form error when campaign is not active. [ #56565596 ]
2013-09-09 09:54:16 -04:00
5c8b67a1c9
Merge pull request #204 from Gluejar/b2u_errata
...
B2u errata
2013-09-07 09:23:05 -07:00
c78cc37391
Merge branch 'master' into b2u_errata
2013-09-07 09:20:04 -07:00
47fac4c817
Merge pull request #203 from Gluejar/b2u_download
...
B2u download
2013-09-07 06:54:09 -07:00
de17f02298
[ #56528504 ] fixed lanfing page for purchases
2013-09-06 22:19:46 -04:00
e98273bd9a
[ fixes #56555424 ] Setting up to run selenium test on Firefox (with an upgrade of Selenium server)
2013-09-06 16:09:23 -07:00
f98684e1f8
Notices, not Messages
...
A review of the entire site reveals that we use "Messages" in only one
place, the sitewide menu item leading to the notices page. Most of our
Notices are more acurately described as notices than as messages, so
will change the menu item.
2013-09-06 16:06:10 -04:00
4b3c899088
[ #55666760 ] make fund-complete page sensetive to action
2013-09-06 13:58:23 -04:00
6294c15aad
TGFT
2013-09-06 00:14:06 -04:00
aad6d72207
Merge branch 'master' into b2u_download
...
Conflicts:
core/signals.py
2013-09-05 22:56:46 -04:00
b801eb4927
add acq handling to download
...
needs migration. should migrate core back to 0052 to refresh acq table
download page no longer passes ebook ids to send_to_kindle, url
calculations are now done in view
2013-09-05 22:54:11 -04:00
5bb359fb1e
safe_get_work not used everywhere it should have been
2013-09-05 16:14:51 -04:00
678372b863
Merge branch 'b2u_fulfillment'
2013-08-30 12:14:28 -07:00
6b4898c700
for now add s3 keys to jenkins -- ideally, we should set up separate keys
2013-08-30 12:13:44 -07:00
aceeba2cd8
Merge branch 'master' of github.com:Gluejar/regluit
2013-08-30 11:32:04 -07:00
55d84deaf9
not sure why this problem didn't surface before...
2013-08-30 14:17:45 -04:00
c5048c15b5
Merge pull request #202 from Gluejar/b2u_fulfillment
...
B2u file upload, testing and watermarking
2013-08-30 11:08:29 -07:00
715bf049bc
Merge branch 'b2u_fulfillment' of https://github.com/Gluejar/regluit into b2u_fulfillment
...
Conflicts:
core/signals.py
2013-08-29 22:16:42 -04:00
f8df110163
only watermark on purchase
2013-08-29 11:57:41 -04:00
646c8f09e3
I think it's right to move the logic into the else: https://github.com/Gluejar/regluit/pull/202#discussion_r6059064
2013-08-29 06:29:45 -07:00
4e161bebe6
explicit import of regluit.core.parameters
...
move to using the openly available github hosted version of Eric's Open Access Ebooks for core.EbookFileTests.test_ebookfile test
Should we delete the static/test epub?
2013-08-28 17:13:35 -07:00
0ba5c9a00e
cleanup, plus tests
2013-08-27 18:03:35 -04:00
2f1d99418c
Merge pull request #201 from Gluejar/more_b2u
...
More b2u
2013-08-27 08:51:18 -07:00
e51fa1190e
wired watermarker into file uploads. migration needed
2013-08-26 23:56:01 -04:00
e5a162061d
only epub files to be uploaded for now
2013-08-26 23:54:19 -04:00
ef3de5bd88
fix error handling, remove dead code
2013-08-26 23:43:40 -04:00
567f20d5a2
move more constants
2013-08-25 23:52:09 -04:00
e2bd56ce9d
add boox model to track watermarked files
2013-08-25 23:35:27 -04:00
0a2e73051a
Merge branch 'booxtream' into b2u_fulfillment
2013-08-25 17:19:05 -04:00
10b975b839
initial commit
2013-08-23 17:14:48 -04:00
cbc34db3d7
fix bug found by luc
2013-08-22 16:12:27 -04:00
1c33c34f21
purchase complete notification, contextual wishlist active, fulfillment in signal handler
2013-08-22 14:30:56 -04:00
f93fe51e29
days_per_copy properties
2013-08-22 14:23:47 -04:00
3bdb755419
move constant to params file to improve import
2013-08-22 14:22:54 -04:00
75ec13cb39
make sure the transaction isn't double charged!
2013-08-22 14:03:22 -04:00
cf1eae6a5f
Merge pull request #200 from Gluejar/ebook_selling
...
Ebook selling
2013-08-20 17:48:50 -07:00
bec85ff82e
1st crack at faq revision
2013-08-20 14:11:11 -04:00
ff2d995cd5
minor wording changes
2013-08-20 12:41:39 -04:00
159ad0db05
fix tests, fix bugs found by tests
2013-08-20 01:01:36 -04:00
80d78e624f
remove amazon cruft to get current_total correct
2013-08-19 23:23:27 -04:00
Raymond Yee
eric