Commit Graph

46 Commits (2c37a2cb7ec876f744a8570006ad7407382388ed)

Author SHA1 Message Date
eric 6535505e4d Revert "Merge branch 'master' into master"
This reverts commit bd52df020d, reversing
changes made to e455d9a766.
2018-11-03 17:23:07 -04:00
eshellman bd52df020d Merge branch 'master' into master 2018-11-03 17:06:09 -04:00
eric a6b735df71 pyepub should allow commented nodes in metadata 2018-07-29 16:57:36 -04:00
eric 26bab0af68 last 2.0 deprecations 2018-07-24 11:33:39 -04:00
eric 50f0294b59 is_anonymous and is_authenticated are properties 2018-07-23 22:17:05 -04:00
eric f453555bf3 redirects should send user back to supporter page 2018-07-20 07:54:14 -04:00
eshellman 6f2391b0b9
Merge branch 'update' into master 2018-06-26 14:29:02 -05:00
eric e82c389236 make sure to queue the notification emmisions
so that we don't need the emit_notices cron job
2018-06-20 15:57:34 -04:00
eric 3661faec0a Merge remote-tracking branch 'Gluejar/master' into catchup
# Conflicts:
#	core/models/__init__.py
#	core/models/bibmodels.py
#	vagrant/host_vars/prod/secrets.yml
2018-05-23 13:56:27 -04:00
jonahmania 52957407ad Merge in master 2018-04-24 09:24:58 -04:00
eric 39fdd9683a rip out dead code 2018-04-19 12:24:34 -04:00
nicholas antonov 0efba31c86 Hide read button if no epub 2018-04-03 13:32:00 -04:00
nicholas antonov 03a9a30a0b remove extra print statement 2018-04-03 13:25:22 -04:00
nicholas antonov 3d6124fb76 make read page work off of book id 2018-03-28 12:17:05 -04:00
nicholas antonov 825e682a17 get reader in a working state 2018-03-27 15:27:02 -04:00
nicholas antonov 1bec7f0ea4 Add loading gif 2018-03-20 15:13:04 -04:00
Nicholas Antonov 8fed54c005 Add read page 2018-02-20 14:27:40 -05:00
eric 5305b08e10 failed when campaign name is not ascii 2018-02-17 13:57:52 -05:00
eric b148a1925e harden search 2018-02-01 15:18:14 -05:00
eric 91f4f713c0 axe the ungluer lists 2018-01-31 17:42:59 -05:00
eric 7a8a621a59 stop showing random ungluers on work page 2018-01-24 14:41:14 -05:00
eric ec5aa5f599 don't do google books search for bad robots 2018-01-12 12:05:57 -05:00
eric a3aab48ea7 simplified response for work HEAD 2018-01-12 12:05:13 -05:00
eric c896fdeba4 add handing for pledge->donation 2017-12-14 21:38:14 -05:00
eric 4aeae6e67c implement donation options 2017-12-14 16:24:26 -05:00
eric 22870a4350 harden object retrieval against unexpected input 2017-12-08 20:58:37 -05:00
eric 816b0a1099 how did that ever work? 2017-12-08 11:04:00 -05:00
eric 132d87f8e4 clean up campaign-manage 2017-11-27 21:45:45 -05:00
eric a957706c23 clean up campaign creation 2017-11-27 20:12:42 -05:00
eric 12cbac63b3 revise documentation, faq 2017-11-18 16:35:19 -05:00
eric bb29fc3d1f remove gluejar.com 2017-11-18 16:34:56 -05:00
eric ce003c5607 revise rh signup workflow 2017-11-13 15:30:00 -05:00
eric 96f40a8514 add rh agreement form 2017-11-07 10:43:40 -05:00
eshellman 9216f40356
Merge pull request #713 from EbookFoundation/master
Master
2017-10-30 12:57:45 -04:00
eric b5e52effd9 optimize id access
See
https://docs.djangoproject.com/en/1.11/topics/db/optimization/#use-forei
gn-key-values-directly
2017-10-28 18:33:58 -04:00
eric efbffa683c Open up editing privileges
keep track of who has added the work with a many-to-many table
2017-10-26 13:03:05 -04:00
Nicholas Antonov 9aab5dae69 Fix merge conflict 2017-10-21 21:18:32 -04:00
eric 29df43156b Merge remote-tracking branch 'Gluejar/master' 2017-09-14 12:42:42 -04:00
eric fc23d6bbab fixed issue with no ebook on ebf 2017-09-06 18:02:40 -04:00
eric 5bbeb45053 improve merge_works
work_relations were not being updated
2017-09-04 16:10:24 -04:00
eric 84da8bde94 Merge remote-tracking branch 'Gluejar/master'
# Conflicts:
#	frontend/views/__init__.py
#	questionnaire/admin.py
#	questionnaire/urls.py
#	questionnaire/utils.py
#	questionnaire/views.py
2017-08-21 12:02:48 -04:00
eric db97a98ae8 https 2017-07-27 10:33:13 -04:00
eric 52127faec9 put id creation at start of new edition form
this reworks the identifier creation UI
2017-07-26 17:33:38 -04:00
eric 85c4c3601c small refactor 2017-07-25 08:21:26 -04:00
eric 5c46c70fb1 delint and fix 2017-07-25 08:14:05 -04:00
eric d3eaf43228 start views reorg 2017-07-25 07:29:23 -04:00