Commit Graph

6065 Commits (less-scss-convertor)

Author SHA1 Message Date
Raymond Yee e8f546e9c4 Merge pull request #673 from Gluejar/trusty2
build instances with trusty
2017-03-22 14:29:33 -07:00
Raymond Yee b700ff7faa delete the various specific apache conf files (which are no longer needed because we have teh apache.conf.j2 template) 2017-03-22 14:23:01 -07:00
eshellman 803487837a Merge pull request #674 from Gluejar/json-opds-v2
Json opds v2
2017-03-21 21:18:34 -04:00
eric f1f8c80987 Merge branch 'master' into json-opds-v2 2017-03-21 21:16:40 -04:00
eric c9d0395f38 fix mistakes 2017-03-21 21:16:36 -04:00
Raymond Yee 7ce9aa3df2 Merge branch 'master' into trusty2 2017-03-21 16:28:23 -07:00
Raymond Yee 977c712890 getting ready to commit by setting branch to master for please, just, just2 2017-03-21 16:27:22 -07:00
Raymond Yee 813fe84cbf I think these are the right updates for just 2017-03-21 11:10:31 -07:00
eric 9339c73b10 change to version 2 2017-03-21 11:10:31 -07:00
eric 40487de474 forgot to move reference 2017-03-21 11:10:31 -07:00
Raymond Yee 335219c0c3 added missing quotes for dev.yml 2017-03-21 11:10:31 -07:00
Raymond Yee 3db7a604b7 need newline in apache.conf.j2 2017-03-21 11:10:30 -07:00
Raymond Yee 23c99a2c68 generate please.conf from template 2017-03-21 11:10:30 -07:00
Raymond Yee 505c3cedd3 simplify please.conf 2017-03-21 11:10:30 -07:00
Raymond Yee 2793d40739 update of Apache config file for please.conf 2017-03-21 11:10:30 -07:00
Raymond Yee 7c576f89d2 trying a new fix for 403 error from https://docs.djangoproject.com/en/1.10/howto/deployment/wsgi/modwsgi/ 2017-03-21 11:10:30 -07:00
Raymond Yee 5da956a06b in progress: working on changes needed for please 2017-03-21 11:10:30 -07:00
eric 9ea3dec5de don't show links to search engines 2017-03-21 11:10:30 -07:00
eric c249d8e6ed update doi regexp and display
https://www.crossref.org/display-guidelines/
2017-03-21 11:10:30 -07:00
eric d735a611d1 fix possible redirect loop 2017-03-21 11:10:30 -07:00
eric 34e87e3059 fix issue with new version of tastypie 2017-03-21 11:10:29 -07:00
Raymond Yee b6570f17dd updated for recent Se 2017-03-21 11:10:29 -07:00
eshellman 8b8adb2901 Merge pull request #672 from Gluejar/json-opds-v2
Json opds v2
2017-03-21 12:02:39 -04:00
eric fe823979fd add "order_by=none" option
in json-opds, allows a large record dump
2017-03-21 12:00:55 -04:00
eric b778633c06 Merge branch 'master' into json-opds-v2 2017-03-17 22:25:57 -04:00
eshellman 35c3f5fc04 Merge pull request #671 from Gluejar/json-opds-v2
change opds-json to version 2
2017-03-17 17:30:32 -04:00
eric b255130732 change to version 2 2017-03-17 17:19:26 -04:00
eshellman 479d433125 Merge pull request #670 from Gluejar/fix-landing-merge
forgot to move work reference
2017-03-16 16:28:26 -04:00
eric 4cac608362 forgot to move reference 2017-03-16 11:50:10 -04:00
Raymond Yee a021303e45 Merge pull request #669 from Gluejar/fix_dev_yml
added missing quotes for dev.yml
2017-03-14 17:46:17 -07:00
Raymond Yee 61c73c1ca8 added missing quotes for dev.yml 2017-03-14 17:32:35 -07:00
eshellman f917a94058 Merge pull request #668 from Gluejar/hide-user-links
don't show links to search engines
2017-03-05 02:56:20 -05:00
eric e9e38fa104 don't show links to search engines 2017-03-04 23:00:19 -05:00
eshellman e29f8094be Merge pull request #667 from Gluejar/fix-doi-regex
update doi regexp and display
2017-02-22 23:20:50 -05:00
eric 7294a5c679 update doi regexp and display
https://www.crossref.org/display-guidelines/
2017-02-22 11:21:24 -05:00
Raymond Yee f382f2e2d7 Merge pull request #666 from Gluejar/fix-api
fix issue with new version of tastypie
2017-02-14 20:05:01 -08:00
eric 03397b6c53 fix possible redirect loop 2017-02-14 14:37:36 -05:00
eric 85b0ea0d35 fix issue with new version of tastypie 2017-02-14 13:59:19 -05:00
eric d5c7a016ee 3 more instances of checking truth of a method 2017-02-13 13:48:17 -05:00
eric 417f9eac58 add donation box to homepage 2017-02-13 13:33:26 -05:00
eshellman 2ec1c8edd6 Merge pull request #664 from Gluejar/opds-json
add a json version of opds
2017-02-12 10:41:06 -05:00
eric da21d172af adjust paging 2017-02-12 10:39:45 -05:00
eric 7f5ffee7b7 more alignment 2017-02-11 21:33:32 -05:00
eric 61c15c03e4 align with HADRIEN
https://gist.github.com/HadrienGardeur/4354170#file-navigation-json-L1
2017-02-11 18:04:19 -05:00
eric c2981ed745 fix urls 2017-02-11 16:03:29 -05:00
eric a225580fae add a json version of opds
just for fun
2017-02-11 15:58:54 -05:00
eshellman 0cedaa84bd Merge pull request #663 from Gluejar/update-news
add OS announce
2017-02-01 14:31:17 -05:00
eric beaedc3210 add OS announce 2017-02-01 14:20:25 -05:00
Raymond Yee f9dc1dd7de Merge pull request #657 from Gluejar/decrufting
if we need any of these files, they should move somewhere
2017-01-19 11:49:19 -08:00
eshellman 07b5015cc9 Merge pull request #2 from EbookFoundation/licenses-docs
add 3rd party licenses and code of conduct
2017-01-19 11:20:43 -05:00