eric
|
e9e38fa104
|
don't show links to search engines
|
2017-03-04 23:00:19 -05:00 |
|
eric
|
99e04e8c9a
|
Merge branch 'master' into production
|
2017-02-23 12:53:05 -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
|
56a5ad9a59
|
Merge branch 'production' of github.com:Gluejar/regluit into production
|
2017-02-14 20:14:48 -08:00 |
|
Raymond Yee
|
8c86b16e6a
|
Merge branch 'master' into production
|
2017-02-14 20:14:25 -08: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 |
|
eric
|
fd2191adb7
|
Merge branch 'master' into production
|
2017-02-12 10:50:52 -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 |
|
eric
|
68914a5b81
|
Merge branch 'master' into production
|
2017-02-01 14:44:03 -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
|
755c0e5f18
|
Merge branch 'master' into production
|
2017-01-19 12:12:06 -08: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
|
24afd3b068
|
Add comment about current status
|
2017-01-19 10:50:53 -05:00 |
|
eshellman
|
bc3a00db56
|
Merge pull request #661 from Gluejar/license
add license
|
2017-01-19 10:39:42 -05:00 |
|
eric
|
33a4205404
|
add license
|
2017-01-19 10:37:59 -05:00 |
|
eshellman
|
d334d158a8
|
Merge pull request #660 from Gluejar/more_key_cleanup
a bit of cleanup for keys
|
2017-01-17 11:42:46 -05:00 |
|
Raymond Yee
|
12e5fa2f8f
|
typo
|
2017-01-16 17:48:50 -08:00 |
|
Raymond Yee
|
5596de6de4
|
update documentation on vagrant ansible.
|
2017-01-16 17:39:20 -08:00 |
|
Raymond Yee
|
1e4c354583
|
Merge branch 'master' into more_key_cleanup
|
2017-01-16 16:01:52 -08:00 |
|
Raymond Yee
|
1c7a6d8e52
|
Merge branch 'production' of github.com:Gluejar/regluit into production
|
2017-01-16 14:59:07 -08:00 |
|
Raymond Yee
|
b8d1d501c0
|
Merge branch 'master' into production
|
2017-01-16 14:58:51 -08:00 |
|
eric
|
bf89fe710c
|
Merge branch 'master' into production
|
2017-01-16 14:28:44 -05:00 |
|
eshellman
|
c2f9047c90
|
Merge pull request #650 from Gluejar/add-doab-authlist
everything ran fine on my laptop
|
2017-01-16 13:21:15 -05:00 |
|
Raymond Yee
|
2beb02c3d0
|
* deleted settings/localvm.py
* add comment about a key in prod
* deleted comment in settings/just.py
|
2017-01-13 22:37:21 -08:00 |
|
Raymond Yee
|
ae6e852c67
|
update doab.json
|
2017-01-12 14:31:47 -08:00 |
|
Raymond Yee
|
b1ec19eb85
|
Merge branch 'master' into add-doab-authlist
|
2017-01-12 14:27:56 -08:00 |
|
Raymond Yee
|
80f5e9a489
|
Merge branch 'master' into production
|
2017-01-12 11:54:36 -08:00 |
|
eshellman
|
825ba6aa52
|
Merge pull request #659 from Gluejar/update_ssl_cert
new SSL certificate -- expires Jan 28, 2018
|
2017-01-12 10:50:12 -05:00 |
|
Raymond Yee
|
34804d0ad8
|
new SSL certificate -- expires Jan 28, 2018
|
2017-01-11 21:16:54 -08:00 |
|
eshellman
|
f7dab3a514
|
Merge pull request #658 from Gluejar/fix_vagrant_aws
tweeks to Vagrantfile to fail if certain environment variables are not set; reset database root pw
|
2017-01-11 17:02:33 -05:00 |
|
Raymond Yee
|
e7f5bb61e7
|
* use ENV.fetch to have vagrant fail if certain environment variables are not set.
* reset root password on the Amazon RDS instances for just and prod
|
2017-01-11 12:20:28 -08:00 |
|
eric
|
a8790b741a
|
if we need any of these files, they should move somewhere
|
2017-01-07 11:16:42 -05:00 |
|
Raymond Yee
|
a84e8fb8b6
|
fix problems for please
|
2017-01-06 18:35:49 -08:00 |
|
Raymond Yee
|
b3f7390d21
|
Merge pull request #656 from Gluejar/kombu_dep
Kombu dependence -- should be removed from jenkins and dev
|
2017-01-06 16:37:27 -08:00 |
|
Raymond Yee
|
2b6901b347
|
return prod/secrets.yml to values in master branch
|
2017-01-06 16:34:43 -08:00 |
|
Raymond Yee
|
03de890a71
|
no need for djkombu -- superceded by kombu
https://pypi.python.org/pypi/django-kombu
|
2017-01-06 16:23:23 -08:00 |
|
eshellman
|
dce00cc685
|
Merge pull request #655 from Gluejar/no-dj-nose-selenium
see if django-nose-selenium was the problem
|
2017-01-06 17:06:28 -05:00 |
|
eric
|
58f1452988
|
see if django-nose-selenium was the problem
|
2017-01-06 16:59:55 -05:00 |
|
eshellman
|
41416ef23e
|
Merge pull request #654 from Gluejar/mock-integration
Mock integration. Merge this to test on Jenkins, which was sort of the point
|
2017-01-06 13:53:16 -05:00 |