Commit Graph

6442 Commits (ca5e5bed0c21565abf2368198bb56c6a6e4cfb0d)

Author SHA1 Message Date
eric 19a005bfa6 tweak campaign setup 2017-12-19 10:48:26 -05:00
eshellman 68d841257a
Merge pull request #738 from Gluejar/updates
updates
2017-12-18 11:28:52 -05:00
eric 4b8a5cbc80 updates 2017-12-18 11:28:06 -05:00
eric 145c04f808 Merge branch 'master' into production 2017-12-15 23:15:46 -05:00
eshellman 99700532d9
Merge pull request #737 from Gluejar/campaign-donations
cleanup
2017-12-15 19:27:26 -05:00
eric d1cf6e6fb3 fix some scraping bugs 2017-12-15 19:26:50 -05:00
eric 1611ebe82a poorly conceived test 2017-12-15 18:24:19 -05:00
eshellman a676a837c3
Merge pull request #736 from Gluejar/campaign-donations
Campaign donations fixes
2017-12-15 14:16:59 -05:00
eric ef49e65e30 switch to css in git 2017-12-15 14:16:09 -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
eshellman 87394720aa
Merge pull request #735 from Gluejar/campaign-donations
Campaign donations
2017-12-14 21:39:07 -05:00
eric 7d847019a1 Merge branch 'master' into campaign-donations 2017-12-14 21:38:34 -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
eshellman 36a3637eb7
Merge pull request #734 from Gluejar/fix-mobi-provider
make mobi wasn't setting provider
2017-12-14 14:19:51 -05:00
eric 15d281c988 make mobi wasn't setting provider 2017-12-14 14:19:20 -05:00
eshellman 3ae537132e
Merge pull request #733 from EbookFoundation/master
add commits from EbookFoundation
2017-12-13 10:21:29 -05:00
eshellman 3853bc79d1
Merge pull request #732 from Gluejar/xenial
update Vagrantfile, dev.yml to use xenial (Ubuntu 16)
2017-12-13 10:06:52 -05:00
eric 6313d4a216 Merge branch 'scss' into campaign-donations 2017-12-12 13:41:12 -05:00
eric e864f7d9b1 updates to allow compilescss to run quietly 2017-12-12 13:26:57 -05:00
eric 877affd8bf implement sass for only pledge.css 2017-12-12 13:26:01 -05:00
Raymond Yee cebdb6b285 fix branches to be used on just and production 2017-12-12 08:44:53 -08:00
Raymond Yee 76e71ea2db the Vagrantfile I used to build production instance with xenial. I then switched over to productionn branch by hand.... 2017-12-12 08:42:54 -08:00
Raymond Yee 90e3320e19 Merge branch 'master' of github.com:Gluejar/regluit into xenial 2017-12-11 16:34:06 -08:00
eshellman 76dc6d010c
Merge pull request #731 from EbookFoundation/newfoundation
try scss off production
2017-12-11 16:23:46 -05:00
eshellman 82d7bf20b6
Merge pull request #730 from Gluejar/protect-long-descriptions
protect long descriptions
2017-12-11 13:46:23 -05:00
eric 4499b556c6 protect long descriptions
scraper was over-writing edited descriptions
2017-12-11 13:45:47 -05:00
Raymond Yee 77e0fa112a Merge branch 'master' of github.com:Gluejar/regluit into xenial 2017-12-11 10:04:52 -08:00
eric 4061270b01 Merge branch 'master' into production 2017-12-10 19:06:31 -05:00
eshellman cef1cfd5ff
Merge pull request #729 from Gluejar/make-mobis
Make mobis, fix bugs
2017-12-10 17:58:23 -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 ebf68befeb add Springer publisher 2017-12-10 16:38:30 -05:00
eric 678474b985 do conversion before making ebf 2017-12-10 16:33:59 -05:00
eric cc1c5b6ee8 add management command 2017-12-10 16:33:07 -05:00
eric 2deb1a6279 Merge branch 'master' into production 2017-12-09 13:58:06 -05:00
eshellman aadf1b1275
Merge pull request #728 from Gluejar/fix-SERVER_EMAIL
SERVER_EMAIL determines error logging email
2017-12-09 13:56:17 -05:00
eric 5e5a7c699a determines error logging email 2017-12-09 13:55:41 -05:00
eric 2f9a317a9c Merge branch 'master' into production 2017-12-08 21:39:32 -05:00
eshellman 0205cad280
Merge pull request #727 from Gluejar/lint-loader
misc bugfixes
2017-12-08 21:05:42 -05:00
eric 22870a4350 harden object retrieval against unexpected input 2017-12-08 20:58:37 -05:00
eric f788cbfe93 Merge branch 'master' into lint-loader 2017-12-08 11:24:54 -05:00
eric f0e2144078 Merge branch 'master' into production 2017-12-08 11:24:12 -05:00
eshellman ca7bc9e946
Merge pull request #726 from Gluejar/fix-claim
fix claimform after eliminating the generator function
2017-12-08 11:05:39 -05:00
eric 816b0a1099 how did that ever work? 2017-12-08 11:04:00 -05:00
eric 3c7c9ade00 add Springer to get_scraper 2017-12-07 17:36:35 -05:00
eric d53b3bcc8d delint 2017-12-07 17:36:08 -05:00
eric 5ccd7a0a47 add get_role to scraper 2017-12-07 17:35:52 -05:00
eric a3f1509cc2 fix multiple editor setting 2017-12-07 17:33:29 -05:00