8317356cc2
moved to not_maintained
2013-08-19 22:27:25 -04:00
26c4d522b4
made the cc_date and test consistent whether its a date or a datetime
2013-08-19 16:01:32 -04:00
4a3cfc6840
Merge branch 'master' into ebook_selling
2013-08-18 18:11:13 -04:00
94eb6aeab0
Demphasize "wishes" on the website in preparation for B2U
2013-08-18 18:10:25 -04:00
d5b9f88380
move "extra data" into a json field dict to improve payment code tidieness
...
need to install jsonfield
note: this is https://bitbucket.org/schinckel/django-jsonfield
I tried https://github.com/bradjasper/django-jsonfield but it was not
compatible with South
2013-08-18 15:21:55 -04:00
bf5dcd688a
fix some date comparison code to get tests to pass
2013-08-18 15:18:01 -04:00
52e58daa20
move some code to indicate it's not being maintained
2013-08-18 15:16:15 -04:00
7b90275bf4
Merge pull request #199 from Gluejar/social_auth_password
...
Social auth password
2013-08-18 06:26:35 -07:00
c007df0803
Merge branch 'master' into social_auth_password
2013-08-17 17:41:15 -04:00
c88f8165ba
Merge branch 'master' into ebook_selling
2013-08-16 15:50:24 -04:00
837de35375
selling now works up to purchase page
2013-08-16 15:49:44 -04:00
98bff34e46
Merge pull request #198 from Gluejar/fix_marc_upload
...
Fix marc upload
2013-08-16 07:31:19 -07:00
f607ab026d
Make sign-up box validate and make error notices less in-your-face
2013-08-15 12:43:20 -04:00
39251b2363
lightbox centering code was messed on some doc pages
2013-08-15 11:04:47 -04:00
d941686c50
now does password reset for a socialauth account
2013-08-14 17:29:38 -04:00
c415340356
change Pledge button to Purchase
2013-08-13 23:47:55 -04:00
40bcf62f99
edition.ebooks is always true
2013-08-12 17:22:55 -04:00
b05b622609
not all records have 050 and 082; code for 082 was putting call number in Dewey!
2013-08-12 17:22:24 -04:00
2c06139a6f
make dollar/day a float validate cc_date_initial, max target prevent changes after launch
2013-08-10 16:29:58 -04:00
7f325c0775
Finish B2U Campaign setup
2013-08-09 19:00:54 -04:00
75c32569e2
B2U campaign percentages
2013-08-08 22:32:58 -04:00
c2f3910fe8
set approriate open campaign params
2013-08-08 22:32:12 -04:00
587323196a
Merge branch 'master' into ebook_selling
2013-08-08 20:02:25 -04:00
505e9bf9d7
add new migration fsequenced after MARC migration
2013-08-08 20:00:56 -04:00
e64c128f7e
Merge branch 'master' into ebook_selling
...
Conflicts:
frontend/forms.py
2013-08-08 19:59:29 -04:00
613c3770e0
Bake in CC Date concept according to blog post, up to campaign creation
...
http://blog.unglue.it/2013/08/06/a-new-kind-of-ungluing-campaign/
moving the migration...
2013-08-08 19:56:26 -04:00
69f9e1838f
harmonization with master for merge
2013-08-08 18:21:33 -04:00
f9fad3260a
instance -> self in Account.update_status() -- d'oh
2013-08-08 16:28:34 -04:00
e5aa8f99e4
Merge pull request #176 from Gluejar/expiring_cc
...
Notifications for expired and expiring credit cards
2013-08-08 12:46:45 -07:00
cf7160b72d
Adding an optional flag to Account.update_status, which by default, send notices only if the status is *changing*.
...
Set send_notice_on_change_only = False to send notice based on new_status regardless of old status. (Useful for initialization)
2013-08-08 13:31:38 -04:00
27bc134fa4
Merge branch 'expiring_cc' of github.com:Gluejar/regluit into expiring_cc
2013-08-08 12:28:36 -04:00
a9b5d51b36
Merge branch 'master' into expiring_cc
2013-08-07 22:59:37 -04:00
1de7c631c4
Merge pull request #193 from Gluejar/marc_provision
...
Marc provision
2013-08-07 19:30:16 -07:00
f30d662cd9
Merge branch 'master' into marc_provision
2013-08-07 22:10:01 -04:00
1bd2918bc3
Merge branch 'master' into ebook_selling
2013-08-07 15:21:57 -04:00
c9abf4ea73
Merge pull request #197 from Gluejar/navigation_tweal
...
Navigation tweak -> looks good. local Se test ran w/o problem
2013-08-06 05:47:44 -07:00
69e3ec0722
Add path back to landing in faq menu
2013-08-05 17:41:38 -04:00
a1b8ac6dba
change Rghts tab to More… tab
2013-08-05 17:40:42 -04:00
c30c0de604
make recharge_failed_transactions a method on account
...
There were four places in the code that triggered the
recharge_failed_transactions signal and only one of them mattered. I
think this layout makes the code much easier to understand.
2013-08-05 14:37:46 -04:00
99c24f5fbf
move notebooks and dev code into notebooks folder
2013-08-05 12:21:06 -04:00
d2d119b526
get notebook running
2013-08-05 12:19:43 -04:00
e78d5c7472
clean up account update notices
2013-08-05 12:18:51 -04:00
25d9edf4d8
fix non-working update_status method
2013-08-05 12:18:18 -04:00
b28412ec7a
fix import on payment/tasks
2013-08-05 12:15:04 -04:00
6da8d16770
moved the payment tasks to payment from core
2013-08-03 18:42:33 -04:00
f2fbfed79e
Merge branch 'master' into expiring_cc
2013-08-03 16:19:53 -04:00
9128df9cfa
Merge pull request #196 from Gluejar/staff_updates
...
Make sure current staff is described accurately on unglue.it site <--looks straightforward.
2013-08-03 09:57:44 -07:00
84c18ee65d
Make sure current staff is described accurately on ungluue.it site
2013-08-01 19:28:20 -04:00
cf640baff8
fix problem found with token test
2013-07-29 21:38:16 -04:00
0d7c9fba7e
improve logic readability
2013-07-29 19:46:58 -04:00
eric
Raymond Yee