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 |
|
John Kelly
|
94fe1deb3e
|
Fix database hostname and add deploy guide
|
2018-05-15 20:40:08 -04:00 |
|
jonahmania
|
f31e032c10
|
Merge branch 'master' into newfoundation
|
2018-05-15 18:37:12 -04:00 |
|
Nicholas Antonov
|
ec805e0591
|
Merge pull request #72 from EbookFoundation/foundation/home
Foundation/home
|
2018-05-15 18:34:04 -04:00 |
|
jonahmania
|
1033631bc5
|
Fix png 404
|
2018-05-15 18:30:22 -04:00 |
|
jonahmania
|
717e0df2ed
|
Remove old javascript
|
2018-05-15 18:26:01 -04:00 |
|
jonahmania
|
d58d8d316a
|
Add spacing around sidebar sections
|
2018-05-15 18:07:23 -04:00 |
|
jonahmania
|
5d0cd8a30d
|
Increase sidebar size
|
2018-05-15 15:53:03 -04:00 |
|
John Kelly
|
822a4c53b2
|
Merge pull request #76 from EbookFoundation/css-gitignore
remove generated css files from gitignore
|
2018-05-15 15:41:09 -04:00 |
|
jonahmania
|
f9ac82dcd8
|
Fix typo
|
2018-05-15 11:25:18 -04:00 |
|
jonahmania
|
337139687a
|
Add more space between sidebar sections
|
2018-05-15 11:09:49 -04:00 |
|
jonahmania
|
c0dba9390f
|
Move donate above latest ungluing
|
2018-05-14 19:34:24 -04:00 |
|
jonahmania
|
2dd874b160
|
Make sure to show scrollbar on desktop book overflow
|
2018-05-14 17:10:46 -04:00 |
|
jonahmania
|
bc10bc3b64
|
Give sign up and donate buttons cursor pointer
|
2018-05-14 17:07:16 -04:00 |
|
jonahmania
|
d78dc33342
|
Add latest ungluing to desktop page
|
2018-05-14 16:57:52 -04:00 |
|
Nicholas Antonov
|
37acab3ad2
|
Merge pull request #73 from EbookFoundation/foundation/welcome
Add welcome page and fix header bug on registration pages
|
2018-05-14 13:19:42 -04:00 |
|
eric
|
65e619fc87
|
remove generated css files from gitignore
|
2018-05-14 13:12:57 -04:00 |
|
nicholas antonov
|
68273a96e9
|
Hide search bar on welcome page
|
2018-05-14 12:33:31 -04:00 |
|
John Kelly
|
4ac97ed806
|
Merge pull request #75 from EbookFoundation/jk/ansible-provisioning
Add ansible role to provision production server
|
2018-05-13 22:30:42 -04:00 |
|
John Kelly
|
4d733d1415
|
Fix log folder permissions and precompile scss
|
2018-05-13 22:13:45 -04:00 |
|
John Kelly
|
38e151224d
|
Add ansible role to provision production server
Add new ansible role which provisions production instance based on newfoundation branch.
|
2018-05-13 18:55:29 -04:00 |
|
eric
|
16441fe456
|
Merge remote-tracking branch 'Gluejar/master' into production
|
2018-05-11 12:04:50 -04:00 |
|
eshellman
|
71ba8dc9fa
|
Merge pull request #778 from Gluejar/doab-misc
fix bugs and delint
|
2018-05-11 11:47:48 -04:00 |
|
eric
|
05fae60ddb
|
delint
|
2018-05-11 11:46:04 -04:00 |
|
eric
|
33bf10c047
|
Merge remote-tracking branch 'Gluejar/master' into production
|
2018-05-10 22:11:09 -04:00 |
|
eshellman
|
95b8276829
|
Merge pull request #777 from Gluejar/doab-misc
Doab misc
|
2018-05-10 22:01:43 -04:00 |
|
eric
|
a303c08333
|
delete doab should work
|
2018-05-10 22:00:47 -04:00 |
|
eric
|
620bedd1e5
|
error should not be thrown if duplicate id is already the id
|
2018-05-10 21:45:56 -04:00 |
|
eric
|
db9b6e5221
|
harvest_online_ebooks should count books actually harvested
|
2018-05-10 16:17:16 -04:00 |