Commit Graph

1992 Commits (43162c040658e6a6c9a68364b39f818f9223ef9f)

Author SHA1 Message Date
Raymond Yee 9f970d6349 Merge branch 'master' of github.com:Gluejar/regluit into payment 2012-04-19 15:58:02 -07:00
Raymond Yee 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
Raymond Yee 929a70e498 Merge branch 'master' of github.com:Gluejar/regluit into payment 2012-04-19 12:58:13 -07:00
Ed Summers 9016331ed0 Changing to root password on please, which should be ok when please gets rebooted. 2012-04-19 18:40:46 +00:00
Raymond Yee 7fc0ae7165 Merge branch 'master' of github.com:Gluejar/regluit into payment 2012-04-19 10:56:53 -07:00
Raymond Yee 9af9c28645 Added command to get instances and snapshots
`
2012-04-19 10:53:22 -07:00
Andromeda Yelton 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
Raymond Yee 1aa9b5e550 crontab needs end of file 2012-04-18 19:07:02 -07:00
Raymond Yee c0dee5365a Trying to correct a complaint from crontab -- /bin/sh: no source 2012-04-18 19:05:40 -07:00
Raymond Yee 8619945838 [#27115145] implementing ubuntu crontab for production -- first job: django.admin emit_notices every minute 2012-04-18 18:32:13 -07:00
Raymond Yee 3bf4b1744d Added django-notification related panels to admin interface 2012-04-18 17:44:42 -07:00
Raymond Yee b9c272ae74 Removing stuff I had put into ry branch, specifically the experimental branch 2012-04-18 15:12:15 -07:00
Raymond Yee ac7f9afc2a Align ry back to master while keeping changes in random_tasks.py 2012-04-18 15:08:16 -07:00
Raymond Yee 3cf232a804 Merge branch 'master' of github.com:Gluejar/regluit into ry
Conflicts:
	core/signals.py
2012-04-18 15:01:47 -07:00
icellama21 d370091db7 Adding amazon FPS return view, execute and preapproval support 2012-04-18 16:22:00 -04:00
Raymond Yee e4352f4382 Putting into place a crontab for please
Adding django-admin.py emit_notices job to crontab
2012-04-18 09:57:32 -07:00
icellama21 125582eebd Adding new amazon payment module 2012-04-18 12:51:54 -04:00
icellama21 03e9947189 Adding basic amazon FPS Pay function 2012-04-18 11:53:13 -04:00
Raymond Yee c59923583b Merge branch 'master' of github.com:Gluejar/regluit into payment
Conflicts:
	settings/please.py
2012-04-18 08:13:38 -07:00
Raymond Yee 98cc04deb8 Turn off the spam Raymond 2012-04-17 14:07:14 -07:00
Raymond Yee abf72e78c8 Merge branch 'master' of github.com:Gluejar/regluit 2012-04-17 13:49:57 -07:00
Raymond Yee 0969e05486 Test the spam raymond celerybeat task 2012-04-17 13:49:21 -07:00
Andromeda Yelton e85ae79c35 Merge branch 'master' of github.com:Gluejar/regluit 2012-04-17 16:28:27 -04:00
Andromeda Yelton d78fbf963c notifications div ids replaced with snarkier, more-likely-to-be-unique text 2012-04-17 16:28:10 -04:00
Raymond Yee f41265be6d Turning on notification emission on please 2012-04-17 12:38:53 -07:00
eric 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
eric 8a24f860ee [#27470543] html fixes 2012-04-17 14:30:38 -04:00
eric 7791de3c29 fixed html error [#27310245] 2012-04-17 14:10:14 -04:00
Andromeda Yelton 8dda3369b5 minor language tweak per AM 2012-04-17 10:10:40 -04:00
Andromeda Yelton 9bdd8c9d72 Merge branch 'master' of github.com:Gluejar/regluit 2012-04-17 09:44:54 -04:00
Andromeda Yelton 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
Andromeda Yelton ecf1a7e604 selecting a premium now autofills pledge box with that number [#26659097] 2012-04-17 09:26:45 -04:00
Raymond Yee 38be468249 Merge branch 'master' of github.com:Gluejar/regluit into payment 2012-04-16 21:45:23 -07:00
Raymond Yee 08528fe352 Added some sys admin scripts in progress 2012-04-16 21:42:19 -07:00
Raymond Yee e6501a0bea Merge branch 'master' of github.com:Gluejar/regluit into payment 2012-04-16 21:14:40 -07:00
Raymond Yee 697fb826b4 Continuing to take apart the responses from Amazon FPS in response to a PAY operation 2012-04-16 20:58:00 -07:00
Andromeda Yelton be510587ff clarified error messages 2012-04-16 15:28:06 -04:00
Andromeda Yelton 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
Andromeda Yelton 63b40fd1d9 moved styling for errors into sitewide.css 2012-04-16 12:14:04 -04:00
Raymond Yee f012f011d2 More RY figuring out basics of FPS 2012-04-16 07:00:46 -07:00
Raymond Yee 05a4144c20 Merge branch 'master' of github.com:Gluejar/regluit into payment 2012-04-13 16:57:54 -07:00
eric 5f4f381e06 fix problem where Goodreads has started to return empty descriptions 2012-04-13 17:53:18 -04:00
Andromeda Yelton 941fb78bf0 Merge branch 'master' of github.com:Gluejar/regluit 2012-04-13 15:40:33 -04:00
Andromeda Yelton 8434bb981f header now contains an alert badge for notifications [#27777943] 2012-04-13 15:29:46 -04:00
Raymond Yee 86ed171cf3 Now I understand more of the status message that comes back after an attempted authorization at Amazon 2012-04-11 16:02:28 -07:00
Raymond Yee 5162cd8f72 Merge branch 'master' of github.com:Gluejar/regluit into payment 2012-04-11 13:52:49 -07:00
Raymond Yee 491bad5c14 Simplified structure of URLs for testfps to:
urlpatterns += patterns('',
         (r'^fps/', include(amazon_fps_obj.urls)),
         url(r'^testfps/$', 'regluit.payment.views.testfps', name='app_offsite_amazon_fps'),
    )
2012-04-11 13:51:20 -07:00
eric bf68f2f587 corrected bad reference to rightsholder name 2012-04-11 13:39:32 -04:00
eric 8cb1375ffe friendlification of comment notifications 2012-04-11 13:39:03 -04:00
Raymond Yee b808ddbed0 Added URLs needed for the return from Amazon authorization.
Also forgot to put keys in prod.py
2012-04-11 10:37:41 -07:00