Commit Graph

2762 Commits (40e5d3f2cc941b41533e00801f1775ae139962e2)

Author SHA1 Message Date
eric 82784778c4 add springer scraper 2017-12-06 18:13:46 -05:00
eric 3889259fd8 wrong template 2017-12-06 13:59:05 -05:00
eric 20902c7676 fix identifier validation 2017-12-02 18:02:47 -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
eshellman 36385ffc54
Merge pull request #719 from Gluejar/revise-new-rh
Revise new rh process and docs
2017-11-18 16:36:03 -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 50a0296eee add supporter facet 2017-11-08 17:29:41 -05:00
eric 96f40a8514 add rh agreement form 2017-11-07 10:43:40 -05:00
eric 980e28eb54 deleting author should return to edit page 2017-11-06 11:22:31 -05:00
eric a345566680 add file input handling to filetype js 2017-10-30 21:13:38 -04:00
eric b4184b4ddc also save the work title 2017-10-30 19:23:11 -04: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 ff51103e3d fix setting is_free 2017-10-27 17:38:55 -04:00
eric 10e4ea1eba don't require last add author 2017-10-26 13:32:15 -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 3602c3c964 fix bug where ids weren't cleaned 2017-10-17 15:44:44 -04:00
eric 170a6b7b16 Merge remote-tracking branch 'Gluejar/master' 2017-10-06 15:36:29 -04:00
eric 5426926fbb fix "my faves" link 2017-09-28 13:36:20 -04:00
eric 4077127f3f guess I didn't test this! 2017-09-26 10:36:51 -04:00
eric 4aa968a523 change behavior of reset password
- send email even if password is unusable
- tell user if there's no user with that email
2017-09-22 16:54:16 -04:00
eric d968a800ae don't require old password if social auth 2017-09-22 16:02:43 -04:00
eric 19266d35ee remove social_auth_reset_password 2017-09-22 14:50:35 -04:00
eric 29df43156b Merge remote-tracking branch 'Gluejar/master' 2017-09-14 12:42:42 -04:00
eric 5ba314c0ab fix missing book-cover class
(made that change too quickly!
2017-09-14 11:42:27 -04:00
eric fc23d6bbab fixed issue with no ebook on ebf 2017-09-06 18:02:40 -04:00
eric d891a61bcd uniform edition cover images 2017-09-04 17:10:23 -04:00
eric 5bbeb45053 improve merge_works
work_relations were not being updated
2017-09-04 16:10:24 -04:00
eric c49281b84c incorrect usage
Not sure why the error (tag not loaded) didn't occur on my local
machine.

the purchased tag is executed on the work template, no need to execute
on work_action. It adds values into the context object.
2017-08-27 14:18:50 -04:00
eric 99d619fc2e update template map 2017-08-25 16:16:28 -04:00
eric 607c63914c move right column to separate file 2017-08-25 16:16:04 -04:00
eric a52fd4a013 suppress xx relation display 2017-08-25 14:52:36 -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 591fd23853 add ebook rights 2017-08-16 16:20:43 -04:00
eric 3993ffa04a add id links, refactor 2017-08-16 15:46:19 -04:00
eric 218aef87f7 link to edit form for new ebookfiles 2017-08-15 16:53:27 -04:00
eric 256f566a8b omit the make id checkbox 2017-08-15 16:52:15 -04:00
eric 711f2880fa add ebook activation on edition edit 2017-08-08 12:39:23 -04:00
eric 8de43cfda8 set user on ebooks loaded from webpage 2017-08-08 12:38:54 -04:00
eric 0ebbb21d47 add source to EbookFile
Want to be able to avoid downloading duplicate ebooks
2017-08-08 10:02:25 -04:00
eric f9d31b0f51 fix glue resolution 2017-08-07 21:46:21 -04:00
eric 389e9a1749 'format' is a built-in
test_file was not doing anything because format parameter not passed.
Didn't raise error because 'format' is a built-in function
2017-08-07 16:13:22 -04:00
eric e8bd8725cc handle edition ids better
also, allow contributor to request unglue.it id
2017-08-04 17:12:05 -04:00
eric d5980bfd5b Merge branch 'master' into edit-editions 2017-08-03 16:15:14 -04:00
eric 08702a7b08 scrapes the metadata
also moves id validation to core
2017-08-03 16:15:06 -04:00
eric 758e307516 Merge branch 'master' into edit-editions
# Conflicts:
#	frontend/tests.py
2017-07-29 20:47:28 -04:00