Commit Graph

214 Commits (879103104645583389d1046476889ef0b25f4c42)

Author SHA1 Message Date
eric 6535505e4d Revert "Merge branch 'master' into master"
This reverts commit bd52df020d, reversing
changes made to e455d9a766.
2018-11-03 17:23:07 -04:00
eshellman bd52df020d Merge branch 'master' into master 2018-11-03 17:06:09 -04:00
eric d7826e535c don't need watermark scripts 2018-07-30 16:49:10 -04:00
eric a0ae260191 favicon.ico -> static 2018-07-29 15:39:06 -04:00
eshellman 985b65ea3f
Merge pull request #85 from EbookFoundation/catchup
Catchup
2018-06-06 22:44:38 -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
nicholas antonov 022e69aff0 Fix badge placement 2018-05-18 14:20:20 -04:00
nicholas antonov 7a355b0f31 Fix notifications styling 2018-05-17 13:43:02 -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 bf7faad061 Remove debug logic 2018-05-16 16:37:28 -04:00
nicholas antonov 01f4fb43ec Remove old menu, add links to new menu, fix avatar 2018-05-16 15:51:41 -04:00
eric 486e3a5200 remove duplicate truncatechars 2018-04-27 18:03:22 -04:00
nicholas antonov ef5d0e6bd5 Tweak download options a bit more 2018-04-26 02:41:32 -04:00
nicholas antonov cd249b667f Add content to download options 2018-04-25 17:16:46 -04:00
nicholas antonov 9c4817419f some fixes for download page 2018-04-25 16:13:27 -04:00
eric 1589c997ea fix facebook url 2018-04-25 11:23:29 -04:00
nicholas antonov 568183d3e4 Make download page work on mobile 2018-04-24 19:42:52 -04:00
Nicholas Antonov a4dbd8ec2b
Merge pull request #64 from EbookFoundation/foundation/workchanges
Foundation/workchanges
2018-03-28 21:35:53 -04:00
Nicholas Antonov 6e6a75a535 restyle sign up button 2018-02-27 14:49:48 -05:00
jonahmania ac860ba1a3 Correct links 2018-02-20 14:52:37 -05:00
jonahmania 9044244461 Fix mobile menu spacing 2018-02-20 14:46:56 -05:00
jonahmania 9026732c61 Update menu with correct links 2018-02-20 13:14:14 -05:00
Nicholas Antonov 237266f26f Dont commit css 2018-02-20 12:44:17 -05:00
Nicholas Antonov fc1d12c5d5 Merge newfoundation 2018-02-14 23:56:53 -05:00
Nicholas Antonov ce20ddeb90 Scale and toggle menu correctly 2018-02-14 19:51:17 -05:00
jonahmania 97708c41d6 Merge in master 2018-02-13 17:42:09 -05:00
Nicholas Antonov daaf4eec8d Initialize drilldowns 2018-02-13 13:21:10 -05:00
jonahmania 55d63dc984 Add basic menu 2018-02-13 12:25:00 -05:00
Nicholas Antonov 6b421ae1cd add responsive footer 2018-02-13 11:34:32 -05:00
jonahmania 28151eaa2d Update header layout 2018-02-07 23:56:59 -05:00
Nicholas Antonov 5d51759a92 add files (imports fail) 2018-01-30 12:40:50 -05:00
eric 7cd10386cd convert sitewide to scss 2018-01-29 22:56:18 -05:00
eric f92f469e48 add extra metadata 2018-01-05 16:23:56 -05:00
Nicholas Antonov 7438b5c217 Fix names and add scss for work page 2017-12-07 16:55:16 -05:00
Nicholas Antonov 893d8abc4a Make django scss preprocessor work 2017-12-07 16:33:10 -05:00
Nicholas Antonov 9513514beb Start adding sass preprocessor 2017-12-05 18:46:18 -05:00
eric 12cbac63b3 revise documentation, faq 2017-11-18 16:35:19 -05:00
eric bb29fc3d1f remove gluejar.com 2017-11-18 16:34:56 -05:00
eric 96f40a8514 add rh agreement form 2017-11-07 10:43:40 -05:00
eric c457b268ec modernize some heavily used templates 2016-07-25 14:50:19 -04:00
eric bb9bd032b1 fix unencoded queries in urls 2016-06-20 13:08:23 -04:00
eric 959c5aa187 remove signin link 2016-05-25 11:53:29 -04:00
eric 240564e75b remove template workaround for testing 2016-05-11 10:36:20 -04:00
Raymond Yee 574854ec5a Merge pull request #565 from Gluejar/add-questionnaire
add the questionnaire module
2016-04-29 09:57:00 -07:00
eric cf64d43811 add the questionnaire module 2016-04-26 14:38:32 -04:00
eric 616e8b3c9d Wordpress is magically HTTPS 2016-04-12 14:32:22 -04:00
eric 3d923407e4 replace email support links with form 2015-08-18 11:03:49 -04:00
eric e6eaa24440 eliminate referrer leakage 2015-06-04 15:15:59 -04:00
eric 29108128a5 global change url syntax 2015-04-27 23:24:02 -04:00