EbookFoundation
/
regluit
mirror of https://github.com/EbookFoundation/regluit.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
2,834 Commits
41 Branches
2 Tags
154 MiB
Commit Graph

252 Commits (9d17f93facfec054bd1aeaef88f40b841ff06f20)

Author SHA1 Message Date
eshellman 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
eric 04002e40a2 jenkins build errors suggest some environments evaluate module attributes differently 2012-10-03 20:35:05 -04:00
eric 75e0a4c534 clean up two loose ends 2012-10-03 17:36:17 -04:00
eric 75207afb4c Merge branch 'pledged_badges' 2012-10-03 17:08:00 -04:00
eric 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
eric 863055c305 Revert "wired badge awarding into pledge modified and pledge complete signals" 
This reverts commit 759e39f61d.
 2012-10-03 08:56:29 -04:00
Andromeda Yelton 5b19d7e765 Merge branch 'pledged_badges' of github.com:Gluejar/regluit into pledged_badges 2012-10-02 13:52:58 -04:00
eric 759e39f61d wired badge awarding into pledge modified and pledge complete signals 2012-10-01 18:28:26 -04:00
eric 33e652881c Merge branch 'master' into pledged_badges 2012-10-01 15:38:52 -04:00
eric 5fe7e63508 not sure why it also worked without this 2012-10-01 09:48:57 -04:00
Andromeda Yelton 753ca046a0 Merge branch 'pledged_badges' of github.com:Gluejar/regluit into pledged_badges 2012-10-01 09:35:19 -04:00
eric b07afdc97d fixing bug: successful campaigns were relaunchable. 2012-09-28 17:44:08 -04:00
eshellman 8cb4586f78 Merge pull request #20 from Gluejar/relaunch 
Relaunch
 2012-09-28 07:55:07 -07:00
Raymond Yee 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
eshellman 45318c4e81 stop using id as variable name 2012-09-25 17:26:45 -03:00
eric 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
eric ccc082545a [#32289887] add worldcat learn more... 
test it on /work/82838/
 2012-09-24 15:36:39 -04:00
eric 4b49b1df4b display badges on user profiles [#29340547] 2012-09-22 23:55:07 -04:00
eshellman 376dbdac37 Update core/models.py 
added comment to Campaign.clone method
 2012-09-22 13:00:17 -03:00
eric b6862cad3d fix copying the premiums [#36192903] 2012-09-21 13:54:59 -04:00
eric 40a5b09359 rh_tools now shows campaign totals by campaign [#16581715] 2012-09-21 12:32:32 -04:00
eric 5d7e6a39bd managers can clone UNSUCCESSFUL Campaigns, and can only manage INITIALIZED and ACTIVE ones. [#36192903][#30068227] 2012-09-21 12:10:13 -04:00
Raymond Yee da2f1e0665 Merge branch 'master' into relaunch 2012-09-14 17:05:29 -07:00
Raymond Yee 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
eric 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
Raymond Yee deee2ab75a Merge branch 'master' into relaunch 
Conflicts:
	core/signals.py
	frontend/views.py
 2012-09-10 14:25:43 -07:00
Andromeda Yelton 7398fdf161 unglued property should adhere to editions, not ebooks 2012-09-10 15:18:40 -04:00
eric de9da54206 sorting the premiums turned out to be easy 2012-09-07 17:56:58 -04:00
eric 6f63c047ce DRY pub year code moved to work model 2012-09-07 16:07:47 -04:00
eric 0c9d71e4d6 introduce PledgeExtra data object to simplify method calls 2012-09-07 09:46:38 -04:00
eric eb185438b4 methods currently marked as classmethods are really staticmethods 2012-09-07 01:04:18 -04:00
Andromeda Yelton f2e9559a3a beginning of a notification to RHs when someone wishlists their work 2012-08-31 13:47:01 -04:00
Andromeda Yelton adef29f536 Merge branch 'relaunch' of github.com:Gluejar/regluit into relaunch 
Conflicts:
	core/signals.py
 2012-08-16 17:11:12 -04:00
Andromeda Yelton 291a2f5d67 need to know which ebook is the unglued one. migration needed 2012-08-15 09:39:58 -04:00
eric 10560fb36b merge credit into relaunch 2012-08-14 21:15:31 -04:00
eric c36e49e42d set up badges back end [#29340547] 2012-08-06 22:34:20 -04:00
Andromeda Yelton da0f4970c2 improving data flow of acks throughout system 2012-08-06 15:44:43 -04:00
Andromeda Yelton 8db1e5b59a set up acks page to deal with ack_name, _link, _dedication and anonymity bit 2012-08-06 13:35:29 -04:00
eric e8bd5ab2dc added ckeditor to manage campaign forms to provide rich text editing and image uploads [#32447975] 2012-07-27 14:23:44 -04:00
Raymond Yee 94384fcb59 Work in progress 2012-07-11 19:51:36 -07:00
Raymond Yee c8f0143630 Merge branch 'master' into ola_fulfill 2012-07-09 14:04:21 -07:00
Raymond Yee d869431b43 a first pass at getting a model for getting premium feedback for the OLA campaign 2012-07-09 09:28:50 -07:00
eric e2962e1075 [finish #30516251] supporter acknowledgement page basic version 2012-07-07 18:13:05 -04:00
eric 21e3cb582d fix tabs 2012-07-07 18:12:54 -04:00
eric 1764cd62d6 small optimization of supporter count 2012-07-07 16:38:23 -04:00
Andromeda Yelton 85247c306e Merge branch 'master' of github.com:Gluejar/regluit 
Conflicts:
	core/models.py
 2012-07-05 10:21:08 -04:00
Andromeda Yelton 0329976165 send signal for unsuccessful campaign notifications 2012-07-05 10:04:27 -04:00
Raymond Yee 5b733d214c setting up to automate daily campaign status update 2012-06-29 18:05:14 -07:00
Andromeda Yelton 8fbc65a305 merge 2012-06-28 14:31:48 -07:00
Andromeda Yelton de929363e5 we are going to need an unsuccessful campaign signal asap, sadly 2012-06-28 14:07:33 -07:00