fe931c7835
uploader now generates mobi for unglued b2u files
2014-02-05 17:02:21 -05:00
25d9923337
THANKS has null target
2014-01-30 11:59:17 -05:00
3bfbbd7653
Merge branch 'master' into t4u_file_upload
2014-01-30 11:53:20 -05:00
4c9aba2b47
authors should always return a query set
2014-01-23 23:04:52 -05:00
e540bb7a56
all authors now display
...
had to harden the work model against works without editions to pass
tests
Lagos 2060 will need 1st author to change back
added work.authors_short to work model and to search work mock model
used work #415 as an example of a work with 3 authors
2014-01-17 21:37:19 -05:00
f101f0dc20
Merge branch 'master' into multi_author_display
2014-01-15 21:22:49 -05:00
b3465ea084
search code for dependence on deadline being not null
2014-01-15 17:59:45 -05:00
df7dd775bf
add authors method to work
2014-01-15 15:16:24 -05:00
1b656ad76a
fix missing launch button
...
t4u work removed the deadline in b2u campaigns, resulting in a failed
criterion for shooing the launch button. Have moved all the
launchability logic to the campaign model
2014-01-15 10:19:57 -05:00
66ca501327
temp commit
2014-01-15 08:32:55 -05:00
66e241441b
make cc_date less crash
2014-01-13 14:32:03 -05:00
f3a04aff99
Merge branch 'master' into thanks4u_
2014-01-03 18:47:51 -05:00
70004a0f0f
can create a THANKS campaign
2014-01-03 14:15:26 -05:00
7d7cbfc7f8
Merge pull request #275 from Gluejar/bugfixes
...
Bugfixes
2013-12-31 11:21:11 -08:00
b8c7b8afa7
add a page that lets rhs see the premiums earned by ungluers
2013-12-30 21:51:32 -05:00
af8fe05c54
fix same email bug
...
This bug [#63071834 ] was caused by a bug in Registration 1.0, which
fires the account_activated signal twice. There's already a pull
request fixing this bug.
In reviewing this handler, I realized that all the other reg code is in
library_auth, so I moved the same_email code there. I also decided that
the utility of attaching to the old email address was insufficient to
over come the risk of people stealing accounts by messing with social
auth.
2013-12-30 11:49:04 -05:00
c3c3d5b9c4
don't want "ending soon" notifications on B2U
2013-12-20 17:33:55 -05:00
eb416e75dd
Merge branch 'master' into switch_watermarking
2013-12-19 18:02:43 -05:00
a05c3d27f1
Merge branch 'switch_watermarking' into thanks4u
2013-12-18 16:06:30 -05:00
973d2c3bc0
made watermarking optional [ #62120182 ]
...
apply migrations
2013-12-18 12:34:53 -05:00
0d28fbab7e
Merge branch 'master' into ban_disposable_emails
2013-12-18 08:54:11 -08:00
098b185a5a
turn off mailchimp checking for tests
2013-12-16 15:11:25 -05:00
40e611bac5
revive the gift/donation credit funtionality, at least for b2u campaigns
...
The reason for doing this is so a library can put in money with one
check, then use it up gradually. (we get to pocket the fees that would
go to stripe) One change here- in b2u there is an extra click to get to
download page, even if no gift credit is involved - this way the user
knows what and how he's bee charged
2013-12-15 00:31:06 -05:00
2892a22824
change terminology from "donation" to "gift"
2013-12-13 15:15:35 -05:00
be080223bd
Make core.BookLoaderTests.test_ebook check the ebooks only if they show up...the public domain status of book fluctuates.
2013-12-10 16:17:12 -08:00
a3a1853a3b
fix test
2013-11-29 16:04:22 -05:00
e014114a52
preclude possible inter-instance data leakage
2013-11-18 18:22:09 -05:00
0a9e3b8c79
I officially hate working with zipfiles
2013-11-17 23:24:03 -05:00
a1cea30cba
fix percent for campaign preview
...
somehow googlebot found a link to the "preview" of Stephen Black's
campaign.
Not an urgent fix, but thanks, googlebot.
2013-11-15 23:06:08 -05:00
2959b68549
Merge pull request #246 from Gluejar/b2u_ungluify
...
B2u ungluify
2013-11-15 15:59:05 -08:00
a98b43ede3
replace example book with one recognized now by Google Books
2013-11-15 15:47:02 -08:00
188d34ea51
added test for b2u ungluify
...
(also tests now invoke booxtream in test mode)
2013-11-15 11:25:41 -05:00
a701edf3b2
make ebook entries yay
2013-11-15 02:10:14 -05:00
efea7d0198
on success, add a cc license, watermark (and generate mobi), and save
2013-11-14 23:16:55 -05:00
c6edd83884
Merge branch 'master' into b2u_ungluify
2013-11-14 14:58:22 -05:00
5d4539b305
enable ebookfile download and secure ebookfile storage
2013-11-14 14:48:16 -05:00
9cf7385324
move campaign completion logic to campaign
2013-11-14 12:40:01 -05:00
0dad79a3d4
fix bug comparing dates with times
2013-11-14 12:38:58 -05:00
a64c9470e2
StringIO should be fed a unicode string if possible
2013-11-12 18:48:43 -05:00
e4b3d387fe
correct documentation notes
2013-11-12 14:58:29 -05:00
e9de656bfc
make sure current_total gets updated
2013-11-12 14:58:11 -05:00
2786b871d3
update status now works for b2u
2013-11-12 14:48:04 -05:00
f016bbb4c1
Merge pull request #240 from Gluejar/reserves
...
fix silly method of turning off notifications
2013-11-12 06:01:53 -08:00
ffd6796bfd
fix silly method of turning off notifications
2013-11-10 10:28:22 -05:00
073b618fd8
must preface timedelta with datetime
2013-11-08 21:30:18 -08:00
00693f7a23
Merge branch 'master' into reserves
...
Conflicts:
core/models.py
2013-11-08 16:07:29 -05:00
0840a1fd71
implement holds. Also fix borrow view that didn't specify work.
2013-11-08 12:13:34 -05:00
2d86584129
add Acq to admin system
2013-11-06 23:25:52 -05:00
520fef9f18
set emails in fixtures to avoid test failures on notification
2013-11-06 19:19:18 -05:00
50134907cd
also want tests to pass
2013-11-06 17:20:13 -05:00
f5f58dfba6
don't want tests to generate email
2013-11-06 15:43:54 -05:00
ca540c4cb4
wired up claim notifications [ #37257639 ]
2013-11-06 14:58:50 -05:00
f6f3c4fc04
booxtream default ex libraris page boasts about "Social DRM". yuck.
2013-11-03 17:19:23 -05:00
757927220e
this is what caused "Open Access" to fail for Raymond last week.
2013-11-03 17:14:13 -05:00
6bdbe1d046
user can buy multiple library licenses [ #59827932 ]
...
also, some logic needed cleaning for setting expires on reserves
2013-11-01 16:15:01 -04:00
c79572e8e4
notifications when user joins library or user borrows a book
2013-10-31 12:26:43 -04:00
d740d98e51
turned off requests logging from bookloader
...
the messages from requests were more than useful
2013-10-30 12:42:59 -04:00
53d9f2c8be
library ungluer list is library members
2013-10-19 21:01:10 -04:00
76562f83ad
fix test errors
2013-10-19 17:27:53 -04:00
cc8375bf4a
bookpanel reflects in-library and out on loan state
2013-10-19 16:54:09 -04:00
6e7344d8a4
and now, you can borrow a library book! yay!
2013-10-18 15:35:48 -04:00
60cd2f626b
borrowability reflected on work page
2013-10-18 13:33:47 -04:00
93d128102e
display of borrowability and library holdings
...
needed another date column on acqs to manage this
bookpanel getting complicated- moved some logic into tempalte tags
library page now shows b2u books it owns
"library" has its own view now
2013-10-18 12:36:55 -04:00
c2649f6ab2
implemented borrowing methods, "BORROWED" license acq, RESERVES
...
includes a schema migration!
2013-10-16 22:48:29 -04:00
e6573ac0c5
library user can buy a library license
2013-10-15 16:18:30 -04:00
157d41eead
make the purchase options reflect user libraries
2013-10-11 17:50:54 -04:00
fcc1876859
Revisit manage_campaign page for b2u
2013-10-11 12:50:59 -04:00
d99aaa97c9
card number authentication!
...
create libraries and administer them in admin.
card patterns mimc ezproxy format
http://www.oclc.org/support/services/ezproxy/documentation/usr/number.en
.html
after you join a library, it appears in your explore bar
2013-10-10 02:41:50 -04:00
19101a3109
ungluing date calculator and many documetation improvements
2013-10-03 22:54:25 -04:00
b091612605
Merge branch 'master' into b2u_errata
...
Conflicts:
frontend/views.py (kindle config bug already fixed)
2013-09-26 09:57:06 -04:00
58755d76e1
fix dollar per day computation to use launch date when present
...
also, activated had never been activated!
2013-09-26 09:26:50 -04:00
18d1d69ccb
wrong object
2013-09-24 16:22:41 -04:00
9b5a254f1d
Adapt marc record machinery to B2U titles
2013-09-23 12:39:47 -04:00
be711e142d
cleaned up marc file storage issues before implementing b2u
...
MIGRATION!
1. multi-record marc files no longer saved, sent to user directly
2. works with both s3 and file system- default storage by name used for
both read and write.
3. stupid storage of computed filenames/urls eliminated
4. removed verbose logging
5. no need to have pymarc write to a StringIO
6. the MARCRecord.clean method didn't do anything
2013-09-23 00:34:51 -04:00
405913c746
fix oclcnum buggy code
2013-09-22 23:41:24 -04:00
3b34c43581
Merge branch 'insert_dated_copyright'
2013-09-20 18:00:30 -07:00
8543a9ac2f
change pyepub to regluit.pyepub
2013-09-20 17:59:40 -07:00
ed1f17169d
Merge pull request #210 from Gluejar/insert_dated_copyright
...
Insert dated copyright -> Se tests and main tests passed on my laptop.
2013-09-20 17:44:35 -07:00
99fe9f9011
rewrite license page
2013-09-20 17:46:06 -04:00
c83f1f657d
remove more debugging stuff
2013-09-20 17:45:28 -04:00
aedf080965
add license to opf file metadata
2013-09-20 17:44:37 -04:00
de2e56a25a
add campaign to test to exercise the inserted file
2013-09-18 17:36:42 -04:00
ed341884ea
add license page to epub before sending it for watermarking
2013-09-15 21:43:58 -04:00
e075fd0081
not using unglueit.com any more
2013-09-11 13:43:49 -04:00
6294c15aad
TGFT
2013-09-06 00:14:06 -04:00
aad6d72207
Merge branch 'master' into b2u_download
...
Conflicts:
core/signals.py
2013-09-05 22:56:46 -04:00
b801eb4927
add acq handling to download
...
needs migration. should migrate core back to 0052 to refresh acq table
download page no longer passes ebook ids to send_to_kindle, url
calculations are now done in view
2013-09-05 22:54:11 -04:00
715bf049bc
Merge branch 'b2u_fulfillment' of https://github.com/Gluejar/regluit into b2u_fulfillment
...
Conflicts:
core/signals.py
2013-08-29 22:16:42 -04:00
f8df110163
only watermark on purchase
2013-08-29 11:57:41 -04:00
646c8f09e3
I think it's right to move the logic into the else: https://github.com/Gluejar/regluit/pull/202#discussion_r6059064
2013-08-29 06:29:45 -07:00
4e161bebe6
explicit import of regluit.core.parameters
...
move to using the openly available github hosted version of Eric's Open Access Ebooks for core.EbookFileTests.test_ebookfile test
Should we delete the static/test epub?
2013-08-28 17:13:35 -07:00
0ba5c9a00e
cleanup, plus tests
2013-08-27 18:03:35 -04:00
e51fa1190e
wired watermarker into file uploads. migration needed
2013-08-26 23:56:01 -04:00
567f20d5a2
move more constants
2013-08-25 23:52:09 -04:00
1c33c34f21
purchase complete notification, contextual wishlist active, fulfillment in signal handler
2013-08-22 14:30:56 -04:00
f93fe51e29
days_per_copy properties
2013-08-22 14:23:47 -04:00
3bdb755419
move constant to params file to improve import
2013-08-22 14:22:54 -04:00
159ad0db05
fix tests, fix bugs found by tests
2013-08-20 01:01:36 -04:00
18c836d6cd
connect purchases to the new Acq table which records purchases
2013-08-19 22:54:43 -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
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
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
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
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
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
eric
Raymond Yee
Andromeda Yelton
Raymond Yee