eric
|
e015539fee
|
change language about "gift credit"
|
2018-02-07 16:44:29 -05:00 |
|
eric
|
e1336243ea
|
unrelated lint
|
2018-02-07 12:43:01 -05:00 |
|
eric
|
2573a29de3
|
Merge branch 'master' into production
|
2018-02-02 22:45:26 -05:00 |
|
eshellman
|
6bd0b6980d
|
Merge pull request #758 from Gluejar/misc-nits
Misc nits
|
2018-02-02 22:35:37 -05:00 |
|
eric
|
88ad163451
|
delint scss
|
2018-02-02 22:34:54 -05:00 |
|
eric
|
f74a802254
|
increase maximum pledge to 5K
|
2018-02-02 22:31:32 -05:00 |
|
eric
|
9339d47175
|
Merge branch 'master' into production
|
2018-02-01 21:57:10 -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 |
|
eric
|
f1a4d840ec
|
Merge branch 'master' into production
|
2018-02-01 10:45:42 -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 |
|
eric
|
ebd3b4a3b9
|
remove less and old css
|
2018-01-30 15:40:26 -05:00 |
|
eric
|
c0c6958426
|
all the rest
|
2018-01-30 15:31:20 -05:00 |
|
eric
|
c720dfcab2
|
and less to sass for work page
|
2018-01-30 13:19:40 -05:00 |
|
eric
|
4d2167c58f
|
finish less to sass for landing page
|
2018-01-30 12:47:51 -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 |
|
eric
|
01c1f5105b
|
Merge branch 'master' into production
|
2018-01-26 17:41:09 -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 |
|
eric
|
a2cc6e21b5
|
Merge branch 'master' into production
|
2018-01-26 13:15:52 -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 |
|
eric
|
c4de36554e
|
Merge branch 'master' into production
|
2018-01-24 23:18:12 -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 |
|
eric
|
e317deeaa1
|
don't show comments unless logged in
|
2018-01-24 14:39:43 -05:00 |
|
eric
|
9a6cabedf5
|
add new news
|
2018-01-24 14:39:13 -05:00 |
|
eshellman
|
df0cd2a175
|
Merge pull request #751 from Gluejar/ssl_cert_2018
New SSL cert (which expires Feb 2, 2019)
|
2018-01-24 00:07:41 -05:00 |
|
eshellman
|
b15774688c
|
Merge pull request #750 from Gluejar/prod_availability_zone
Prod availability zone
|
2018-01-24 00:07:09 -05:00 |
Raymond Yee
|
5dd3404a6c
|
SSL cert expires Feb 2, 2019
|
2018-01-23 14:09:50 -08:00 |
|
Raymond Yee
|
76fca5c048
|
Merge remote-tracking branch 'origin' into prod_availability_zone
|
2018-01-23 13:47:58 -08:00 |
|
Raymond Yee
|
e1ad2913ac
|
changed to using availability zone 1b for production because I couldn't launch medium c1 in 1c a while back
|
2018-01-23 13:40:03 -08:00 |
|
eric
|
54229280c2
|
Merge branch 'master' into production
|
2018-01-20 12:52:43 -05:00 |
|
eshellman
|
3d2109e57f
|
Merge pull request #749 from Gluejar/expired_cards
Expired cards
|
2018-01-19 20:14:58 -05:00 |
|
eric
|
78d24330a6
|
expired cards should not be active
regluit uses date_deactivated to determine whether a card can be used
|
2018-01-19 20:08:41 -05:00 |
|
eric
|
906e5ece9d
|
don't try to notify null users
this was causing errors
|
2018-01-19 19:18:50 -05:00 |
|
eric
|
de89226c13
|
Merge branch 'master' into production
|
2018-01-12 12:33:15 -05:00 |
|
eshellman
|
029c507c66
|
Merge pull request #748 from Gluejar/disallow-search
Disallow search
|
2018-01-12 12:09:40 -05:00 |