Commit Graph

2959 Commits (22b06107bb7666d284c0cf60e0c876d55208be3d)

Author SHA1 Message Date
eric 3337de9a2e Merge remote-tracking branch 'Gluejar/master' into dj111
# Conflicts:
#	core/tests.py
#	payment/tests.py
2018-04-25 16:23:00 -04:00
nicholas antonov 7150ae812a Fix header levels and styles 2018-04-25 16:16:52 -04:00
nicholas antonov 9c4817419f some fixes for download page 2018-04-25 16:13:27 -04:00
eric 1589c997ea fix facebook url 2018-04-25 11:23:29 -04:00
nicholas antonov 3a63d5a243 merge newfoundation 2018-04-24 20:28:23 -04:00
nicholas antonov c185b017ea Fix how css was being imported 2018-04-24 20:25:41 -04:00
nicholas antonov fe18b14f3e Fix some rendering quirks 2018-04-24 20:05:01 -04:00
nicholas antonov 568183d3e4 Make download page work on mobile 2018-04-24 19:42:52 -04:00
jonahmania 52957407ad Merge in master 2018-04-24 09:24:58 -04:00
eric 680caad71d deprecations 2018-04-19 21:27:20 -04:00
eric d710f8e25f new endless 2018-04-19 21:25:12 -04:00
eric 39fdd9683a rip out dead code 2018-04-19 12:24:34 -04:00
nicholas antonov 4abff062c0 start download work 2018-04-12 22:31:57 -04:00
eric e03fa239b4 revamp doab loading
- doab loading now done primarily by oai, no processing of csv.
- added pyoai and updated lxml
- doab ids or urls in ebook submission now handled by oai scrape
- doab_load_books removed
- doab_utils moved from Gluejar/DOAB
- licenses now recognizes OpenEdition
- new ebook type "online" will implement in UI after mobile launch;
ebooks now creaded for html contenttype
2018-04-07 17:11:36 -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
eric 5598b154c5 don't return error for empty claim 2018-04-01 18:27:18 -04:00
nicholas antonov b04848d69c Merge newfoundation 2018-03-28 21:50:14 -04:00
Nicholas Antonov a4dbd8ec2b
Merge pull request #64 from EbookFoundation/foundation/workchanges
Foundation/workchanges
2018-03-28 21:35:53 -04:00
nicholas antonov 2ab08e186b Add links on work page 2018-03-28 13:57:27 -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 51f3f94452 get reader ui working 2018-03-20 14:08:03 -04:00
Nicholas Antonov bc7addd3ec move around work page buttons 2018-02-27 15:42:59 -05:00
Nicholas Antonov 6e6a75a535 restyle sign up button 2018-02-27 14:49:48 -05:00
Nicholas Antonov 3b7bd1688e Make goodreads and liraryreads clickable 2018-02-27 14:05:19 -05:00
Nicholas Antonov 8375a7083e Add static css for reader 2018-02-27 13:12:42 -05:00
eshellman 53d904dfc6
Merge pull request #761 from Gluejar/bugfix
Misc Bugfix
2018-02-21 12:08:13 -05:00
eshellman f8c04a2ce1
Merge pull request #760 from Gluejar/execute-credit
Execute credit
2018-02-21 12:07:55 -05:00
eric 98e484cf55 enable seeing seen notices 2018-02-21 12:03:01 -05:00
eric 2f4b28f4b3 notices.css left out of scss 2018-02-21 11:12:19 -05:00
eric 466d3b5716 update wording of new files available notice 2018-02-21 11:03:52 -05:00
jonahmania ac860ba1a3 Correct links 2018-02-20 14:52:37 -05:00
jonahmania 9044244461 Fix mobile menu spacing 2018-02-20 14:46:56 -05:00
Nicholas Antonov 8fed54c005 Add read page 2018-02-20 14:27:40 -05:00
jonahmania 9026732c61 Update menu with correct links 2018-02-20 13:14:14 -05:00
Nicholas Antonov 237266f26f Dont commit css 2018-02-20 12:44:17 -05:00
eric 5305b08e10 failed when campaign name is not ascii 2018-02-17 13:57:52 -05:00
Nicholas Antonov fc1d12c5d5 Merge newfoundation 2018-02-14 23:56:53 -05:00
Nicholas Antonov ce20ddeb90 Scale and toggle menu correctly 2018-02-14 19:51:17 -05:00
jonahmania 97708c41d6 Merge in master 2018-02-13 17:42:09 -05:00
Nicholas Antonov daaf4eec8d Initialize drilldowns 2018-02-13 13:21:10 -05:00
jonahmania 55d63dc984 Add basic menu 2018-02-13 12:25:00 -05:00
Nicholas Antonov 6b421ae1cd add responsive footer 2018-02-13 11:34:32 -05:00
jonahmania 28151eaa2d Update header layout 2018-02-07 23:56:59 -05:00
eric e015539fee change language about "gift credit" 2018-02-07 16:44:29 -05:00
jonahmania 29dceb1a64 Add rights information 2018-02-06 13:15:43 -05:00
eric f74a802254 increase maximum pledge to 5K 2018-02-02 22:31:32 -05:00
eric 7e69ac95eb add negative id facets 2018-02-01 21:47:29 -05:00
eric 128b8c2f48 url not guaranteed to be cleaned before provider 2018-02-01 15:19:06 -05:00
eric b148a1925e harden search 2018-02-01 15:18:14 -05:00
Nicholas Antonov 995e54109d Center book text 2018-01-31 22:55:57 -05:00
Nicholas Antonov 7b27fcebfb Fix booksidebar 2018-01-31 22:40:09 -05:00
eric 91f4f713c0 axe the ungluer lists 2018-01-31 17:42:59 -05:00
eric 9692d1d5dc add individual campaigns to explore 2018-01-31 17:37:46 -05:00
jonahmania 0cdfddf061 Merge newfoundation 2018-01-30 16:17:56 -05:00
jonahmania 2edb1e5911 Add styles 2018-01-30 15:31:51 -05:00
eric c0c6958426 all the rest 2018-01-30 15:31:20 -05:00
Nicholas Antonov 08e09b7653
readd campaign css 2018-01-30 14:00:49 -05:00
eric c720dfcab2 and less to sass for work page 2018-01-30 13:19:40 -05:00
jonahmania 6924640596 Add book side bar 2018-01-30 13:02:49 -05:00
eric 4d2167c58f finish less to sass for landing page 2018-01-30 12:47:51 -05:00
Nicholas Antonov 5d51759a92 add files (imports fail) 2018-01-30 12:40:50 -05:00
eric 5f070ef2d7 delete more dead css 2018-01-29 23:36:58 -05:00
eric b12fb6ea0d convert book_panel2 2018-01-29 23:36:41 -05:00
eric 1b0d8de180 delete dead styles 2018-01-29 22:56:46 -05:00
eric 7cd10386cd convert sitewide to scss 2018-01-29 22:56:18 -05:00
eric 57cc44b6cc it was too late at night, I guess 2018-01-26 17:01:16 -05:00
jonahmania 72ed2c2804 Add basic grid layout 2018-01-24 17:21:42 -05:00
eric 7a8a621a59 stop showing random ungluers on work page 2018-01-24 14:41:14 -05:00
eric e317deeaa1 don't show comments unless logged in 2018-01-24 14:39:43 -05:00
eric 9a6cabedf5 add new news 2018-01-24 14:39:13 -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 4802eea09d Disallow: /search/ 2018-01-12 11:53:10 -05:00
eric 48de8408a6 add metas on landing page 2018-01-05 16:37:52 -05:00
eric 11445f8a30 delint 2018-01-05 16:24:12 -05:00
eric f92f469e48 add extra metadata 2018-01-05 16:23:56 -05:00
eric 95e19e5971 enable easy ebook rights setting 2018-01-03 17:50:21 -05:00
eric 2db2c499b8 fix bookpanel 2018-01-02 20:08:11 -05:00
eric 19a005bfa6 tweak campaign setup 2017-12-19 10:48:26 -05:00
eric 4b8a5cbc80 updates 2017-12-18 11:28:06 -05:00
eric 1611ebe82a poorly conceived test 2017-12-15 18:24:19 -05:00
eric af2034da77 add form validation of donation restriction 2017-12-15 14:04:32 -05:00
eric 4d398fb419 typo 2017-12-15 14:04:11 -05:00
eric 184aab1b43 add static test 2017-12-15 14:03:54 -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 877affd8bf implement sass for only pledge.css 2017-12-12 13:26:01 -05:00
eshellman 76dc6d010c
Merge pull request #731 from EbookFoundation/newfoundation
try scss off production
2017-12-11 16:23:46 -05:00
eric 886068a6ee clean up after change to work id
doi and http_id were changed to work only
2017-12-10 17:05:58 -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
Nicholas Antonov 7438b5c217 Fix names and add scss for work page 2017-12-07 16:55:16 -05:00
Nicholas Antonov 893d8abc4a Make django scss preprocessor work 2017-12-07 16:33:10 -05:00
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
Nicholas Antonov 9513514beb Start adding sass preprocessor 2017-12-05 18:46:18 -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
eric b59ed38344 Fix stripe tests again 2017-07-28 13:13:18 -04:00
eric 05af45d13e delint 2017-07-28 12:45:17 -04:00
eric f1dd40fe00 delint 2017-07-28 12:40:34 -04:00