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
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
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
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
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
8b6d6b05bd
Overwrite previous MARC records
2013-07-29 18:16:34 -04: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
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
3b5f663856
do the migration for this PR correctly
2013-07-26 10:31:58 -04:00
c4513ead03
do migration properly
2013-07-26 09:00:23 -04:00
8a37d59c03
add 776 field to preserve pISBN, OCLCnum, LCCN
2013-07-25 11:09:39 -04:00
5e0ee9f5f9
need a bit more flexibility and validation if we're creating CC/PD MARCrecord instances directly from admin
2013-07-25 10:36:03 -04:00
89768ef837
debug write of UNGLUE records
2013-07-25 10:25:03 -04:00
3a9e588fc7
replacing confusing field names
2013-07-25 10:18:36 -04:00
e7ac7febfd
fix url-writing bug
2013-07-24 10:19:21 -04:00
3936692244
[ #40140123 ] Add Account.update_status() to replace handle_Account_status_change thus resolving a number of issues Eric identified:
...
* [ ]https://github.com/Gluejar/regluit/pull/176/files#r4221450 "It also seems odd to be using signals to talk only within the same module. This seems to me to be a misuse of signals, and makes for code that is harder to read" -- I need to decide whether I agree w/ Eric.
* [ ]https://github.com/Gluejar/regluit/pull/176/files#r4366503 long exchange "making it readonly would be overkill (java-ish) but the current code is not clear. Your save signal handler has to figure out whether a state transition has occurred and then act accordingly, which seems like a lot of hoops to jump though. better to put all the transition work in one place. For example, shouldn't it be the deactivate method that sets the status to deactivated?
For example, the methods on campaign do a reasonable job of handling all the status transitions." What I should: mimic structure of 4fc449dad5/core/models.py (L322)https://github.com/Gluejar/regluit/pull/176/files#r4214827 "could also mean the Account has been deleted. don't you really want instance.pk=None?"
* [ ]https://github.com/Gluejar/regluit/pull/176/files#r4221509 "since, these actions are being done in batch mode, the emit notifications would work a lot better if they were emitted after the batch of notifications is created."
2013-07-23 14:16:42 -07:00
ec57b7efee
user preference affects which MARC records we make available
2013-07-23 16:07:47 -04:00
bb5c1079b6
user can now change marc preferences
2013-07-23 12:23:04 -04:00
1414ae5fa4
add user preference for MARC record link target
2013-07-23 09:53:07 -04:00
ede556fbae
write records that link through unglueit
2013-07-23 09:41:55 -04:00
6ba623a2c8
database support for MARC records that link to download page
2013-07-23 08:49:15 -04:00
baa1f3f3ac
testing environments should not write MARC to main folder because of overwrite risk
2013-07-22 14:33:01 -04:00
287f017551
documentation for CC/PD MARC records
2013-07-22 14:23:59 -04:00
8285af8611
maybe we should actually provide the URL
2013-07-19 15:39:55 -04:00
1bebec42af
what about public domain ebooks?
2013-07-19 13:13:53 -04:00
4fc449dad5
Issue: instead of updating all Accounts in core.tasks.update_account_status -- updating only Accounts with expiration dates this month or earlier.
...
Possible to make this even more narrow -- see https://www.evernote.com/shard/s1/sh/35adfc05-46cc-41b7-865e-8a0edb652fd0/a18917c04c0262cd624208b7a071ec52
2013-07-18 16:14:01 -07:00
293b9b9db5
Merge branch 'master' into marc_provision
2013-07-18 16:39:33 -04:00
516c8c768a
I can harvest files from the db instead of tempting error by entering them twice
2013-07-18 16:36:01 -04:00
c3349ef5eb
logging
2013-07-18 16:07:24 -04:00
0e143b15ba
persist information about where to find AWS files
2013-07-18 15:49:54 -04:00
37ce78fda2
Merge branch 'master' into expiring_cc
2013-07-17 18:12:30 -07:00
54e422e217
parametrizing formats and license choices, bugfixing
2013-07-17 13:03:35 -04:00
87c27cecee
wiring ungluify_record to front end and s3
2013-07-17 10:34:01 -04:00
a6f9e524e1
[Finishes #53514857 ] Change ISBNS of test editions
2013-07-16 16:08:20 -07:00
8e2d469bb5
see if we can fix this
2013-07-16 11:45:31 -04:00
fe2e3b72c5
argh
2013-07-16 11:42:17 -04:00
e3b6288e23
iterating unglify script, starting to integrate into front end
2013-07-15 16:35:41 -04:00
bbeb086cbc
bugfixing
2013-07-08 15:54:36 -04:00
46d1d4f767
Merge branch 'master' into expiring_cc
...
Conflicts:
payment/models.py
payment/tests.py
2013-07-08 10:52:44 -07:00
1e1a0eda46
MARC record support in admin site
2013-07-08 11:14:25 -04:00
2ea00389b3
minimal MARC support in database
2013-07-08 10:03:22 -04:00
ac6f57fb31
Adding Google books api key to the search
2013-07-02 08:00:01 -07:00
2a7a42fbfe
Merge branch 'master' into ebook_selling
...
Resolved Conflicts:
frontend/templates/download.html
frontend/views.py
static/css/enhanced_download.css
static/css/enhanced_download_ie.css
static/css/sitewide4.css
static/js/download_page.js
static/less/enhanced_download.less
static/less/enhanced_download_ie.less
static/less/sitewide4.less
2013-06-27 15:26:04 -04:00
b0f4eda221
show offers on work page
2013-06-27 13:10:33 -04:00
5a207bf4e8
Merge pull request #181 from Gluejar/simpler_download
...
Simpler download. Yay.
2013-06-26 11:39:39 -07:00
f2f02237a8
fix KeyError at source, not in test
2013-06-26 14:36:04 -04:00
b063fe6c3f
don't fail for spurious reason
2013-06-26 11:25:35 -04:00
86caa9b3ed
Making changes to fix breakage in core.tests.BookLoaderTests.test_add_by_isbn
...
2000-07-01 -> 2000
Ace Trade -> Penguin
2013-06-24 08:04:36 -07:00
3c950966bc
Merge branch 'master' into simpler_download
2013-06-24 08:36:51 -04:00
1c86a0ae5a
I'm going to modify test for reflect readmill change -- it seems like there is no extra readmill button for test scenario
2013-06-20 14:17:47 -07:00
835ff4be8e
Rightsholder can upload ebook files and set buy-to unglue prices [ #51733385 ][ #51745045 ]
...
note that to test file upload loacal, you need to set up file storage
in local settings. for example,
MEDIA_ROOT = '/Documents/media/'
DEFAULT_FILE_STORAGE = 'django.core.files.storage.FileSystemStorage'
2013-06-17 18:53:28 -04:00
1ea77acf09
move latest ending logic from form to model/settings
2013-06-17 18:53:28 -04:00
3ea697c768
create offers
...
must migrate core schema!
2013-06-17 18:53:28 -04:00
f4ffd5da6f
Merge branch 'master' into simpler_download
2013-06-04 10:48:49 -04:00
92b4a36a41
archive now presenting both http and https
2013-06-03 16:29:52 -04:00
ad69580b2d
PEP 8, PEP 328. I feel better now.
2013-06-03 12:31:39 -04:00
2338240540
add kindle email to profile. requires migration
2013-05-31 11:35:17 -04:00
ffc813d8ee
blank descriptions now legit
2013-05-28 10:19:01 -04:00
a3cc502924
get rid of AccountTest0
...
renamed notice to Credit Card Number Updated
actually save account in update_account_status
2013-05-20 13:58:21 -07:00
31b978bb25
Merge branch 'master' into expiring_cc
2013-05-20 11:36:42 -07:00
f2e6d10469
allow new edition id oclc but no isbn; allow new publishernames
2013-05-13 17:32:30 -04:00
b224e99346
Merge branch 'master' into expiring_cc
2013-05-08 14:05:57 -07:00
be78c11815
Merge pull request #174 from Gluejar/improve_admin
...
All the core admin bits are now useable, and display more human readable. Nice convergence.
2013-05-06 14:11:05 -07:00
97bc857eab
Merge pull request #168 from Gluejar/degruyter_stub_template
...
put status information in de gruyter initialized campaigns
2013-05-06 13:04:50 -07:00
53d23d9f18
grammar
2013-05-06 15:59:55 -04:00
d65704d675
RightsHolder, Subject, UserProfile admin useable
2013-05-03 19:21:10 -04:00
356cc67785
claim admin useable
2013-05-03 18:05:43 -04:00
0578a40798
changed the html, need to change the management command
2013-05-03 11:50:41 -04:00
5f6abec1d5
de-button the ungluers to go
2013-05-02 15:58:28 -04:00
144599ac34
fix the download page tests
2013-04-27 16:58:11 -04:00
6b7fb7fd00
fix ebook url in reverse method
2013-04-26 17:49:57 -04:00
7265488484
Merge branch 'master' into expiring_cc
2013-04-26 08:58:47 -07:00
c5517df1c9
Merge pull request #167 from Gluejar/less_officious_comments
...
Less officious comments
2013-04-25 15:26:47 -07:00
a375112e72
Merge branch 'master' into expiring_cc
2013-04-24 13:50:33 -07:00
7c9973319d
donwload page changed, test should change to agree
2013-04-24 15:41:35 -04:00
babeb9e4aa
Merge pull request #164 from Gluejar/manage_book_data
...
Manage book data
2013-04-24 11:31:07 -07:00
587931a712
Merge pull request #165 from Gluejar/download_counter
...
Download counter
2013-04-24 11:28:22 -07:00
3b44e643d5
put status information in de gruyter initialized campaigns
2013-04-24 14:26:23 -04:00
aca759447d
test for staffness in template
2013-04-24 11:28:05 -04:00
80ee477198
disambiguate staff and RH
2013-04-23 10:22:08 -04:00
516f867d87
removing word 'official'
2013-04-23 10:07:59 -04:00
e34f2ce3a3
I think I had a Y2.0144 problem
2013-04-22 16:10:54 +00:00
a2606b2e08
move download count display to work infobox and rh_tools
2013-04-20 10:08:10 -04:00
de442c8f63
count downloads. migrate schemas!
2013-04-20 00:02:36 -04:00
aac69cf64c
Fixed up account_expiring text...next step is to fix up account_expired and account_active
2013-04-17 15:43:44 -07:00
3b900e2328
Align names signals.py with those in the short.txt for notices
2013-04-17 13:24:43 -07:00
31a1f46666
add split works funtionality
2013-04-16 16:46:25 -04:00
9cc2e3121e
Merge branch 'master' into expiring_cc
2013-04-10 09:14:29 -07:00
c60986f87c
Merge pull request #159 from Gluejar/press_updater
...
Press updater
2013-04-05 08:21:51 -07:00
00ab8f4d18
better name
2013-04-04 10:15:15 -04:00
2db75dd1d0
models.py update requires migration
2013-04-04 10:15:05 -04:00
63dd344c5a
adds db support for press items
2013-04-04 09:44:41 -04:00
31644ffb5a
revert to simpler faster query
...
output from speed test: old way 10% faster
2 values 0:00:18.294094
orig 0:00:16.574740
1 value 0:00:18.118002
2 values 0:00:18.266426
2013-04-03 20:21:04 -04:00
4180569633
Merge branch 'master' into fix_google_id
2013-04-03 20:07:03 -04:00
cd7082a676
test the work identifier methods
2013-04-03 15:45:01 -04:00
044c5ba806
fix self.identifiers.values('type', 'value').filter(type='goog')[0].value -> ['value']
2013-04-02 23:14:39 -07:00
d26e97f883
need ['value'] to access value not .value
2013-04-02 23:01:24 -07:00
d861aafdc3
Merge branch 'master' into landing_page
2013-04-02 07:55:42 -07:00
2aabf09161
merge from master
2013-03-29 19:41:28 -04:00
e4259bf468
changed all_names to alternate_names, added counter to monitor progress
...
Be sure your mysql server is set to utf8:
http://stackoverflow.com/questions/3513773/change-mysql-default-characte
r-set-to-utf8-in-my-cnf
2nd answer
2013-03-29 14:58:54 -04:00
63c6b35a30
Merge branch 'master' into add_publisher_model
2013-03-29 08:43:15 -07:00
552602f20a
https gravatar
2013-03-28 12:27:37 -04:00
520beedfc7
made it faster
2013-03-28 11:38:40 -04:00
a0af1761f1
forgot to set gravatar as default for new users
2013-03-28 10:39:48 -04:00
24a08d2979
Implement Andromeda suggestions
2013-03-27 21:46:52 -04:00
56691cd3e0
make sure alias pubname is used for new, add tests
2013-03-27 12:51:10 -04:00
3a81db3804
Implement publisher and feedback email in campaign management
...
(feedback view made more flexible)
2013-03-27 12:22:30 -04:00
782f2bd712
can now admin the publishernames.
...
Setting a publisher moves the editions to that publisher's name
2013-03-26 14:12:58 -04:00
3bef92b484
Publishers can now be added in Admin
2013-03-26 10:56:49 -04:00
1881660089
intoduce Publisher and PublisherName Models
...
Also change our by publisher lists to key on the new name ids rather
than the names, which was yucky.
Migrations!
Data migration takes a while, don't be allarmed if it sits a while.
2013-03-25 23:41:19 -04:00
d905f288d7
merge from master
2013-03-22 16:45:41 -04:00
aca38d66a1
Merge branch 'master' into expiring_cc
...
Conflicts:
payment/tests.py
2013-03-20 09:41:30 -07:00
50ec6ddb06
merge from master
2013-03-19 14:38:09 -04:00
af8c3ff1fd
merge from master
2013-03-19 10:02:06 -04:00
bd9a746422
merge in master
2013-03-18 21:50:22 -04:00
937f17eb73
and now everything works again
2013-03-18 14:56:27 -04:00
dc8dea0768
moving countdown out of context to models.py, standardizing button appearance
2013-03-15 15:51:17 -04:00
9dbdafed7d
There IS a setting for the items per page!
2013-03-15 12:32:29 -04:00
f719fb2ec3
migrate to pipeline
2013-03-15 12:29:11 -04:00
014f15d8ee
start on the profile editor mods...
2013-03-14 21:42:00 -04:00
7f64189284
create and deploy avatar_source and avatar_url
2013-03-14 15:43:24 -04:00
88a241fafd
add gravator method
2013-03-14 09:58:21 -04:00
db0eec3b6c
Merge branch 'master' into work_page_CTAs
2013-03-13 11:30:28 -04:00
54d0aa1d59
merge master into seo
...
schema.org stuff into work page
2013-03-13 10:48:36 -04:00
28045aed77
merge master into improve_registration
2013-03-13 10:40:20 -04:00
dd1180ab30
notification description field limited to 100 characters
2013-03-12 16:12:11 -04:00
2da23dbd64
Merge branch 'master' into work_page_CTAs
...
Conflicts:
frontend/templates/work.html
frontend/views.py
static/css/campaign.css
2013-03-12 15:59:24 -04:00
655a0a4f35
Merge branch 'master' into comment_notifications
2013-03-12 15:01:45 -04:00
7dc1f4cba3
Merge pull request #129 from Gluejar/manager_supporter_msgs
...
Managers and staff can send messages to supporters [#36991391 ]
2013-03-12 11:52:43 -07:00
99ba3499a7
Update signals.py
2013-03-12 11:58:33 -03:00
57ebbc087e
merge master into work_page_CTAs
2013-03-11 22:39:48 -04:00
f3543bd914
googlebot likes the wishlist feeds- give it more
2013-03-09 17:38:47 -05:00
c037764289
sitemaps! [ #25581139 ]
2013-03-09 17:37:33 -05:00
d3077c988b
links should not point to http from https
2013-03-09 13:29:03 -05:00
22b17d08fa
this was causing googlebot crawl errors
2013-03-09 11:52:42 -05:00
a2329de3b1
merge master into improve_registration
2013-03-08 17:14:22 -05:00
861d8355b3
Merge branch 'scrub_descriptions'
2013-03-08 14:11:38 -08:00
80536a491a
superlogin- failed logins check for socialauth and if so, as user to use it
...
superlogin injects extra_context into regular login method
2013-03-07 21:48:56 -05:00
b327818e89
merge manager_supporter_messages
2013-03-07 15:12:22 -05:00
0f6f433551
official comments now sent to ALL wishers except for commenter
2013-03-07 15:08:21 -05:00
05d37163ea
despam descriptions in db
...
wasn't real happy with this: https://unglue.it/work/66938/ so I looked
for other spammy descriptions in the db
2013-03-07 11:37:40 -05:00
a44a505157
optimize the shit out of work lists [ #45623361 ]
...
so, it turns out you need a migration to apply db-index changes to your
db. blazing speed ensues.
2013-03-06 21:54:12 -05:00
0abeb92a23
on_ml is already boolean
2013-03-06 07:27:51 -08:00
d6a8dedfaa
mailchimp ops now example.org aware, test users, now all changed to example.org
2013-03-06 09:39:06 -05:00
cc6a9b1200
Merge pull request #132 from Gluejar/mailchimp_integration
...
mailchimp integration [finish #37732465 ]
2013-03-05 19:14:09 -08:00
a56222426e
set queueing to use the master switch
...
use NOTIFICATION_QUEUE_ALL = False in m.py for testing
2013-03-04 23:11:50 -05:00
392a275ded
test that everything's chimpy
2013-03-04 17:19:39 -05:00
14a6803b9f
mailchimp integration [finish #37732465 ]
...
need to pip install postmonkey
2013-03-04 17:01:33 -05:00
de96aa0755
Add task for 22nd of month for notifying expring cc
2013-03-04 11:19:13 -08:00
902c3e837a
define a celery task for the 1st of each month to update the status of each Account
...
right now, I recalculate the status of each account -- but it is probably better to look only at the issue of dates -- another revision coming up.
2013-03-01 14:43:43 -08:00
99c434d940
[ fix #45405325 ] fix merge subjects, also added test
2013-03-01 13:13:14 -05:00
a53c99e295
decided that supporter_message signal belonged in core
2013-03-01 09:46:52 -05:00
d08ca3efbd
Turns out site was already in context for notifications as "current_site"
...
Also, added sender to notification calls for messages and comments
2013-02-28 16:04:41 -05:00
7fef0a65f0
refining account_* notices
2013-02-27 15:18:32 -08:00
282f877890
wire up msg view to wishlist_message notification [ #36991391 ]
2013-02-26 12:43:54 -05:00
9811012bf3
fix rare bugs
2013-02-25 18:31:37 -05:00
242cb66451
mitigate bug for campaigns that didn't get a success date
2013-02-21 15:57:49 -05:00
596d19596c
UI work for managers to contact supporters [ #36991391 ]
2013-02-21 15:10:01 -05:00
da3d542587
Merge pull request #120 from Gluejar/no_staff_in_ungluers_list
...
No staff in ungluers list
2013-02-19 08:38:27 -08:00
df0c781f67
change instance for bookloader test -- old example no longer in Google Books
2013-02-18 09:17:15 -08:00
e7bf70fadf
only filter out staff when there are lots of options
2013-02-18 09:09:54 -05:00
eb7d77dc5d
don't display staff in ungluers list
2013-02-06 15:05:16 -05:00
cd40fe99ef
making it faster
2013-02-04 13:32:21 -05:00
fa7e0b20de
addressing feedback
2013-01-04 15:12:35 -05:00
8867724ae9
make a work's rightsholders accessible from the templates
2013-01-03 13:18:00 -05:00
8d321d46dc
final incorporation of all stray CSS changes
2013-01-02 15:55:10 -05:00
a6186e3bc6
Merge pull request #90 from Gluejar/prettier_acks
...
prettifying acks page, make it easier to read
2013-01-02 10:54:24 -08:00
e305a1ee74
Merge branch 'master' into prettier_acks
2013-01-02 10:53:05 -05:00
c22403356c
Merge pull request #99 from Gluejar/correct_ungluing_date
...
add success_date property to campaign so we can accurately report it whe...
2012-12-31 12:28:47 -08:00
f4a269f5ac
returning empty string rather than False
2012-12-31 15:02:39 -05:00
47c44b20d5
add success_date property to campaign so we can accurately report it when it differs from campaign deadline
2012-12-31 11:00:45 -05:00
a726a11154
[ fix #41788889 ] google id for book changed
2012-12-31 10:10:24 -05:00
b7721f0fa3
management command to make sure transaction.ack_name returns something sensible for OLA on /acks/ page
2012-12-19 11:00:33 -05:00
73266f07eb
line up icons better and more clearly indicate status of books with successful campaigns
2012-12-14 10:45:16 -05:00
7c88279603
Merge branch 'master' of github.com:Gluejar/regluit
2012-12-14 10:03:57 -05:00
fec7f33d9e
staff only UI for merging works [finish #39297681 ]
...
staff-only link in rights tab of every work!
2012-12-12 22:35:35 -05:00
b05beaeaa7
need to actually handle anons and pass that data
2012-12-11 13:17:28 -05:00
6ab521faa1
Merge branch 'master' into charge_failed
2012-11-23 09:20:58 -08:00
db1fdc321e
Merge pull request #79 from Gluejar/ending_soon_notification
...
Ending soon notification
2012-11-21 14:05:26 -08:00
ecea475419
a few modifications to pledge_failed notice
2012-11-21 11:40:19 -08:00
cbac6f1e3c
First round of edits to get pledge_charged and pledge_failed notices to be parallel. tests passing
2012-11-21 09:21:01 -08:00
c4f32b38b5
moving ending soon notification to tasks
2012-11-21 11:09:07 -05:00
68a08d78c2
Revert "fire signal for time-running-out notification"
...
This reverts commit 4719c0b4b4
2012-11-21 09:12:21 -05:00
7f499bb6f2
Merge branch 'master' into charge_failed
2012-11-16 10:46:28 -08:00
279399e9b5
[ fix #39700567 ] Return a rightsholder name regardless of status of Campaign
2012-11-16 08:52:54 -08:00
2858ed194c
bugfixing
2012-11-16 11:43:00 -05:00
4719c0b4b4
fire signal for time-running-out notification
2012-11-16 10:37:12 -05:00
f25f3c81ee
construct notification handler
2012-11-16 10:24:48 -05:00
02dd7a55da
Merge branch 'campaign_close' into charge_failed
2012-11-15 14:38:23 -08:00
03a751626e
Stepping stone to tests that will allow the adjustment of localdatetime.now() so that we can simulate campaign closing
2012-11-15 14:37:04 -08:00
1739064229
return True incorrect place in Campaign.update_status
2012-11-15 13:06:12 -08:00
4e7fac0ecd
Merge branch 'campaign_close' into charge_failed
2012-11-13 10:20:49 -08:00
b2ca44da31
Now automatically process transactions based on status of campaigns
2012-11-13 10:15:38 -08:00
f4c8c67850
[ #39477485 ] allow campaigns to succeed if amount sufficient before campaign deadline
2012-11-13 09:01:05 -08:00
793d984ba3
Implemented basic transaction_failed signal and notices -- THEY STILL NEED WORK
...
Tests handle situation of transaction_failed too
2012-11-06 11:22:25 -08:00
96b62aa163
basic skeleton for test based on loading fixture
...
keep the signals for create userprofile, wishlist, and credit from firing if fixtures being loaded
2012-10-31 11:08:46 -07:00
f9f19b2043
if last transaction ack_name was blank, use username as ack_name
2012-10-23 09:37:00 -04:00
b7ce48bfb0
fix anon_pref
2012-10-19 14:01:22 -04:00
41f59024f4
last_transaction now a property on the profile
2012-10-18 15:51:52 -04:00
bcba88221f
ack_name and anon_pref are now properties on user profile
2012-10-18 13:50:02 -04:00
8bc66ad0fb
Merge pull request #63 from Gluejar/goodreads_bug
...
replaced remaining text.strip() with safe_strip(text) -- and changed saf...
2012-10-16 11:11:25 -07:00
3831a1ea59
clarifying kwarg
2012-10-16 11:36:51 -04:00
0df16957db
replaced remaining text.strip() with safe_strip(text) -- and changed safe_strip to a try/except approach to handle cases which a_string does not evaluate to False but nonetheless does not have strip method
2012-10-16 08:21:55 -07:00
ae9a541ed5
too many ways we might add to wishlist to test for. adding argument for notification. [[ #37780515 ]
2012-10-16 11:06:13 -04:00
2cd87369e1
only fire wishlist_added notification for actual new additions
2012-10-16 10:20:24 -04:00
bda3211a76
user can manage their account credit card [ #37674369 ]
2012-10-14 23:41:17 -04:00
3e2d65afd9
list the user's pledges [ #37674453 ]
...
see result at /accounts/manage/
2012-10-14 17:44:17 -04:00
5bde0da8ca
[ #37716025 ] reuse a user's credit card
2012-10-13 13:45:46 -04:00
018332d508
[ #37388341 ] First crack at displaying campaign data -- per Melinda's request
2012-10-08 17:47:55 -07:00
7f1dc2d3ca
merge works wasn't merging claims
2012-10-05 17:55:14 -04:00
b5148f39fc
Merge pull request #33 from Gluejar/pledged_badges
...
clean up two loose ends; gotta see what jenkins thinks of it
2012-10-03 17:38:02 -07:00
04002e40a2
jenkins build errors suggest some environments evaluate module attributes differently
2012-10-03 20:35:05 -04:00
75e0a4c534
clean up two loose ends
2012-10-03 17:36:17 -04:00
c26532c0fd
Merge branch 'master' of https://github.com/Gluejar/regluit
2012-10-03 17:08:54 -04:00
75207afb4c
Merge branch 'pledged_badges'
2012-10-03 17:08:00 -04:00
462011ed7e
add_pledge_badge was just a bug waiting to happen
2012-10-03 17:06:51 -04:00
3312a9108a
anonymous pledges shouldn't add badge
2012-10-03 16:01:02 -04:00
57dc500643
Revert "Revert "wired badge awarding into pledge modified and pledge complete signals""
...
This reverts commit 863055c305
2012-10-03 08:57:24 -04:00
863055c305
Revert "wired badge awarding into pledge modified and pledge complete signals"
...
This reverts commit 759e39f61d
2012-10-03 08:56:29 -04:00
6a6c249c83
f[inish #37068821 ] selectable 0.4.0 and later incompatible with earlier code
...
see
http://django-selectable.readthedocs.org/en/version-0.5.2/releases.html .
In general, we can't blithely update our imported modules without
reading the release notes.
2012-10-02 18:47:52 -04:00
5b19d7e765
Merge branch 'pledged_badges' of github.com:Gluejar/regluit into pledged_badges
2012-10-02 13:52:58 -04:00
75f2ad0b46
Merge pull request #28 from Gluejar/campaign_relaunch
...
fixing bug: successful campaigns were relaunchable.
2012-10-02 10:48:41 -07:00
759e39f61d
wired badge awarding into pledge modified and pledge complete signals
2012-10-01 18:28:26 -04:00
33e652881c
Merge branch 'master' into pledged_badges
2012-10-01 15:38:52 -04:00
5fe7e63508
not sure why it also worked without this
2012-10-01 09:48:57 -04:00
753ca046a0
Merge branch 'pledged_badges' of github.com:Gluejar/regluit into pledged_badges
2012-10-01 09:35:19 -04:00
4a15cc5ce7
added documentation for mysql path, removed hard encoding from goodreads#253
2012-09-30 18:05:15 -04:00
22106d4112
r.content already encoded --> so r.content.encode('utf-8') is wrong -- doesn't cause exception if sys default encoding is UTF-8 -- but problematic if default is ASCII
2012-09-30 08:44:25 -07:00
96a54adc4a
Merge pull request #25 from Gluejar/new_wisher_notification_improvement
...
include clickable links, make grammar singular/plural sensitive
2012-09-28 14:47:47 -07:00
b07afdc97d
fixing bug: successful campaigns were relaunchable.
2012-09-28 17:44:08 -04:00
8cb4586f78
Merge pull request #20 from Gluejar/relaunch
...
Relaunch
2012-09-28 07:55:07 -07:00
800dc128ab
Merge branch 'campaign_relaunch' into relaunch
...
Conflicts:
frontend/templates/manage_campaign.html
2012-09-27 14:04:00 -07:00
2211cf1231
Added a few comments to Campaign.clone() and Campaign.clonable() to make more explicit the behavior and construction of these methods
2012-09-27 13:45:13 -07:00
f327db6efd
Merge pull request #19 from Gluejar/improvify_download_page
...
Improvify download page with readmill [finish #36156381 ]
2012-09-26 13:04:39 -07:00
e23d706469
Added tests for campaign.clone and Premiums
2012-09-25 16:43:25 -04:00
45318c4e81
stop using id as variable name
2012-09-25 17:26:45 -03:00
e62484f46a
whoops wrong edition
2012-09-25 12:27:39 -04:00
2e23ddfd54
with format icons now in download page link counts are different
2012-09-25 11:10:23 -04:00
050bf58da5
add ability to set oclcnumbers for editions. [#finish 32289887]
...
(note also subtle chage to isbn editiing)
2012-09-24 21:51:57 -04:00
ccc082545a
[ #32289887 ] add worldcat learn more...
...
test it on /work/82838/
2012-09-24 15:36:39 -04:00
a91a70e6ef
Merge pull request #12 from Gluejar/master
...
merge all the mester into relaunch
2012-09-24 09:07:44 -07:00
4b49b1df4b
display badges on user profiles [ #29340547 ]
2012-09-22 23:55:07 -04:00
8611f73382
give badges to users who've pledged! [ #29340547 ]
2012-09-22 23:54:06 -04:00
376dbdac37
Update core/models.py
...
added comment to Campaign.clone method
2012-09-22 13:00:17 -03:00
b6862cad3d
fix copying the premiums [ #36192903 ]
2012-09-21 13:54:59 -04:00
40a5b09359
rh_tools now shows campaign totals by campaign [ #16581715 ]
2012-09-21 12:32:32 -04:00
5d7e6a39bd
managers can clone UNSUCCESSFUL Campaigns, and can only manage INITIALIZED and ACTIVE ones. [ #36192903 ][ #30068227 ]
2012-09-21 12:10:13 -04:00
756c1da430
download page test needs to cover readmill addition and new unglued flag handling
2012-09-19 12:37:37 -04:00
2216369bbf
include clickable links, make grammar singular/plural sensitive
2012-09-18 10:16:08 -04:00
389e01d1cc
fixed out of order migrations.
2012-09-17 16:00:28 -04:00
da2f1e0665
Merge branch 'master' into relaunch
2012-09-14 17:05:29 -07:00
c5f22742c1
In making a stripe charge, record transaction.type and transaction.approved.
...
Fixed Campaign.transactions() to handle default variables properly (compare with dfe17f94fa (L0R257)
2012-09-13 14:12:49 -07:00
270b47ef62
the google books id is always the first in our db. changing to the id for preferred edition [ #35918643 ]
2012-09-13 14:55:46 -04:00
e6f94223f4
Merge branch 'master' into relaunch_ry
2012-09-11 15:55:58 -07:00
dc94a207cc
[start #35862759 ] fixed bug in handle_wishlist_added
2012-09-11 14:06:46 -04:00
7f344c0ca9
dealing with merge conflicts
2012-09-10 14:27:14 -07:00
deee2ab75a
Merge branch 'master' into relaunch
...
Conflicts:
core/signals.py
frontend/views.py
2012-09-10 14:25:43 -07:00
7398fdf161
unglued property should adhere to editions, not ebooks
2012-09-10 15:18:40 -04:00
de9da54206
sorting the premiums turned out to be easy
2012-09-07 17:56:58 -04:00
4700e63b06
resolve conflict
2012-09-07 16:26:09 -04:00
1742572d95
Merge branch 'master' into relaunch
...
Conflicts:
frontend/views.py
2012-09-07 13:08:03 -07:00
6f63c047ce
DRY pub year code moved to work model
2012-09-07 16:07:47 -04:00
0c9d71e4d6
introduce PledgeExtra data object to simplify method calls
2012-09-07 09:46:38 -04:00
eb185438b4
methods currently marked as classmethods are really staticmethods
2012-09-07 01:04:18 -04:00
49f36e659e
whoops resolving merge
2012-08-31 13:47:31 -04:00
f2e9559a3a
beginning of a notification to RHs when someone wishlists their work
2012-08-31 13:47:01 -04:00
94270f33c6
add in credi processing; overhaul the PledgeView forms and partition authorize fn in Manager
...
also removed unused target, lists, ack-link,
2012-08-31 03:16:04 -04:00
7c4a2b94f0
documented up_or_down parameter on pledge_modified signal handler
2012-08-31 02:50:38 -04:00
618eda4aa5
eliminate db skew between prod and relaunch
2012-08-31 02:49:04 -04:00
8c030df830
adding some tests for my recent commits hooray
2012-08-29 15:56:14 -04:00
adef29f536
Merge branch 'relaunch' of github.com:Gluejar/regluit into relaunch
...
Conflicts:
core/signals.py
2012-08-16 17:11:12 -04:00
28670ed01a
building LOCKSS manifest page
2012-08-15 09:40:37 -04:00
291a2f5d67
need to know which ebook is the unglued one. migration needed
2012-08-15 09:39:58 -04:00
10560fb36b
merge credit into relaunch
2012-08-14 21:15:31 -04:00
69d85e6565
need a no-premium option. make sure to syncdb
2012-08-14 14:14:03 -04:00
3d7cd7fdae
management command to set active campaigns to UNSUCCESSFUL, trigger amazon notice
2012-08-09 09:47:10 -04:00
3d112d16d3
need to define signal before using it
2012-08-08 15:02:12 -04:00
3fdc3a3f22
Merge branch 'master' of github.com:Gluejar/regluit
2012-08-08 14:43:50 -04:00
e07f8487ee
added signal receiver to send notifications in re amazon-shutdown campaigns
2012-08-08 14:22:33 -04:00
5362c202bb
added management command to create credits, balance notification [ #21784207 ]
2012-08-07 14:12:50 -04:00
c36e49e42d
set up badges back end [ #29340547 ]
2012-08-06 22:34:20 -04:00
da0f4970c2
improving data flow of acks throughout system
2012-08-06 15:44:43 -04:00
8db1e5b59a
set up acks page to deal with ack_name, _link, _dedication and anonymity bit
2012-08-06 13:35:29 -04:00
3bdde8f936
finally I understand how reclustering should work
2012-08-05 18:30:13 -04:00
cbb40f5511
added a safer relate editions method which won't cause big clusters to merge
2012-08-05 13:05:35 -04:00
05767741d6
take extra care for null works
2012-08-05 13:03:37 -04:00
48d54fdc39
management command to list works with no isbn
2012-08-03 14:42:02 -04:00
2f109bef47
add email export management command
2012-08-03 11:16:47 -04:00
05eb26d2cb
use correct syntax for exception lists
2012-08-02 22:36:11 -04:00
eric
Raymond Yee
Andromeda Yelton
Raymond Yee