eric
|
078a04e34a
|
Merge branch 'master' into production
|
2017-06-20 14:48:56 -04:00 |
|
eshellman
|
7d60ea8263
|
Merge pull request #685 from Gluejar/questionnaire-nit
remove old static folder
|
2017-06-20 14:48:15 -04:00 |
|
eric
|
699ef09728
|
remove old static folder
|
2017-06-20 14:47:29 -04:00 |
|
eric
|
ed1f5b5693
|
Merge branch 'master' into production
|
2017-06-20 12:46:17 -04:00 |
|
eshellman
|
98e2e0797d
|
Merge pull request #684 from Gluejar/use-fef-questionnaire
delete regluit.questionnaire
|
2017-06-20 11:36:48 -04:00 |
|
eric
|
4cc0e0fe4f
|
delete regluit.questionnaire
|
2017-06-20 11:08:14 -04:00 |
|
eric
|
e8ae2f1139
|
Merge branch 'master' into production
|
2017-06-14 09:56:16 -04:00 |
|
eshellman
|
99e38f73e0
|
Merge pull request #683 from Gluejar/update-facebook-api
update python social auth
|
2017-06-14 09:36:29 -04:00 |
|
eric
|
52f1544f58
|
update python social auth
needed to update python social auth because of facebook api version
deprecation and as a steppingstone to migrate to new modular PSA
|
2017-06-13 17:08:19 -04:00 |
|
eric
|
20ab81070b
|
Merge branch 'master' into production
|
2017-06-12 18:50:05 -04:00 |
|
eshellman
|
506d4d87bd
|
Merge pull request #682 from Gluejar/distro-admin
Re-enable distro admin
|
2017-06-12 18:32:20 -04:00 |
|
eric
|
73a2fb48c2
|
Re-enable distro admin
|
2017-06-12 15:40:57 -04:00 |
|
eric
|
846c6509f6
|
Merge branch 'master' into production
|
2017-06-12 14:23:11 -04:00 |
|
eshellman
|
8a4d404a52
|
Merge pull request #681 from Gluejar/fix-template-error
eliminate bad template errors
|
2017-06-12 13:51:58 -04:00 |
|
eric
|
75887aa789
|
eliminate bad template errors
|
2017-06-12 12:05:49 -04:00 |
|
eric
|
eae65d7467
|
updates from gluejar/reqluit
|
2017-06-08 17:35:48 -04:00 |
|
eric
|
aa23446ecf
|
Merge branch 'master' into production
|
2017-05-19 14:34:34 -04:00 |
|
eshellman
|
576611c4dd
|
Merge pull request #680 from Gluejar/fix-survey-headers
Fix survey export, add date column
|
2017-05-19 13:50:30 -04:00 |
|
eric
|
8d7b2f7417
|
add completion date column
|
2017-05-19 13:46:12 -04:00 |
|
eric
|
303c30a108
|
fix csv export
|
2017-05-18 10:47:13 -04:00 |
|
eric
|
5fb7538eea
|
Merge branch 'master' into production
|
2017-05-09 22:38:38 -04:00 |
|
eshellman
|
2b72402b7d
|
Merge pull request #679 from Gluejar/fix-b2u-s2k
add get_archive method to acq.mock_ebook
|
2017-05-08 17:31:33 -04:00 |
|
eric
|
0ea3fc1781
|
add get_archive method to acq.mock_ebook
|
2017-05-08 17:22:02 -04:00 |
|
eric
|
6d1bb10d0c
|
Merge branch 'master' into production
|
2017-05-03 09:35:47 -04:00 |
|
eshellman
|
752ffbcac1
|
Merge pull request #678 from Gluejar/questionaire-results
wire up answer summaries
|
2017-05-02 17:11:48 -04:00 |
|
eric
|
d3874e1ad7
|
wire up answer summaries
|
2017-05-02 17:10:06 -04:00 |
|
eric
|
a3298797d4
|
Merge branch 'master' into production
|
2017-04-20 09:38:43 -04:00 |
|
eshellman
|
e6eb54d7b1
|
Merge pull request #677 from Gluejar/fix-ebook-form
Fix ebook form
|
2017-04-18 10:59:01 -04:00 |
|
eric
|
d7917a24d1
|
add oapen to supported targets
|
2017-04-17 13:47:51 -04:00 |
|
eric
|
097d9db9b6
|
fix exception with missing format
|
2017-04-17 13:47:40 -04:00 |
|
eric
|
2c5a44beb8
|
Merge remote-tracking branch 'Gluejar/master'
# Conflicts:
# README.md
|
2017-04-17 12:11:24 -04:00 |
Raymond Yee
|
0e5c44ed94
|
Merge branch 'master' into production
|
2017-04-04 15:57:04 -07:00 |
|
Raymond Yee
|
fc60f55db7
|
Merge pull request #676 from Gluejar/fix-donations
handle donations for failed charges
|
2017-04-04 15:43:47 -07:00 |
|
eric
|
f65c7735f8
|
handle donations for failed charges
|
2017-04-04 18:39:40 -04:00 |
|
Raymond Yee
|
5756f171dc
|
Merge pull request #665 from Gluejar/donations
add donation box to homepage
|
2017-04-03 16:59:52 -07:00 |
|
eric
|
0d96143ac2
|
Merge branch 'master' into production
|
2017-03-23 13:56:29 -04:00 |
|
eshellman
|
b3e182abb0
|
Merge pull request #675 from Gluejar/fix-pdf2kindle
set filesize
|
2017-03-23 13:30:51 -04:00 |
|
eric
|
ad8de40cd7
|
set filesize
|
2017-03-23 13:30:05 -04:00 |
|
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 |
|
eric
|
2c5ab5131a
|
Merge branch 'master' into production
|
2017-03-22 09:53:44 -04: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 |