Commit Graph

6620 Commits (35569dd88b97c5d0eb95d71a0f70ff20e94b4512)

Author SHA1 Message Date
eric 35569dd88b Merge branch 'master' into add-travis 2018-06-08 20:40:30 -04:00
eric 9abb666ce8 updates from gluejar travis work 2018-06-08 20:20:11 -04:00
eshellman 985b65ea3f
Merge pull request #85 from EbookFoundation/catchup
Catchup
2018-06-06 22:44:38 -04:00
eric eba9af93c3 debug travis mobigen 2018-06-06 11:26:02 -04:00
eric 05d4540a21 embarrassing 2018-06-06 09:36:17 -04:00
eric 32bff7c0ea it's py not yml! 2018-06-05 21:24:44 -04:00
eric f7c8610045 typo 2018-06-05 15:53:05 -04:00
eric 1ab2798086 encrypt again 2018-06-05 15:48:35 -04:00
eric 52f4cba735 wrong key in travis file 2018-06-05 15:26:37 -04:00
eric e13b91dda6 also add to travis keys 2018-06-05 15:22:42 -04:00
eric 4426ae19fc update to new mobigen server 2018-06-05 14:48:45 -04:00
eric f6310fde58 fix test 2018-06-05 14:48:22 -04:00
eric bfc5a14ebd add s3 keys 2018-05-25 08:45:16 -04:00
eric 20509e2ca7 py not yml 2018-05-25 07:16:45 -04:00
eric f174fc4317 make sure the keys directory exists 2018-05-24 21:47:40 -04:00
eric 2fa80458a1 fix paths 2018-05-24 17:36:54 -04:00
eric 3835729a54 encrypt some settings 2018-05-24 17:25:43 -04:00
eric 4898634901 wonder if PYTHONPATH can be .. 2018-05-24 12:47:48 -04:00
eric 303fcf44c4 oh, so that's what env does 2018-05-24 12:16:51 -04:00
eric d9aa6893b3 try setting PYTHONPATH 2018-05-24 12:04:31 -04:00
eric 66623f286e try "before_script" 2018-05-24 11:34:50 -04:00
eric 6af4082936 try add2virtualenv 2018-05-24 11:19:33 -04:00
eric 22865cc7b3 try following directions 2018-05-24 11:03:33 -04:00
eric d1cacf8ef9 apparently, having a setup.py is the right way to do it 2018-05-23 21:30:52 -04:00
eric 68e9833a21 again 2018-05-23 17:08:51 -04:00
eric c058f88c3a another try 2018-05-23 16:49:12 -04:00
eric 2860e0351f touch 2018-05-23 16:09:05 -04:00
eric beb152a755 see if we can easily get travis to do tests 2018-05-23 15:46:26 -04:00
eric 3661faec0a Merge remote-tracking branch 'Gluejar/master' into catchup
# Conflicts:
#	core/models/__init__.py
#	core/models/bibmodels.py
#	vagrant/host_vars/prod/secrets.yml
2018-05-23 13:56:27 -04:00
eshellman 8413372d18
Merge pull request #83 from EbookFoundation/foundation/fix-home-css
fix home css / add explore section to book view sidebar
2018-05-18 17:27:23 -04:00
Nicholas Antonov 55bc6ef3a5
Merge pull request #82 from EbookFoundation/foundation/fixes
Fixes
2018-05-18 14:21:08 -04:00
nicholas antonov 022e69aff0 Fix badge placement 2018-05-18 14:20:20 -04:00
nicholas antonov 6f4561b3dd hide on small 2018-05-18 13:51:38 -04:00
jonahmania 0d7bc06be7 Add explore section to book page 2018-05-17 14:23:38 -04:00
nicholas antonov 3495e36afd change panel to read when possible 2018-05-17 14:17:48 -04:00
nicholas antonov 7a355b0f31 Fix notifications styling 2018-05-17 13:43:02 -04:00
jonahmania 18269f9816 Make login link work 2018-05-16 20:59:17 -04:00
jonahmania ecdd39d1c0 Fix text css 2018-05-16 20:39:30 -04:00
Jonah Mania ad7aff9664
Merge pull request #79 from EbookFoundation/foundation/fix-avatar
Remove old menu, add links to new menu, fix avatar
2018-05-16 20:30:05 -04:00
nicholas antonov 01c43a1bbd Fix font size on mobile menu 2018-05-16 19:10:53 -04:00
nicholas antonov 6b20074397 Max width on faq 2018-05-16 18:58:28 -04:00
nicholas antonov 3dd9f5a73c Add #edit to links 2018-05-16 18:30:14 -04:00
nicholas antonov be51bc84e3 Fix links 2018-05-16 18:06:54 -04:00
nicholas antonov 25738a78b7 remove static width 2018-05-16 17:58:14 -04:00
nicholas antonov bf7faad061 Remove debug logic 2018-05-16 16:37:28 -04:00
nicholas antonov d04a651ad5 Add z index to header 2018-05-16 16:26:12 -04:00
nicholas antonov 01f4fb43ec Remove old menu, add links to new menu, fix avatar 2018-05-16 15:51:41 -04:00
Nicholas Antonov 4ba506960a
Merge pull request #77 from EbookFoundation/newfoundation
Newfoundation
2018-05-16 14:32:37 -04:00
John Kelly e79eace9d1
Merge pull request #78 from EbookFoundation/jk/ansible-mysql-connector
Fix database hostname and add deploy guide
2018-05-15 21:24:04 -04:00
John Kelly 08bff0440e
Merge branch 'newfoundation' into jk/ansible-mysql-connector 2018-05-15 20:42:17 -04:00