thatandromeda
|
08e49036d1
|
Merge pull request #74 from Gluejar/fix_nav_menu
Fix nav menu
|
2012-10-24 09:13:43 -07:00 |
Raymond Yee
|
b4c1d09e88
|
Merge pull request #64 from Gluejar/prepopulate_ack_name
Prepopulate ack name
|
2012-10-23 10:35:40 -07:00 |
Raymond Yee
|
ce382e0673
|
Merge pull request #71 from Gluejar/google_analytics
Google analytics
|
2012-10-23 10:12:12 -07:00 |
Andromeda Yelton
|
673b890e42
|
add production setting and only use google analytics in production
|
2012-10-23 10:24:16 -04:00 |
Andromeda Yelton
|
ef4e35d174
|
is_preview is in sitewide context, do not need to add here
|
2012-10-23 10:24:02 -04:00 |
Andromeda Yelton
|
f9f19b2043
|
if last transaction ack_name was blank, use username as ack_name
|
2012-10-23 09:37:00 -04:00 |
thatandromeda
|
62af4c9c5b
|
Update settings/prod.py
now that amazon situation is resolved, should not risk maintenance mode being True!
|
2012-10-23 10:11:40 -03:00 |
thatandromeda
|
4ddd15db5d
|
Merge pull request #70 from Gluejar/master
update with non-Amazon-specific 503
|
2012-10-23 06:11:03 -07:00 |
thatandromeda
|
944b1680eb
|
Merge pull request #69 from Gluejar/outages
amazon situation now resolved
|
2012-10-23 06:10:23 -07:00 |
Andromeda Yelton
|
aa338e9811
|
amazon situation now resolved
|
2012-10-23 09:08:09 -04:00 |
thatandromeda
|
c9817fc574
|
Update settings/prod.py
maintenance mode to True so that users see some kind of next action until our site is back up
|
2012-10-22 16:50:58 -03:00 |
thatandromeda
|
c4762f8230
|
Merge pull request #68 from Gluejar/master
deal with amazon rds outage
|
2012-10-22 12:49:10 -07:00 |
thatandromeda
|
6ad567c12f
|
Merge pull request #67 from Gluejar/outages
Outages
|
2012-10-22 12:47:57 -07:00 |
Andromeda Yelton
|
6b348f2b76
|
don't need that conditional any more
|
2012-10-22 15:45:11 -04:00 |
Andromeda Yelton
|
4effa6faf9
|
communicate current outage, provide CTAs for current and future ones
|
2012-10-22 15:44:56 -04:00 |
Andromeda Yelton
|
02f803291a
|
communicate current outage, provide CTAs for current and future ones
|
2012-10-22 15:43:45 -04:00 |
Andromeda Yelton
|
002298d51a
|
don't need that conditional any more
|
2012-10-22 15:43:25 -04:00 |
Andromeda Yelton
|
a8727c6612
|
css tweaks
|
2012-10-19 16:29:37 -04:00 |
Andromeda Yelton
|
104992612b
|
first pass at making things visually distinct if there are notifications
|
2012-10-19 15:01:06 -04:00 |
Andromeda Yelton
|
b7ce48bfb0
|
fix anon_pref
|
2012-10-19 14:01:22 -04:00 |
Andromeda Yelton
|
836a957d97
|
add profile settings link to dropdown
|
2012-10-19 12:31:23 -04:00 |
Andromeda Yelton
|
09d5b00e50
|
highlight editing area if #edit is in url
|
2012-10-19 12:26:11 -04:00 |
Andromeda Yelton
|
1bf4743667
|
making notifications prettier
|
2012-10-19 12:19:56 -04:00 |
Andromeda Yelton
|
11aac359e6
|
adding drop-down menu
|
2012-10-19 12:01:28 -04:00 |
Andromeda Yelton
|
15367a8b54
|
syntax error
|
2012-10-19 12:01:18 -04:00 |
Andromeda Yelton
|
41f59024f4
|
last_transaction now a property on the profile
|
2012-10-18 15:51:52 -04:00 |
Andromeda Yelton
|
17bfb3c58c
|
remove no-longer=used ack_link, get data from form values
|
2012-10-18 14:17:11 -04:00 |
Andromeda Yelton
|
21ef0c1bf2
|
now passing data through initial form values, not hidden divs
|
2012-10-18 14:16:05 -04:00 |
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 |