Andromeda Yelton
|
79aefd4c91
|
nope, need to set the values over here
|
2012-10-18 14:13:42 -04:00 |
|
Andromeda Yelton
|
4a6a392481
|
ack_name and anonpref are form initial values, not context variables
|
2012-10-18 13:57:39 -04:00 |
|
Andromeda Yelton
|
bcba88221f
|
ack_name and anon_pref are now properties on user profile
|
2012-10-18 13:50:02 -04:00 |
|
thatandromeda
|
c5ad71cf23
|
Merge pull request #66 from Gluejar/django142
Updating to Django 1.4.2
|
2012-10-18 09:40:10 -07:00 |
Raymond Yee
|
542ffd8f34
|
Update reference to Django in requirements_versioned.pip to 1.4.2
removed requiresments.pip and requirements_relaunch.pip and updated README.md
|
2012-10-18 07:34:39 -07:00 |
|
Andromeda Yelton
|
e3cdf397d3
|
Merge branch 'master' of github.com:Gluejar/regluit into prepopulate_ack_name
|
2012-10-18 10:12:13 -04:00 |
|
Raymond Yee
|
39b29d9ffd
|
Merge pull request #65 from Gluejar/account_nits
message for no pledges, html nits
|
2012-10-18 06:14:18 -07:00 |
eric
|
6b78ff7685
|
message for no pledges, html nits
|
2012-10-18 09:04:22 -04:00 |
|
Andromeda Yelton
|
64681d95f7
|
ohhh that's how class-based views work
|
2012-10-17 12:11:54 -04:00 |
|
Andromeda Yelton
|
96918d60a5
|
if not modifying pledge use ack data from previous transaction to prefill ack boxes [#37939351]
|
2012-10-17 11:54:29 -04:00 |
|
thatandromeda
|
79fca69cf9
|
Update frontend/templates/press.html
|
2012-10-16 16:41:37 -03:00 |
|
thatandromeda
|
8bc66ad0fb
|
Merge pull request #63 from Gluejar/goodreads_bug
replaced remaining text.strip() with safe_strip(text) -- and changed saf...
|
2012-10-16 11:11:25 -07:00 |
|
Raymond Yee
|
b7f5b78720
|
Merge pull request #62 from Gluejar/do_not_overnotify
Do not overnotify
|
2012-10-16 08:38:07 -07:00 |
|
Andromeda Yelton
|
3831a1ea59
|
clarifying kwarg
|
2012-10-16 11:36:51 -04:00 |
|
Raymond Yee
|
0df16957db
|
replaced remaining text.strip() with safe_strip(text) -- and changed safe_strip to a try/except approach to handle cases which a_string does not evaluate to False but nonetheless does not have strip method
|
2012-10-16 08:21:55 -07:00 |
|
Andromeda Yelton
|
ae9a541ed5
|
too many ways we might add to wishlist to test for. adding argument for notification. [[#37780515]
|
2012-10-16 11:06:13 -04:00 |
|
Andromeda Yelton
|
02145b22b5
|
feedback button obscures useful things like profile add, is less important now anyway
|
2012-10-16 10:20:58 -04:00 |
|
Andromeda Yelton
|
102937567b
|
better syntax
|
2012-10-16 10:20:41 -04:00 |
|
Andromeda Yelton
|
2cd87369e1
|
only fire wishlist_added notification for actual new additions
|
2012-10-16 10:20:24 -04:00 |
|
Raymond Yee
|
603b2dacf9
|
set IS_PREVIEW on jenkins
|
2012-10-15 08:55:44 -07:00 |
|
Raymond Yee
|
9f67423a2a
|
Merge pull request #61 from Gluejar/fix_pledge_nits
fix bug where modify doesn't initialize to previous premium
|
2012-10-15 08:45:25 -07:00 |
|
eric
|
f7615ffa7c
|
fix bug where modify doesn't initialize to previous premium
|
2012-10-15 11:39:09 -04:00 |
|
Raymond Yee
|
11d3af6c67
|
Merge branch 'production'
|
2012-10-15 08:17:57 -07:00 |
|
Raymond Yee
|
67c41df4b3
|
we have relaunched
|
2012-10-15 08:08:06 -07:00 |
|
thatandromeda
|
80fae98b88
|
Merge pull request #60 from Gluejar/manage_user_cc
tweak error page, other nits
|
2012-10-15 07:50:45 -07:00 |
|
eric
|
5ddbcd8d67
|
Improve error message to encourage user to try again
|
2012-10-15 10:47:18 -04:00 |
|
Raymond Yee
|
b8441e19ea
|
Merge pull request #59 from Gluejar/fix_preview_context
need is_preview to be in our context again
|
2012-10-15 07:43:30 -07:00 |
|
Andromeda Yelton
|
c2d851de18
|
need is_preview to be in our context again
|
2012-10-15 10:40:33 -04:00 |
|
eric
|
48be5a1191
|
xhtml nits
|
2012-10-15 10:28:31 -04:00 |
|
thatandromeda
|
13a5d8cb93
|
Merge pull request #53 from Gluejar/is_preview_message
when we trn is_preview off the message on top should change
|
2012-10-15 07:05:24 -07:00 |
|
thatandromeda
|
824b6d3ff7
|
Merge pull request #54 from Gluejar/slideshow
Slideshow
|
2012-10-15 07:04:43 -07:00 |
|
Andromeda Yelton
|
5955445fbb
|
tweaks
|
2012-10-15 09:52:39 -04:00 |
|
Andromeda Yelton
|
5c96382220
|
now that we have comprehensive account management page, link should go to it
|
2012-10-15 09:52:32 -04:00 |
|
eric
|
1db22071fd
|
slideshow now pulls from recommended user
|
2012-10-15 00:59:46 -04:00 |
|
Raymond Yee
|
d33485df99
|
use requirements_versioned.pip in update-prod
|
2012-10-14 21:59:13 -07:00 |
|
Raymond Yee
|
51e17e6886
|
Merge branch 'master' of github.com:Gluejar/regluit
|
2012-10-14 21:52:43 -07:00 |
|
eric
|
1ccc45875c
|
This message may be more intelligible to those new to the site.
|
2012-10-15 00:49:22 -04:00 |
|
Raymond Yee
|
6157e2c8cd
|
Merge pull request #58 from Gluejar/manage_user_cc
User can Manage pledges and CC Account
|
2012-10-14 21:47:35 -07:00 |
|
Raymond Yee
|
6c0906192f
|
Add exception message to when there is an error in creating new account
|
2012-10-14 21:42:09 -07:00 |
|
eric
|
4484e504f8
|
resolve merge conflicts
|
2012-10-15 00:31:45 -04:00 |
|
eshellman
|
8a2da5d67a
|
Merge pull request #57 from Gluejar/relaunch_testing
Relaunch testing
|
2012-10-14 21:27:48 -07:00 |
|
eric
|
b1e9acac11
|
a bit prettier by stealing pledge complete styling
|
2012-10-15 00:22:23 -04:00 |
|
eric
|
1964eec782
|
add links to account management page [#37674453]
|
2012-10-15 00:16:56 -04:00 |
|
Raymond Yee
|
c16df417e6
|
Hello world of IPN
|
2012-10-14 21:16:15 -07:00 |
|
eric
|
bda3211a76
|
user can manage their account credit card [#37674369]
|
2012-10-14 23:41:17 -04:00 |
|
eric
|
b923f741ce
|
DRY stuff that makes stripe work
|
2012-10-14 23:38:18 -04:00 |
|
Raymond Yee
|
168df09ac4
|
Display error message if make_account fails
|
2012-10-14 19:47:40 -07:00 |
|
eric
|
1c557e1488
|
fix reference to Donation Credit canceler
|
2012-10-14 22:08:34 -04:00 |
|
Raymond Yee
|
540e434698
|
Feed a Luhn-invalid # to check our stripe implementation rejects it at UI level
|
2012-10-14 18:19:05 -07:00 |
|
eshellman
|
1778427b01
|
Merge pull request #56 from Gluejar/proof_notifications
Proof notifications
|
2012-10-14 14:52:16 -07:00 |