Commit Graph

1134 Commits (727580e3307011fbc535491d5eeeddb495f70cfe)

Author SHA1 Message Date
eric 49ffafc838 fixed bug where social auth breaks if user also registers password
now, the password will get attached to the social auth account
2011-12-28 23:31:42 -05:00
eric afccb45fe4 fixed redirect loop 2011-12-28 23:31:42 -05:00
Andromeda Yelton a742773799 merging work.html changes 2011-12-28 23:19:18 -05:00
Andromeda Yelton 79bc9ac15a now email share has marginal styling and returns users to their original page after form submission 2011-12-28 23:17:39 -05:00
eric f9adbd0bc3 social widgets on basedocumentation lit up 2011-12-28 21:13:32 -05:00
Andromeda Yelton 0717479238 lo-fi email sharing now works 2011-12-28 20:43:52 -05:00
eric a348743385 discovered at d applied the useful request.build_absolute_uri 2011-12-28 20:41:07 -05:00
eric f484acc884 and we really want 0.8 version of django-registration 2011-12-28 19:01:54 -05:00
eric 880cb85509 removed too much; really do need django-registration 2011-12-28 18:40:02 -05:00
eric 57939300b1 another try for email activation 2011-12-28 15:02:12 -05:00
eric 4c7e5e7f8c revert; will need to use http rewrite in apache to enforce https 2011-12-28 13:58:28 -05:00
eric f493312782 Revert "added htmlbase to enforce https login"
This reverts commit 93afadcf46.
2011-12-28 13:51:24 -05:00
eric 93afadcf46 added htmlbase to enforce https login 2011-12-28 12:34:43 -05:00
eric 37a0139e8d registration and profile cleanup / decrufting 2011-12-28 12:34:42 -05:00
eric 697ee04a43 added site fixtures to make email registration emails work 2011-12-28 12:34:41 -05:00
Andromeda Yelton 97ee0a7fc4 shortened publication date in work page header, made book list cover clickable 2011-12-28 07:27:56 -05:00
Andromeda Yelton 5d79f512bd suppressing lame status line on panel view 2011-12-27 21:59:19 -05:00
Andromeda Yelton f0e1d47ac4 remove this button on work page returns page to add-to-wishlist state 2011-12-27 21:39:40 -05:00
Andromeda Yelton 50aae788c6 further tidying up panel view hover state and making sure it works properly in widget form too 2011-12-27 19:17:44 -05:00
eric 5fb28b709f revived book covers 2011-12-27 13:00:42 -05:00
Andromeda Yelton d940c9a46a tidied up panel hover state: layout, more sensitivity to campaign status, live pledge link 2011-12-26 21:10:32 -05:00
Andromeda Yelton a35ffb2ffa Merge branch 'master' of github.com:Gluejar/regluit 2011-12-26 12:53:36 -05:00
Andromeda Yelton c79b3bdd10 replaced useless status indicators with wished-by indicators on supporter page for status = initailized or no campaign and destroyed GR/LT modal dialog 2011-12-26 12:53:28 -05:00
Raymond Yee 5fa3877285 Merge branch 'payment' of github.com:Gluejar/regluit 2011-12-23 16:46:40 +00:00
Raymond Yee ad2dd36613 Changed order of campaign classes in campaign_admin 2011-12-23 11:46:09 -05:00
Raymond Yee 3474fb5722 Merge branch 'payment' of github.com:Gluejar/regluit into payment 2011-12-23 15:07:53 +00:00
Raymond Yee c721c9c6b2 Now in campaign admin, you can pick specific campaign to take action on. 2011-12-23 09:59:07 -05:00
Raymond Yee c849edcfd8 Merge branch 'payment' of github.com:Gluejar/regluit into payment 2011-12-23 12:44:39 +00:00
Raymond Yee 217f06edeb Merge branch 'master' of github.com:Gluejar/regluit into payment 2011-12-23 07:29:41 -05:00
Raymond Yee a757f6f99b Versions that include movement to utcnow() and changing what comes out PaymentManager.checkStatus() -- but payment to primary recipient is now broken. Need to investigate 2011-12-22 20:34:24 -05:00
Andromeda Yelton 12bde78765 Merge branch 'master' of github.com:Gluejar/regluit 2011-12-22 16:03:23 -05:00
Andromeda Yelton 5c8f3beccc working on goodreads/librarything import UI. in an intermediate state right now. 2011-12-22 16:03:15 -05:00
eric a931b9d2b3 same optimization in librarything loader 2011-12-22 14:51:12 -05:00
Raymond Yee 72d81247ba Merge branch 'payment' of github.com:Gluejar/regluit into payment 2011-12-22 19:40:03 +00:00
Raymond Yee 41080d37a7 Merge branch 'payment' of github.com:Gluejar/regluit into payment 2011-12-22 19:39:17 +00:00
eric 68d6ef93fd General cleanup and optimization of goodreads loading 2011-12-22 14:29:46 -05:00
eric 4c50d53ad8 response from oath client doesn't need hard utf encoding! 2011-12-22 11:06:30 -05:00
Andromeda Yelton 6f64434b4e Merge branch 'master' of github.com:Gluejar/regluit 2011-12-22 09:51:59 -05:00
Andromeda Yelton 7130ee5625 progress icon replaced by wished-by-N text for books on supporter page with no campaign yet 2011-12-22 09:51:49 -05:00
eric ffe2ab5bd6 fixed Goodreads loading; unicode in exception message was a nono 2011-12-22 01:17:30 -05:00
Raymond Yee 7ed4ef6f75 Merge branch 'payment' of github.com:Gluejar/regluit into payment 2011-12-21 23:38:39 +00:00
Raymond Yee 81c99c8724 Merge branch 'master' of github.com:Gluejar/regluit into payment 2011-12-21 18:37:22 -05:00
Raymond Yee 473c80827c Merge branch 'payment' of github.com:Gluejar/regluit into payment 2011-12-21 23:35:11 +00:00
Raymond Yee 21c009998a Starting to display more information about recipients tied to transactions 2011-12-21 18:33:36 -05:00
Raymond Yee e0d892f14b Merge branch 'payment' of github.com:Gluejar/regluit into payment 2011-12-21 23:12:39 +00:00
Raymond Yee 48c5988a08 Added a recipient_status to show status of individual recipients in all the transactions tied to a campaign list 2011-12-21 18:11:46 -05:00
Raymond Yee ae9a1726eb Merge branch 'payment' of github.com:Gluejar/regluit into payment 2011-12-21 22:57:37 +00:00
Raymond Yee 88f9b106f8 Explicitly go through all the campaigns to zero out totals when dropping all transactions 2011-12-21 17:52:04 -05:00
Raymond Yee 400d0ce5dd Merge branch 'payment' of github.com:Gluejar/regluit into payment 2011-12-21 22:36:51 +00:00
Raymond Yee 17d4acceab changed PaymentManager.cancel to PaymentManager.cancel_transaction and added PaymentManager.cancel_campaign to parallel other methods in PaymentManager
morphing the campaign_admin view towards being able to push all the campaigns through the various states
2011-12-21 17:32:08 -05:00