EbookFoundation
/
regluit
mirror of https://github.com/EbookFoundation/regluit.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
3,350 Commits
41 Branches
2 Tags
154 MiB
Commit Graph

1680 Commits (89221fbe82cfb41d1d1c25bebccf5b58e60b79bb)

Author SHA1 Message Date
Andromeda Yelton 23d48e6183 Merge branch 'master' into rh_help 2013-01-04 14:39:13 -05:00
eric aeabfa1fde img measurements are already px 2013-01-04 13:34:50 -05:00
Andromeda Yelton caafdcf38a some lists looked wrong with new documentation list styling 2013-01-03 16:33:29 -05:00
Andromeda Yelton 38b436f647 action on booklist for active campaigns on wishlist should be pledge, not un-wishlist 2013-01-03 16:33:07 -05:00
Andromeda Yelton 8ec5f7e2a2 one more tutorial while I'm at it 2013-01-03 13:58:17 -05:00
Andromeda Yelton a4de9a0040 adding some tutorials 2013-01-03 13:46:32 -05:00
Andromeda Yelton 924300267b more pointers to contextually appropriate actions for RHs 2013-01-03 13:18:26 -05:00
eric 5b1f3380b6 finish moving wish list "withs" 2013-01-02 20:46:02 -05:00
eric 6e4f8fe3d7 configure wish list inside book_panel so it doesn't get omitted again 2013-01-02 20:26:20 -05:00
Andromeda Yelton c2bc4f6b68 tidying visibly wrong things 2013-01-02 16:10:32 -05:00
Andromeda Yelton 8d321d46dc final incorporation of all stray CSS changes 2013-01-02 15:55:10 -05:00
Andromeda Yelton 0a86448d98 addressing CSS comments and also fixing some invalid html 
Conflicts:

	frontend/templates/unglued_list.html
	static/css/book_panel.css
	static/css/lists.css
	static/less/lists.less
 2013-01-02 15:51:21 -05:00
Andromeda Yelton 4ac487a7c9 unwinding useful changes from discarded two-tab model 2013-01-02 15:48:49 -05:00
Andromeda Yelton 26b2f0c00f Merge branch 'master' into list_tab_vertical_centering 2013-01-02 15:36:10 -05:00
Andromeda Yelton cc4f748e36 update all list pages to have two-line tab content 2013-01-02 15:35:42 -05:00
eshellman a6186e3bc6 Merge pull request #90 from Gluejar/prettier_acks 
prettifying acks page, make it easier to read
 2013-01-02 10:54:24 -08:00
eric 77c007c4ba Revert "Revert "Merge branch 'prettier_acks' of https://github.com/Gluejar/regluit into prettier_acks"" 
This reverts commit c13cca20ea.
 2013-01-02 13:53:00 -05:00
eric c13cca20ea Revert "Merge branch 'prettier_acks' of https://github.com/Gluejar/regluit into prettier_acks" 
This reverts commit 949425c6ca, reversing
changes made to e305a1ee74.
 2013-01-02 13:37:01 -05:00
eric 949425c6ca Merge branch 'prettier_acks' of https://github.com/Gluejar/regluit into prettier_acks 2013-01-02 13:34:47 -05:00
Andromeda Yelton 0eebc7c28a adjusting spacing around headers and clarifying dedication/dedicator relationship 2013-01-02 12:25:27 -05:00
eric e305a1ee74 Merge branch 'master' into prettier_acks 2013-01-02 10:53:05 -05:00
eshellman 53a62c3764 Merge pull request #101 from Gluejar/successful_works_in_inglued_tab 
Successful works in unglued tab; offset on "read it now" to be fixed.
 2013-01-02 07:28:14 -08:00
eshellman b29032b1c8 Merge pull request #102 from Gluejar/default_unglued_tab 
fix [#41795521]
 2012-12-31 12:41:16 -08:00
eshellman c22403356c Merge pull request #99 from Gluejar/correct_ungluing_date 
add success_date property to campaign so we can accurately report it whe...
 2012-12-31 12:28:47 -08:00
Andromeda Yelton 40cff261ba fix [#41795521] 2012-12-31 15:20:03 -05:00
Andromeda Yelton 4c1b64c154 update successful books in unglued tab on other tabbed pages 2012-12-31 14:57:01 -05:00
Andromeda Yelton c8cb5937e8 need to apply correct styles for new status handling too 2012-12-31 13:58:42 -05:00
Andromeda Yelton bf6cfb7cb2 Merge branch 'master' into successful_works_in_inglued_tab 2012-12-31 13:47:17 -05:00
Andromeda Yelton 92163d62e6 better querysets for work page tabs 2012-12-31 13:46:23 -05:00
thatandromeda 7fd78d9349 Update frontend/templates/base.html 2012-12-31 13:07:18 -05:00
eshellman a19a060351 Merge pull request #100 from Gluejar/missing_parenthesis 
it was missing a parenthesis
 2012-12-31 08:54:56 -08:00
Andromeda Yelton 609c09c74d it was missing a parenthesis 2012-12-31 11:12:55 -05:00
Andromeda Yelton 47c44b20d5 add success_date property to campaign so we can accurately report it when it differs from campaign deadline 2012-12-31 11:00:45 -05:00
Andromeda Yelton 7a0e2bfbd8 addressing ul, li, dt, dd comments 2012-12-19 10:22:11 -05:00
Andromeda Yelton 4a307a1e00 addressing CSS comments and also fixing some invalid html 2012-12-17 14:23:23 -05:00
Andromeda Yelton ab2d3d51b6 Merge branch 'master' into unglued_books_tab 2012-12-14 10:46:11 -05:00
Andromeda Yelton 73266f07eb line up icons better and more clearly indicate status of books with successful campaigns 2012-12-14 10:45:16 -05:00
Andromeda Yelton 7c88279603 Merge branch 'master' of github.com:Gluejar/regluit 2012-12-14 10:03:57 -05:00
Andromeda Yelton b001aefeeb separating unglued and PD works on ready-to-read page 2012-12-13 15:25:01 -05:00
Raymond Yee 136614b8ff Merge pull request #96 from Gluejar/merge_works_management 
staff only UI for merging works [finish #39297681]
 2012-12-13 12:09:43 -08:00
Andromeda Yelton ec4e1a7bb3 Merge branch 'master' of github.com:Gluejar/regluit 2012-12-13 09:55:14 -05:00
thatandromeda 575d34d968 Update frontend/templates/base.html 2012-12-13 09:51:36 -05:00
eric fec7f33d9e staff only UI for merging works [finish #39297681] 
staff-only link in rights tab of every work!
 2012-12-12 22:35:35 -05:00
Andromeda Yelton 7501c3fdae prettifying 2012-12-11 13:17:33 -05:00
Andromeda Yelton d73c1157b8 whoops lost some context in merge 2012-12-11 10:53:12 -05:00
Andromeda Yelton bfbb74c0a2 providing next steps 2012-12-11 10:37:38 -05:00
Andromeda Yelton 1304a73790 Merge branch 'master' of github.com:Gluejar/regluit 
Conflicts:
	frontend/templates/metrics.html
	frontend/views.py
 2012-12-11 10:31:58 -05:00
Raymond Yee 43c9087d2b Rewrite filter to include Transactions that are active or complete rather than filter out ones not to count. 2012-12-10 13:01:50 -08:00
Raymond Yee 33665abd37 Merge branch 'master' into pledges_on_info_page 2012-12-10 12:26:30 -08:00
Raymond Yee 61bb121a51 [#37736995] the old error message for a CC error was potentially confusing -- I think this should be better -- see images in 
https://www.evernote.com/shard/s1/sh/b59d4cfa-81a2-42bc-a315-24996fb01e83/2cfa234f2a15042ff0bb198514771dcb
 2012-12-10 11:18:46 -08:00
eric c1c3b3d1ad [#40818125] minimum target to $500 2012-12-06 21:05:15 -05:00
Andromeda Yelton 23708e15ba exclude uncollectable pledges 2012-12-06 15:31:32 -05:00
Andromeda Yelton 7decd15333 Revert "wanted to be able to track prospective revenue from info page" 
This reverts commit 150ed860c9.
 2012-12-06 12:37:48 -05:00
Andromeda Yelton 150ed860c9 wanted to be able to track prospective revenue from info page 2012-12-06 11:42:02 -05:00
eshellman fd7c10863e Merge pull request #91 from Gluejar/fix_lightbox 
Fix lightbox. works for me.
 2012-12-04 13:37:40 -08:00
thatandromeda f22312d735 Update frontend/templates/base.html 
network of killers now live
 2012-12-04 13:47:19 -05:00
Andromeda Yelton 88b4446bf0 force reload of hijax.js 2012-11-30 12:28:29 -05:00
eshellman 0993d393d2 Merge pull request #88 from Gluejar/smashwords 
Smashwords. Looks good for the first pass.
 2012-11-29 10:58:15 -08:00
Andromeda Yelton 202c10b0fb latest coverage 2012-11-29 12:04:05 -05:00
Andromeda Yelton 4fe73e110c make sure to include new file location 2012-11-29 12:00:34 -05:00
Andromeda Yelton 0aef30015b addressing comments 2012-11-29 11:20:13 -05:00
Andromeda Yelton c4ac00e8ef first pass at smashwords page 2012-11-29 10:54:07 -05:00
Raymond Yee 4d923aba5b Merge branch 'master' into charge_failed 2012-11-27 12:19:21 -08:00
Andromeda Yelton 1cd50d716f display submit buttons as loading gifs for transactions that might take a while 2012-11-27 13:32:25 -05:00
Raymond Yee 41f3da3d31 Merge branch 'master' of github.com:Gluejar/regluit into charge_failed 2012-11-26 14:36:40 -08:00
Andromeda Yelton 8692d26540 friendlifying 2012-11-26 14:23:04 -05:00
thatandromeda 1976bb14d3 Update frontend/templates/notification/pledge_charged/short.txt 2012-11-26 13:45:12 -05:00
thatandromeda 0b9827424f Merge pull request #84 from Gluejar/pledge_sidebar 
Pledge sidebar
 2012-11-26 08:21:02 -08:00
Raymond Yee 6ab521faa1 Merge branch 'master' into charge_failed 2012-11-23 09:20:58 -08:00
Raymond Yee 28eca2999c put checks for notices in proper context 2012-11-21 16:42:04 -08:00
eshellman db1fdc321e Merge pull request #79 from Gluejar/ending_soon_notification 
Ending soon notification
 2012-11-21 14:05:26 -08:00
eric 54a8a31c8c Merge branch 'master' into pledge_sidebar 2012-11-21 17:00:33 -05:00
eshellman ea212bd167 Merge pull request #82 from Gluejar/empty_stripe_token 
Empty stripe token reports error
 2012-11-21 13:37:48 -08:00
Raymond Yee ecea475419 a few modifications to pledge_failed notice 2012-11-21 11:40:19 -08:00
Raymond Yee cbac6f1e3c First round of edits to get pledge_charged and pledge_failed notices to be parallel. tests passing 2012-11-21 09:21:01 -08:00
Raymond Yee ce6e7f865d tests pass on this commit 2012-11-20 13:56:14 -08:00
Andromeda Yelton 0a0b74e449 Revert "Revert "make the html validate"" 
This reverts commit a215471abb.

Conflicts:

	frontend/templates/base.html
 2012-11-20 15:53:24 -05:00
Andromeda Yelton 3ccb10a9aa Merge branch 'pledge_sidebar' of github.com:Gluejar/regluit into pledge_sidebar 
Conflicts:
	frontend/templates/base.html
 2012-11-20 15:51:37 -05:00
eric 466f7b9689 ok, so this results in the same dom tree, though the css matching is off 2012-11-20 15:48:41 -05:00
Andromeda Yelton a215471abb Revert "make the html validate" 
This reverts commit f5e3cc1670.
 2012-11-20 15:40:32 -05:00
eric f5e3cc1670 make the html validate 2012-11-20 15:28:45 -05:00
Raymond Yee 02b17ea81f Merge branch 'master' into charge_failed 2012-11-20 12:08:36 -08:00
Andromeda Yelton 7fcd0ba3af change css filenames so that we can force user refresh 2012-11-20 14:26:06 -05:00
Andromeda Yelton 9f43c9a43c this one too 2012-11-20 13:41:00 -05:00
Andromeda Yelton ba3c0d3871 & not & 2012-11-20 13:40:25 -05:00
Raymond Yee c034e10b30 Putting in some code to record a PaymentResponse to track errors in stripelib.Execute 2012-11-20 09:28:10 -08:00
Andromeda Yelton 029cd9740d that line looks better outside the form 2012-11-20 10:10:30 -05:00
Andromeda Yelton 810580779e fixing nits 2012-11-20 10:06:40 -05:00
Andromeda Yelton a2abb92038 makes pledge action clearer by describing in more contexts and using Pledge rather than Support 2012-11-20 09:56:04 -05:00
Andromeda Yelton 81e27e234e decided that phrasing was confusing 2012-11-20 09:09:03 -05:00
Raymond Yee 8b3287d85d Merge branch 'master' into charge_failed 2012-11-19 10:28:18 -08:00
Raymond Yee 716468cf0d Merge branch 'webhooks' into charge_failed 2012-11-19 10:26:13 -08:00
Raymond Yee 4544fb05a5 Merge branch 'master' into charge_failed 2012-11-19 09:22:19 -08:00
Raymond Yee af8a661eb7 Merge branch 'master' into webhooks 2012-11-19 09:21:38 -08:00
Raymond Yee 4da9b6ae36 Merge branch 'master' into empty_stripe_token 2012-11-19 09:21:01 -08:00
Andromeda Yelton 0b657cf1c1 clarify that acks are in the unglued ebook itself 2012-11-19 11:23:32 -05:00
eshellman 2fd4743e4c Merge pull request #77 from Gluejar/hijaxify_signin 
Hijaxify signin and make forms more good
 2012-11-16 13:25:28 -08:00
Andromeda Yelton 3253bcca6f also suppress sign up box on /accounts/register 2012-11-16 15:47:03 -05:00
Raymond Yee bd23eef4da Merge branch 'master' into empty_stripe_token 2012-11-16 12:36:58 -08:00
Raymond Yee 645c7d41da Merge branch 'master' into webhooks 2012-11-16 10:48:17 -08:00