5b617370a8
moved boilerplate paragraph
2012-05-07 13:09:41 -04:00
4be0cab5a0
Merge branch 'master' of github.com:Gluejar/regluit
2012-05-04 10:05:54 -04:00
8902ec84b3
made manage_campaign workflow suck less
2012-05-04 09:56:41 -04:00
b9bbecb351
Merge branch 'master' of github.com:Gluejar/regluit into fps
...
Conflicts:
settings/common.py
settings/dev.py
settings/prod.py
2012-05-02 18:01:20 -07:00
a3ce812467
small formatting changes
2012-05-02 14:10:58 -04:00
b8b007c427
last_campaign_status is a string not function
2012-05-02 17:53:45 +00:00
122454b949
Merge branch 'master' of github.com:Gluejar/regluit
2012-05-01 13:56:12 -04:00
3deb660ce3
more css tweaks per stefan
2012-05-01 13:49:23 -04:00
1c2e48bc87
added edition to campaign model to allow selection of a preferred edition [finish #28736373 ]
2012-05-01 10:56:19 -04:00
c0625d78b8
banish isbn 10 display because it might not exist and prefer not to address the issue
2012-05-01 10:54:29 -04:00
fb5333be2e
only use role account email addresses in documentation pages
2012-05-01 10:02:07 -04:00
ce36f6771d
css changes per Stefan, part 1
2012-05-01 09:56:19 -04:00
8999afb7f1
Merge branch 'master' of github.com:Gluejar/regluit
2012-04-30 11:28:52 -04:00
5421793f02
minor styling tweaks
2012-04-30 11:03:15 -04:00
4f524a792f
[ #24088823 ] ebook downloads now drop down if more than 1
2012-04-28 21:05:41 -04:00
61a4878b54
[finish #24030945 ] tested it! scheduled notification for 12:30 at night via celerybeat. fixed various messge problems.
2012-04-28 13:02:38 -04:00
6cd6064387
[start #24030945 ] notification that ebooks have been added to database
2012-04-27 17:29:57 -04:00
bc9f1d3cd3
[ fix #28759049 ] prefixing ebook contribution form not handled properly in view or form
2012-04-27 17:14:57 -04:00
47a22f3ccb
Merge branch 'master' of github.com:Gluejar/regluit into fps
2012-04-26 15:50:49 -07:00
274762d7de
[deliver #24088823 ] rights and filetype images for pd, cc books
2012-04-26 17:26:27 -04:00
c6b05bd577
footer now points to wordpress blog
2012-04-26 15:37:41 -04:00
4219149132
Small tweaks to get rid of remnants of PayPal IPN_* variables -- I can now use campaign_admin to actually move fake amazon bucks. Still some IPN_* stuff remaining to clean up.
2012-04-26 19:31:55 +00:00
2ab1df92c2
addressing user feedback, highlighting field validation errors better
2012-04-26 15:30:28 -04:00
061f656e63
Merge branch 'jkace' of github.com:Gluejar/regluit into fps
...
Also fixed things so that regluit.test.campaigntest.support_campaign runs for Amazon without error -- though I still need to confirm that the status of transactions properly handled
Next up: see whether this works for PayPal too.
Conflicts:
frontend/views.py
2012-04-25 13:10:53 -07:00
3bc14c1ac9
Modifying frontend/views to use new transaction status codes
2012-04-25 13:55:30 -04:00
8706e9a900
email sharing needs to populate the sender field in order to validate
2012-04-25 13:45:18 -04:00
6246b231b1
[finish #27115511 ] remove html from wishlist_active notice
2012-04-25 10:20:04 -04:00
3709fa3ba8
polish up notice settings [finish #27014673 ]
2012-04-25 10:06:22 -04:00
ae1983be3d
Merge branch 'master' of https://github.com/Gluejar/regluit
2012-04-24 22:45:19 -04:00
028aa8f10d
reorganize notifications [ #27014673 ]
2012-04-24 22:44:19 -04:00
d0148cf6dc
[finish #28524505 ] add change email form
2012-04-24 22:20:10 -04:00
2a79a82dd7
detab text
2012-04-24 22:17:30 -04:00
709cb4ce41
now stuck on the status of an ACTIVE transaction in amazon in campaign_test
2012-04-24 18:03:57 -07:00
15a08bdfeb
Merge branch 'master' of github.com:Gluejar/regluit
2012-04-24 12:54:11 -04:00
a40e694faf
some phrasing help, plus made the offer details field not required
2012-04-24 12:54:05 -04:00
d652767a79
change supporters to ungluers on work page tab, see if that helps overflow problem
2012-04-23 12:08:11 -04:00
ba9123ba39
Sets form action properly in pledge.html depending on whether new pledge or modified pledge.
...
campaigntest.support_campaign changed to handle new premium selection process, which now changes the preapproval amount
2012-04-19 15:43:21 -07:00
911f6f6212
pledge and pledge_modify don't need to use different templates, just an if statement or two. DRY
2012-04-19 10:50:40 -04:00
e85ae79c35
Merge branch 'master' of github.com:Gluejar/regluit
2012-04-17 16:28:27 -04:00
d78fbf963c
notifications div ids replaced with snarkier, more-likely-to-be-unique text
2012-04-17 16:28:10 -04:00
d32190e905
[ #27115511 ] removed user avatar from comment notices because it didn't look right next to book cover.
...
Can revisit with professional design help.
2012-04-17 15:16:07 -04:00
8a24f860ee
[ #27470543 ] html fixes
2012-04-17 14:30:38 -04:00
7791de3c29
fixed html error [ #27310245 ]
2012-04-17 14:10:14 -04:00
8dda3369b5
minor language tweak per AM
2012-04-17 10:10:40 -04:00
434c6d048b
synced label for and input id so that clicking anywhere on the label selects the radio button
2012-04-17 09:33:47 -04:00
ecf1a7e604
selecting a premium now autofills pledge box with that number [ #26659097 ]
2012-04-17 09:26:45 -04:00
be510587ff
clarified error messages
2012-04-16 15:28:06 -04:00
7ef482b1ac
ensuring that errors display before form fields everywhere and switching css to make that apparent. if you write a custom form display, put errors before fields [ #27310245 ]
2012-04-16 14:18:04 -04:00
941fb78bf0
Merge branch 'master' of github.com:Gluejar/regluit
2012-04-13 15:40:33 -04:00
8434bb981f
header now contains an alert badge for notifications [ #27777943 ]
2012-04-13 15:29:46 -04:00
Andromeda Yelton
Raymond Yee
Ed Summers
eric
Raymond Yee
Jason