Commit Graph

1048 Commits (d1941de032e0cbed7295d548fc41742234cb2df4)

Author SHA1 Message Date
Raymond Yee de4092d23d Merge pull request #14 from Gluejar/nonprofit_switch
Nonprofit switch [deliver #36476831]
2012-09-24 09:50:22 -07:00
Raymond Yee a91a70e6ef Merge pull request #12 from Gluejar/master
merge all the mester into relaunch
2012-09-24 09:07:44 -07:00
Raymond Yee 9a65996644 Merge pull request #16 from Gluejar/improvify_download_page
Improvify download page [#36156381]
2012-09-21 17:09:08 -07:00
eric c4a2db66f7 Fix index out of bounds errors when no unglued epub is available [#36156381] 2012-09-21 19:54:43 -04:00
eric d8cbf39849 removed odd semicolons from non-working readmill code [#36156381] 2012-09-21 18:19:11 -04:00
eric a7210ad778 fund pledge_the_pledge page [#36476831] 2012-09-21 17:31:28 -04:00
eric 422826c4c2 Merge branch 'relaunch' into nonprofit_switch 2012-09-21 17:17:07 -04:00
eric 63af76efc5 donation page 2012-09-21 17:15:30 -04:00
eshellman 5589e5d209 Merge pull request #7 from Gluejar/improvify_download_page
Improvify download page
2012-09-20 12:58:45 -07:00
thatandromeda acf1763672 Update frontend/templates/press.html 2012-09-20 15:27:36 -03:00
eric 3ce8d605a6 add stripe stuff to donation form 2012-09-19 14:04:28 -04:00
eric b2df67e22f removed reconcile_pledge.js on pages that don't need it 2012-09-19 14:01:05 -04:00
Andromeda Yelton 5419c869ed now the readmill script works on the lightbox too 2012-09-19 12:08:27 -04:00
eshellman 4d562b64d5 Merge pull request #8 from Gluejar/lockss
lockss needs a page listing the books unglued in each year to crawl
2012-09-19 07:31:27 -07:00
Andromeda Yelton efa3187535 dynamically generate the readmill download url don't hardcode it you moron 2012-09-19 10:25:23 -04:00
Andromeda Yelton f2e4647e73 lockss needs a page listing the books unglued in each year to crawl 2012-09-18 14:16:59 -04:00
eshellman 499b1f78b2 Merge pull request #6 from Gluejar/fix_zero_wisher_grammar
Fix zero wisher grammar
2012-09-18 10:41:09 -07:00
Andromeda Yelton f581dd354b readmill support 2012-09-18 13:40:52 -04:00
Andromeda Yelton 0de46d0bb6 DRM-free logo 2012-09-18 13:35:14 -04:00
Andromeda Yelton 82f6ceffd4 addressing comment 2012-09-18 13:09:19 -04:00
Andromeda Yelton b0c2f0926b whoops there are other cases 2012-09-18 12:12:50 -04:00
thatandromeda 33ef8f6844 Update frontend/templates/press.html 2012-09-18 12:45:36 -03:00
Andromeda Yelton 35180252e0 bugfix [#36104625] 2012-09-18 11:10:53 -04:00
Andromeda Yelton f03855f2de bugfix [#36104625] 2012-09-18 11:10:01 -04:00
Raymond Yee da2f1e0665 Merge branch 'master' into relaunch 2012-09-14 17:05:29 -07:00
thatandromeda cbd9640287 Update frontend/templates/base.html
better link, now that that blog post exists
2012-09-13 15:42:11 -03:00
Raymond Yee b08643a0ac Merge branch 'master' into relaunch 2012-09-13 10:50:43 -07:00
Andromeda Yelton 4cd685a61a communicate about lack of active campaigns 2012-09-13 11:22:40 -04:00
Andromeda Yelton 7bd44fb93e link to work page not download page 2012-09-13 11:17:05 -04:00
Andromeda Yelton fdf27c4029 make work title on download page a link 2012-09-13 11:14:32 -04:00
Andromeda Yelton d4309dd46c digital shift coverage of OLA unglued ebook launch 2012-09-12 11:55:27 -04:00
Andromeda Yelton de78548a32 list press releases on press page 2012-09-12 11:31:22 -04:00
Andromeda Yelton fb648bbb5c Merge branch 'fix_lockss' 2012-09-12 10:37:29 -04:00
Andromeda Yelton 18a598f628 need to change lockss page since unglued adheres to editions 2012-09-12 10:11:49 -04:00
Andromeda Yelton 3733780ef3 Merge branch 'master' of github.com:Gluejar/regluit 2012-09-12 10:00:31 -04:00
Andromeda Yelton d8316c76ec user isn't in the context so we shouldn't reference it 2012-09-12 08:41:22 -04:00
eric c457dec497 helpful ebook format notations 2012-09-12 00:20:09 -04:00
eric 64461cc49e one letter typo was messing up unglued ebooks display 2012-09-12 00:09:29 -04:00
Raymond Yee e6f94223f4 Merge branch 'master' into relaunch_ry 2012-09-11 15:55:58 -07:00
Andromeda Yelton b383c9717d hijax script should be in base so it works sitewide, and hijax class must be applied to download link to trigger 2012-09-11 14:14:57 -04:00
Andromeda Yelton ba6c7165b3 OLA launch announcement 2012-09-11 14:03:33 -04:00
eric 5ddc050ff9 [finished #35857177] fixed missing user wishlist context for bookpanel on supporter page
bug introduced in
https://github.com/Gluejar/regluit/commit/fd44471aaecc08c30dd1688b060cd1
18174d910e
2012-09-11 13:41:53 -04:00
Raymond Yee a161b1f28b integrating Credit card form in 2012-09-10 17:02:34 -07:00
Raymond Yee 0e1839d531 Merge branch 'master' into relaunch_ry
Conflicts:
	core/signals.py
	frontend/views.py
2012-09-10 14:18:30 -07:00
Raymond Yee bcceaa719b integrating stripe into fund_the_pledge 2012-09-10 13:17:30 -07:00
Andromeda Yelton 7398fdf161 unglued property should adhere to editions, not ebooks 2012-09-10 15:18:40 -04:00
Andromeda Yelton 3a0d09db33 edition-adding on rights tab was hard to read with multiple editions 2012-09-10 14:37:37 -04:00
Raymond Yee e0bc5ee996 Merge branch 'master' into relaunch 2012-09-10 08:52:23 -07:00
Raymond Yee add83c9d9e fixed case of LOCKSSpreserved.png 2012-09-10 08:49:12 -07:00
Andromeda Yelton d9147fd088 clarifying instructions 2012-09-10 10:51:52 -04:00