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
e4b3d387fe
correct documentation notes
2013-11-12 14:58:29 -05:00
2786b871d3
update status now works for b2u
2013-11-12 14:48:04 -05:00
ffd6796bfd
fix silly method of turning off notifications
2013-11-10 10:28:22 -05: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
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
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
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
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
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
ed341884ea
add license page to epub before sending it for watermarking
2013-09-15 21:43:58 -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
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
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
837de35375
selling now works up to purchase page
2013-08-16 15:49:44 -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
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
91e2d41b67
moved the link target pref into a library prefs only table
2013-07-26 18:30:45 -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
3a9e588fc7
replacing confusing field names
2013-07-25 10:18:36 -04: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
6ba623a2c8
database support for MARC records that link to download page
2013-07-23 08:49:15 -04:00
1bebec42af
what about public domain ebooks?
2013-07-19 13:13:53 -04:00
0e143b15ba
persist information about where to find AWS files
2013-07-18 15:49:54 -04: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
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
2ea00389b3
minimal MARC support in database
2013-07-08 10:03:22 -04:00
b0f4eda221
show offers on work page
2013-06-27 13:10:33 -04: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
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
6b7fb7fd00
fix ebook url in reverse method
2013-04-26 17:49:57 -04: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
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
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
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
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
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
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
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
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
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
57ebbc087e
merge master into work_page_CTAs
2013-03-11 22:39:48 -04:00
c037764289
sitemaps! [ #25581139 ]
2013-03-09 17:37:33 -05:00
a2329de3b1
merge master into improve_registration
2013-03-08 17:14:22 -05: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
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
14a6803b9f
mailchimp integration [finish #37732465 ]
...
need to pip install postmonkey
2013-03-04 17:01:33 -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
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
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
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
73266f07eb
line up icons better and more clearly indicate status of books with successful campaigns
2012-12-14 10:45:16 -05:00
b05beaeaa7
need to actually handle anons and pass that data
2012-12-11 13:17:28 -05: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
279399e9b5
[ fix #39700567 ] Return a rightsholder name regardless of status of Campaign
2012-11-16 08:52:54 -08:00
1739064229
return True incorrect place in Campaign.update_status
2012-11-15 13:06:12 -08:00
b2ca44da31
Now automatically process transactions based on status of campaigns
2012-11-13 10:15:38 -08: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
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
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
75207afb4c
Merge branch 'pledged_badges'
2012-10-03 17:08:00 -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
5b19d7e765
Merge branch 'pledged_badges' of github.com:Gluejar/regluit into pledged_badges
2012-10-02 13:52:58 -04: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
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
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
45318c4e81
stop using id as variable name
2012-09-25 17:26:45 -03: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
4b49b1df4b
display badges on user profiles [ #29340547 ]
2012-09-22 23:55:07 -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
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
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
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
f2e9559a3a
beginning of a notification to RHs when someone wishlists their work
2012-08-31 13:47:01 -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
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
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
e8bd5ab2dc
added ckeditor to manage campaign forms to provide rich text editing and image uploads [ #32447975 ]
2012-07-27 14:23:44 -04:00
94384fcb59
Work in progress
2012-07-11 19:51:36 -07:00
c8f0143630
Merge branch 'master' into ola_fulfill
2012-07-09 14:04:21 -07:00
d869431b43
a first pass at getting a model for getting premium feedback for the OLA campaign
2012-07-09 09:28:50 -07:00
e2962e1075
[finish #30516251 ] supporter acknowledgement page basic version
2012-07-07 18:13:05 -04:00
21e3cb582d
fix tabs
2012-07-07 18:12:54 -04:00
1764cd62d6
small optimization of supporter count
2012-07-07 16:38:23 -04:00
85247c306e
Merge branch 'master' of github.com:Gluejar/regluit
...
Conflicts:
core/models.py
2012-07-05 10:21:08 -04:00
0329976165
send signal for unsuccessful campaign notifications
2012-07-05 10:04:27 -04:00
5b733d214c
setting up to automate daily campaign status update
2012-06-29 18:05:14 -07:00
8fbc65a305
merge
2012-06-28 14:31:48 -07:00
de929363e5
we are going to need an unsuccessful campaign signal asap, sadly
2012-06-28 14:07:33 -07:00
dfe17f94fa
[finish #31637107 ] refactored transaction summary code, now considers pending and other transactions
2012-06-21 23:20:58 -04:00
0a259165a1
[ fix #31498847 ] the helrond bug
2012-06-21 23:20:57 -04:00
cb9eb1e24e
detab code
2012-06-21 23:20:57 -04:00
e3ec5ba1ee
don't return empty rightsholder for campaign if it's SUCCESSFUL.
...
Remaining question: why does the RH for a campaign depend at all on campaign status? If it doesn't, we should remove dependence
2012-06-21 07:36:44 -07:00
eric
Raymond Yee
Andromeda Yelton