eric
|
93e93189e0
|
fix conflicts
|
2018-02-02 12:16:45 -05:00 |
|
eric
|
1a3d1e8034
|
Merge branch 'foundationworkpage' into foundationworkpage-tracking
# Conflicts:
# frontend/templates/base.html
# frontend/templates/work.html
# settings/common.py
# static/scss/book_detail.scss
# static/scss/bookview.scss
# static/scss/campaign2.scss
# static/scss/global.scss
|
2018-02-02 11:45:48 -05:00 |
|
eshellman
|
6257d621e5
|
Merge pull request #46 from Gluejar/master
merge ongoing unglue.it development
|
2018-02-02 11:29:03 -05:00 |
|
eshellman
|
c146acb4de
|
Merge pull request #757 from Gluejar/misc-bugs
Misc bugs
|
2018-02-01 21:49:56 -05:00 |
|
eric
|
bec9d46dc4
|
fix campaign execution
|
2018-02-01 21:48:00 -05:00 |
|
eric
|
7e69ac95eb
|
add negative id facets
|
2018-02-01 21:47:29 -05:00 |
|
eric
|
128b8c2f48
|
url not guaranteed to be cleaned before provider
|
2018-02-01 15:19:06 -05:00 |
|
eric
|
b148a1925e
|
harden search
|
2018-02-01 15:18:14 -05:00 |
jonahmania
|
29d8858c21
|
merge newfoundation
|
2018-02-01 00:14:38 -05:00 |
|
Jonah Mania
|
bb85948fe6
|
Merge pull request #52 from EbookFoundation/worklayout
fix comments centering
|
2018-02-01 00:12:19 -05:00 |
Nicholas Antonov
|
ec3d63655a
|
fix comments centering
|
2018-02-01 00:01:38 -05:00 |
|
Jonah Mania
|
40a4897c4a
|
Merge pull request #51 from EbookFoundation/worklayout
Worklayout
|
2018-01-31 23:05:08 -05:00 |
|
Nicholas Antonov
|
995e54109d
|
Center book text
|
2018-01-31 22:55:57 -05:00 |
|
Nicholas Antonov
|
7b27fcebfb
|
Fix booksidebar
|
2018-01-31 22:40:09 -05:00 |
|
eshellman
|
ae2ca3cb8c
|
Merge pull request #756 from Gluejar/revise-explore
add campaigns to explore, convert to scss
|
2018-01-31 17:44:08 -05:00 |
|
eric
|
91f4f713c0
|
axe the ungluer lists
|
2018-01-31 17:42:59 -05:00 |
|
eric
|
9692d1d5dc
|
add individual campaigns to explore
|
2018-01-31 17:37:46 -05:00 |
|
eric
|
0d17e80235
|
finish
|
2018-01-31 17:36:59 -05:00 |
|
Nicholas Antonov
|
156f21b02c
|
Merge pull request #50 from EbookFoundation/styleboys
Styleboys
|
2018-01-30 16:41:40 -05:00 |
|
jonahmania
|
0cdfddf061
|
Merge newfoundation
|
2018-01-30 16:17:56 -05:00 |
|
Jonah Mania
|
87d5ffff0a
|
Merge pull request #49 from EbookFoundation/addfoundation
Addfoundation
|
2018-01-30 15:41:36 -05:00 |
|
eric
|
ebd3b4a3b9
|
remove less and old css
|
2018-01-30 15:40:26 -05:00 |
|
Nicholas Antonov
|
d2ef78038d
|
Commit foundation files
|
2018-01-30 15:36:03 -05:00 |
|
jonahmania
|
2edb1e5911
|
Add styles
|
2018-01-30 15:31:51 -05:00 |
|
eric
|
c0c6958426
|
all the rest
|
2018-01-30 15:31:20 -05:00 |
|
Nicholas Antonov
|
f56a26d142
|
Merge remote-tracking branch 'origin/addfoundation' into addfoundation
|
2018-01-30 14:39:11 -05:00 |
|
Nicholas Antonov
|
e85eb85b9c
|
remove submodule directory
|
2018-01-30 14:38:43 -05:00 |
|
jonahmania
|
9db0941bb4
|
Fix merge conflict
|
2018-01-30 14:16:37 -05:00 |
|
jonahmania
|
a82571a1f3
|
Made reactive grid
|
2018-01-30 14:12:28 -05:00 |
|
Jonah Mania
|
5948d33d20
|
Merge pull request #47 from EbookFoundation/addfoundation
Add all foundation styles
|
2018-01-30 14:01:35 -05:00 |
|
Nicholas Antonov
|
08e09b7653
|
readd campaign css
|
2018-01-30 14:00:49 -05:00 |
|
Nicholas Antonov
|
47f81b141a
|
Include all of foundation
|
2018-01-30 13:48:53 -05:00 |
|
eric
|
c720dfcab2
|
and less to sass for work page
|
2018-01-30 13:19:40 -05:00 |
|
jonahmania
|
6924640596
|
Add book side bar
|
2018-01-30 13:02:49 -05:00 |
|
eric
|
4d2167c58f
|
finish less to sass for landing page
|
2018-01-30 12:47:51 -05:00 |
|
Nicholas Antonov
|
5d51759a92
|
add files (imports fail)
|
2018-01-30 12:40:50 -05:00 |
|
eric
|
5f070ef2d7
|
delete more dead css
|
2018-01-29 23:36:58 -05:00 |
|
eric
|
b12fb6ea0d
|
convert book_panel2
|
2018-01-29 23:36:41 -05:00 |
|
eric
|
1b0d8de180
|
delete dead styles
|
2018-01-29 22:56:46 -05:00 |
|
eric
|
7cd10386cd
|
convert sitewide to scss
|
2018-01-29 22:56:18 -05:00 |
|
eshellman
|
f57652e833
|
Merge pull request #755 from Gluejar/fix-news-link
it was too late at night, I guess
|
2018-01-26 17:01:43 -05:00 |
|
eric
|
57cc44b6cc
|
it was too late at night, I guess
|
2018-01-26 17:01:16 -05:00 |
|
eshellman
|
f37649dd40
|
Merge pull request #754 from Gluejar/fix-image-loading
Fix image loading
|
2018-01-26 12:56:02 -05:00 |
|
eric
|
a1c96ebd1a
|
only allow image uploads
|
2018-01-26 12:54:25 -05:00 |
|
eric
|
c00d2f6181
|
remove admin restriction on upload
|
2018-01-26 12:48:47 -05:00 |
|
eshellman
|
3484444602
|
Merge pull request #753 from Gluejar/validate-epub3
accept epub3 from google docs
|
2018-01-26 11:37:06 -05:00 |
|
eric
|
560a2306dc
|
accept epub3 from google docs
they don't set toc attribute on spine
|
2018-01-26 10:45:09 -05:00 |
|
jonahmania
|
72ed2c2804
|
Add basic grid layout
|
2018-01-24 17:21:42 -05:00 |
|
eshellman
|
ef6bfa9046
|
Merge pull request #752 from Gluejar/relaunch
Relaunch tweaks
|
2018-01-24 14:41:41 -05:00 |
|
eric
|
7a8a621a59
|
stop showing random ungluers on work page
|
2018-01-24 14:41:14 -05:00 |