Commit Graph

163 Commits (c0625d78b85279f5fa523209f031f467ae004ed2)

Author SHA1 Message Date
eric bc9f1d3cd3 [fix #28759049] prefixing ebook contribution form not handled properly in view or form 2012-04-27 17:14:57 -04:00
eric 274762d7de [deliver #24088823] rights and filetype images for pd, cc books 2012-04-26 17:26:27 -04:00
eric ae1983be3d Merge branch 'master' of https://github.com/Gluejar/regluit 2012-04-24 22:45:19 -04:00
eric 028aa8f10d reorganize notifications [#27014673] 2012-04-24 22:44:19 -04:00
Andromeda Yelton a40e694faf some phrasing help, plus made the offer details field not required 2012-04-24 12:54:05 -04:00
eric 147808bd88 [finish #27470199] inactivate checked premium button no longer shows if there are no checked premiums 2012-04-05 22:44:45 -04:00
eric be909bba69 change language on claim status [accept #27384493] 2012-04-05 11:58:26 -04:00
Raymond Yee 1031a80a5e Merge branch 'master' of github.com:Gluejar/regluit into payment
Conflicts:
	core/signals.py
2012-04-04 10:08:59 -07:00
eric 8cf4209b54 removed comments 2012-04-03 15:54:41 -04:00
Raymond Yee 7cb3c038bd Migrating existing twitter pic urls
MIGRATION required

Conflicts:
	core/models.py
2012-04-03 11:54:20 -07:00
Ed Summers df36d8bf65 save https url for twitter avatar 2012-04-03 14:46:31 -04:00
Raymond Yee 0f0ef412eb Computing the twitter picture 2012-04-03 11:29:26 -07:00
Ed Summers cd41708237 migration to convert facebook avatar urls to https 2012-04-03 14:10:56 -04:00
Ed Summers 5e25f2f90a Merge branch 'master' of github.com:Gluejar/regluit 2012-04-03 13:56:25 -04:00
Ed Summers 1187a346ee use https urls for google books cover images 2012-04-03 13:55:45 -04:00
eric 86834f5e99 remove dead import 2012-04-03 11:47:41 -04:00
eric c90c42a2e8 linefeeds 2012-04-03 11:17:59 -04:00
eric aab0c47eeb reconcile linefeeds 2012-04-03 11:10:49 -04:00
eshellman 7cca21a4fb merge changes 2012-04-03 12:04:12 -03:00
eric 12434c7c09 more resolving conflicts 2012-04-03 10:58:27 -04:00
eric 0319185251 resolve conflicts 2012-04-03 10:54:31 -04:00
eric 6f1ccde928 moved notify_active_campaign into model, removed redundant context 2012-04-03 10:45:12 -04:00
Andromeda Yelton 07f39993c3 now with fewer test failures - wrote custom signal to trigger only on campaign.activate(), not all campaign.save() events 2012-04-02 21:14:41 -04:00
Raymond Yee 01799924a9 1) Undo a mistake I had made -- I mistakenly reversed the comparison between the deadline of the campaign and now()
2) updated the campaign deadlines to 2013 in the tests to put the deadline into the future

3) modified campaign_status test to include a user in the transaction so that the notification works
2012-04-02 17:57:30 -07:00
Raymond Yee f625e98b8f 1) Campaign.update_status determines that a campaign is SUCCESSFUL or UNSUCCESSFUL only after the deadline
2) first pass implementation of the successful_campaign notification -- using a successful_campaign custom signal
2012-04-02 16:10:56 -07:00
Andromeda Yelton 679f797b74 Merge github.com:Gluejar/regluit 2012-04-02 14:17:28 -04:00
Andromeda Yelton 94aa31a950 campaign activation now sends signal which notify listens for. still need to fix actual sending of notification. 2012-04-02 14:17:18 -04:00
Raymond Yee 55b3e8398e Hooking in djcelery admin to our admin interface
adding CeleryTask to the admin interface
2012-03-30 12:27:35 -07:00
Andromeda Yelton 619d37e0a0 blank rights holder name on rh_admin page should not validate 2012-03-28 14:12:10 -04:00
eric 8892a935dd Implemented limited edition premiums, front and back end [finish #27011359] 2012-03-26 18:47:02 -04:00
eric 7264b9846f Added management of custom premiums. (migration needed) [finish #26921893] 2012-03-26 15:32:23 -04:00
eric 0f61bd8d66 added license selection to campaigns. Simple migration to apply. 2012-03-23 12:30:49 -04:00
Raymond Yee dab3ecfc31 Do not override the source on a Wish if a work is already on the wishlist 2012-03-19 18:23:25 +00:00
Raymond Yee 3399e89541 renamed Campaign.update_success to Campaign.update_status to better reflect the purpose of the method (to update Campaign.status) 2012-03-09 14:18:11 -08:00
Raymond Yee a252f9d173 [#22561067] Implemented regluit.utils.localdatetime.now is by default datetime.datetime.now() (in Django 1.3) and django.utils.timezone.now() in Django 1.4+
One overrides regluit.utils.localdatetime._now to do "time travel" -- useful for testing scenarios requiring time changes (such as Campaigns)
Get rid of call references to datetime.datetime.now() or utcnow() and datetime.date.today() in favor of regluit.utils.localdatetime.now() and date_today().
2012-03-09 00:45:39 +00:00
eric 8dea738331 fixed stupid error removing et al. 2012-03-05 17:15:23 -05:00
eric f84c6101d4 removed "et al." from work.author() because it was almost always wrong 2012-03-05 11:12:41 -05:00
eric 039f617f17 implemented ebook contribution, included non pdf/epub, license and provider in UI
many changes, couldn't run all test- some failing for unrelated reasons
2012-02-28 17:28:58 -05:00
eric 107e6ffd0c apply migrations! added num_wishes on work model. "popular" page now 10x faster 2012-02-11 14:15:06 -05:00
eric 07e578699d Added WasWork model to track deleted works. Apply migrations! 2012-02-09 22:30:33 -05:00
eric 0380ae838a fixed error in Edition.get_by_isbn class method 2012-02-09 20:49:52 -05:00
Raymond Yee 3a2cece7dd Adding a bit more info to recluster_singletons but now requires a max parameter
Also adding __unicode__ method to Identifier
2012-02-06 11:26:48 -08:00
eric e268af16e1 fixed bug where first_ebook() is always None 2012-01-19 19:58:18 -05:00
eric 98a7c3f73b added googlebooks_id method on work, cleaned access 2012-01-17 16:28:58 -05:00
eric c3dcd3d294 fixed issues with null pubdates 2012-01-16 23:28:34 -05:00
eric 789b3ec118 relax publisher and pubdate requirement on edition 2012-01-16 15:15:35 -05:00
eric 7affe92c8d Merge branch 'generic_id' 2012-01-16 13:21:47 -05:00
eric 97c9c03ba7 get works with ebooks into unglued tab 2012-01-16 12:16:58 -05:00
Andromeda Yelton d50e9471a4 preview site will now show most-wished, not campaigns ending soonest 2012-01-15 18:03:54 -05:00
eric 0b91017dd5 Did what edso told me not to do- re-architected db to use generic ids 2012-01-09 13:55:22 -05:00