eric
|
18c836d6cd
|
connect purchases to the new Acq table which records purchases
|
2013-08-19 22:54:43 -04:00 |
|
eric
|
4a3cfc6840
|
Merge branch 'master' into ebook_selling
|
2013-08-18 18:11:13 -04:00 |
|
eric
|
94eb6aeab0
|
Demphasize "wishes" on the website in preparation for B2U
|
2013-08-18 18:10:25 -04:00 |
|
eric
|
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 |
Raymond Yee
|
c007df0803
|
Merge branch 'master' into social_auth_password
|
2013-08-17 17:41:15 -04:00 |
|
eric
|
c88f8165ba
|
Merge branch 'master' into ebook_selling
|
2013-08-16 15:50:24 -04:00 |
|
eric
|
837de35375
|
selling now works up to purchase page
|
2013-08-16 15:49:44 -04:00 |
|
eric
|
f607ab026d
|
Make sign-up box validate and make error notices less in-your-face
|
2013-08-15 12:43:20 -04:00 |
|
eric
|
d941686c50
|
now does password reset for a socialauth account
|
2013-08-14 17:29:38 -04:00 |
|
eric
|
c415340356
|
change Pledge button to Purchase
|
2013-08-13 23:47:55 -04:00 |
|
eric
|
40bcf62f99
|
edition.ebooks is always true
|
2013-08-12 17:22:55 -04:00 |
|
eric
|
2c06139a6f
|
make dollar/day a float validate cc_date_initial, max target prevent changes after launch
|
2013-08-10 16:29:58 -04:00 |
|
eric
|
7f325c0775
|
Finish B2U Campaign setup
|
2013-08-09 19:00:54 -04:00 |
|
eric
|
75c32569e2
|
B2U campaign percentages
|
2013-08-08 22:32:58 -04:00 |
|
eric
|
587323196a
|
Merge branch 'master' into ebook_selling
|
2013-08-08 20:02:25 -04:00 |
|
eric
|
e64c128f7e
|
Merge branch 'master' into ebook_selling
Conflicts:
frontend/forms.py
|
2013-08-08 19:59:29 -04:00 |
|
eric
|
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 |
|
Raymond Yee
|
27bc134fa4
|
Merge branch 'expiring_cc' of github.com:Gluejar/regluit into expiring_cc
|
2013-08-08 12:28:36 -04:00 |
|
Raymond Yee
|
a9b5d51b36
|
Merge branch 'master' into expiring_cc
|
2013-08-07 22:59:37 -04:00 |
|
Raymond Yee
|
f30d662cd9
|
Merge branch 'master' into marc_provision
|
2013-08-07 22:10:01 -04:00 |
|
eric
|
1bd2918bc3
|
Merge branch 'master' into ebook_selling
|
2013-08-07 15:21:57 -04:00 |
|
eric
|
69e3ec0722
|
Add path back to landing in faq menu
|
2013-08-05 17:41:38 -04:00 |
|
eric
|
a1b8ac6dba
|
change Rghts tab to More… tab
|
2013-08-05 17:40:42 -04:00 |
|
eric
|
e78d5c7472
|
clean up account update notices
|
2013-08-05 12:18:51 -04:00 |
|
eric
|
f2fbfed79e
|
Merge branch 'master' into expiring_cc
|
2013-08-03 16:19:53 -04:00 |
|
eric
|
84c18ee65d
|
Make sure current staff is described accurately on ungluue.it site
|
2013-08-01 19:28:20 -04:00 |
|
eric
|
cf640baff8
|
fix problem found with token test
|
2013-07-29 21:38:16 -04:00 |
|
eric
|
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 |
|
eric
|
a5cc59d6f9
|
filter marc records based on a user's wishlist
|
2013-07-29 17:59:52 -04:00 |
|
eric
|
1872180c22
|
add upload MARC link to work page
|
2013-07-29 16:35:50 -04:00 |
|
eric
|
8576a7fb7b
|
Make marc records accessible from work page
|
2013-07-29 15:57:33 -04:00 |
|
eric
|
1307ae7091
|
move 856 documentation to template from settings
|
2013-07-26 22:31:41 -04:00 |
|
eric
|
2c75ecb9ce
|
html nits
|
2013-07-26 21:01:19 -04:00 |
|
eric
|
91e2d41b67
|
moved the link target pref into a library prefs only table
|
2013-07-26 18:30:45 -04:00 |
Andromeda Yelton
|
767733ea26
|
anon user friendly
|
2013-07-26 16:12:10 -04:00 |
|
Andromeda Yelton
|
32f6546a04
|
spinny thing should go away if they want to use the form again
|
2013-07-26 08:59:31 -04:00 |
|
Andromeda Yelton
|
8281d99563
|
edge cases
|
2013-07-25 10:25:14 -04:00 |
|
Andromeda Yelton
|
da08afd0b8
|
now users can select the MARC records they want and get as single download
|
2013-07-24 14:52:01 -04:00 |
|
Andromeda Yelton
|
ec57b7efee
|
user preference affects which MARC records we make available
|
2013-07-23 16:07:47 -04:00 |
|
Andromeda Yelton
|
bb5c1079b6
|
user can now change marc preferences
|
2013-07-23 12:23:04 -04:00 |
|
Andromeda Yelton
|
287f017551
|
documentation for CC/PD MARC records
|
2013-07-22 14:23:59 -04:00 |
|
Andromeda Yelton
|
9cb3dcdadf
|
documenting how you get MARCXML from LOC
|
2013-07-19 09:56:47 -04:00 |
|
Andromeda Yelton
|
516c8c768a
|
I can harvest files from the db instead of tempting error by entering them twice
|
2013-07-18 16:36:01 -04:00 |
|
Andromeda Yelton
|
0e143b15ba
|
persist information about where to find AWS files
|
2013-07-18 15:49:54 -04:00 |
|
Andromeda Yelton
|
54e422e217
|
parametrizing formats and license choices, bugfixing
|
2013-07-17 13:03:35 -04:00 |
|
Andromeda Yelton
|
87c27cecee
|
wiring ungluify_record to front end and s3
|
2013-07-17 10:34:01 -04:00 |
|
Andromeda Yelton
|
fe2e3b72c5
|
argh
|
2013-07-16 11:42:17 -04:00 |
|
Andromeda Yelton
|
e3b6288e23
|
iterating unglify script, starting to integrate into front end
|
2013-07-15 16:35:41 -04:00 |
|
Andromeda Yelton
|
5f10047691
|
clarifying
|
2013-07-15 08:38:20 -04:00 |
|
Andromeda Yelton
|
bbeb086cbc
|
bugfixing
|
2013-07-08 15:54:36 -04:00 |