Commit Graph

2298 Commits (2c37a2cb7ec876f744a8570006ad7407382388ed)

Author SHA1 Message Date
eric 7a44accfa2 chang to dj111 syntax 2018-11-13 13:39:55 -05:00
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 fc475017fb change news 2018-10-29 22:41:03 -04:00
eric 76047d74bb stale documentation 2018-10-09 09:17:30 -04:00
eric 2639cc66d1 enforce login for password change 2018-09-09 22:34:06 -04:00
eric 265d63cf75 corrected test for social_auth 2018-08-14 15:17:32 -04:00
eric 3d93fe2017 fix add subject script 2018-07-30 16:49:36 -04:00
eric d7826e535c don't need watermark scripts 2018-07-30 16:49:10 -04:00
eric efce3f14b7 add better error message 2018-07-30 12:56:12 -04:00
eric a0ae260191 favicon.ico -> static 2018-07-29 15:39:06 -04:00
eric 6376bfc84e enable amount change for donations 2018-07-27 13:12:02 -04:00
eric aff2fd3431 enable toggling of donation notices 2018-07-26 15:09:16 -04:00
eric 6ff52f10e4 template syntax is stricter 2018-07-23 14:42:56 -04:00
eric 147822b2a5 update dj selectable
Also put jquery-ui-theme in settings
2018-07-23 10:02:03 -04:00
eric 67652c2f72 Merge branch 'master' into dj111 2018-07-20 16:13:37 -04:00
eric 725f616811 privacy updates 2018-07-20 15:41:48 -04:00
eric 5455c21d26 cleanup after the facebook changes 2018-07-20 15:10:38 -04:00
eric f453555bf3 redirects should send user back to supporter page 2018-07-20 07:54:14 -04:00
eric 221815b5c9 Merge branch 'master' into dj111 2018-07-03 17:11:10 -04:00
eshellman 6f2391b0b9
Merge branch 'update' into master 2018-06-26 14:29:02 -05:00
eric 68ddec61c8 fix regression in 5598b154c5 2018-06-20 11:36:15 -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
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 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
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
Nicholas Antonov ec805e0591
Merge pull request #72 from EbookFoundation/foundation/home
Foundation/home
2018-05-15 18:34:04 -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 c0dba9390f Move donate above latest ungluing 2018-05-14 19:34:24 -04:00
jonahmania d78dc33342 Add latest ungluing to desktop page 2018-05-14 16:57:52 -04:00
nicholas antonov 68273a96e9 Hide search bar on welcome page 2018-05-14 12:33:31 -04:00
jonahmania dbeec738f5 Fix book layout 2018-05-03 16:57:12 -04:00
eric b7df794017 deprecated template syntax 2018-05-02 11:11:16 -04:00
nicholas antonov 4046884ef4 welcome page 2018-05-02 07:55:23 -04:00
jonahmania 97e859f945 Merge in newfoundation 2018-05-01 23:59:47 -04:00
jonahmania 076721ac79 Fix book layout for mobile 2018-05-01 23:43:05 -04:00
jonahmania 9075d69cbd Fix book icon styles 2018-05-01 22:01:44 -04:00
nicholas antonov 75467649e9 readd border on desktop 2018-05-01 19:55:16 -04:00
nicholas antonov b540ad6758 style login 2018-05-01 19:46:07 -04:00
nicholas antonov adf275de3e Make signup responsive 2018-05-01 19:36:28 -04:00