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
12643f2250
funding info for non-unglued books
2013-07-29 19:44:58 -04:00
313e46341b
can't figure out how to get loading gif to go away, so will forget about it for now
2013-07-29 18:53:09 -04:00
8b6d6b05bd
Overwrite previous MARC records
2013-07-29 18:16:34 -04:00
a5cc59d6f9
filter marc records based on a user's wishlist
2013-07-29 17:59:52 -04:00
33c47f6e08
Merge pull request #195 from Gluejar/jenkins_2112_Chinese_book
...
[#54240150 ] Changed ISBN of the Chinese book in https://github.com/Gluej ...
I'm merging because it's straightforward...and work is documented if anyone wants to see what happened.
2013-07-29 14:52:17 -07:00
0b0bd9c41f
[ #54240150 ] Changed ISBN of the Chinese book in https://github.com/Gluejar/regluit/blob/master/core/tests.py#L95 because old ISBN no longer in Google Book
2013-07-29 14:49:18 -07:00
9b901d838c
token test for marc page
2013-07-29 16:49:50 -04:00
1872180c22
add upload MARC link to work page
2013-07-29 16:35:50 -04:00
8576a7fb7b
Make marc records accessible from work page
2013-07-29 15:57:33 -04:00
1307ae7091
move 856 documentation to template from settings
2013-07-26 22:31:41 -04:00
2c75ecb9ce
html nits
2013-07-26 21:01:19 -04:00
eff880ce0b
get license from database, not from the record submitter
2013-07-26 19:52:15 -04:00
da9fc648e3
apply distinct to edition lookup
2013-07-26 19:51:45 -04:00
ecc75ee0ad
Limit Edition search to only editions with ebooks
2013-07-26 19:07:52 -04:00
91e2d41b67
moved the link target pref into a library prefs only table
2013-07-26 18:30:45 -04:00
cdf7b26d70
maybe this is what was meant
2013-07-26 16:19:23 -04:00
341c0c44b4
lest we have no 020 field
2013-07-26 16:12:36 -04:00
d2f3a2547e
change default
2013-07-26 16:12:24 -04:00
767733ea26
anon user friendly
2013-07-26 16:12:10 -04:00
3b5f663856
do the migration for this PR correctly
2013-07-26 10:31:58 -04:00
eric
Raymond Yee
Andromeda Yelton