Commit Graph

2747 Commits (665fef90580f5546b6a37bdf1c34898418a906cd)

Author SHA1 Message Date
Raymond Yee 665fef9058 Merge branch 'master' of github.com:Gluejar/regluit 2012-10-02 14:07:17 -07:00
Raymond Yee 5b41103005 Merge pull request #31 from Gluejar/update_manage_campaign
Update manage campaign
2012-10-02 13:33:57 -07:00
Raymond Yee 68615b3b3d Merge branch 'update_manage_campaign' 2012-10-02 13:08:55 -07:00
Andromeda Yelton 1dad4342c9 remove acknowledgements from premium display 2012-10-02 14:42:39 -04:00
thatandromeda 75f2ad0b46 Merge pull request #28 from Gluejar/campaign_relaunch
fixing bug: successful campaigns were relaunchable.
2012-10-02 10:48:41 -07:00
Raymond Yee 2eb4ac3e56 Add TEST_COLLATION of utf8_bin to just 2012-10-01 17:05:03 +00:00
eric 5fe7e63508 not sure why it also worked without this 2012-10-01 09:48:57 -04:00
thatandromeda 38b2567a02 Merge pull request #27 from Gluejar/deannoyify_email_notices
[finish #31209035] removes first line from the email notices
2012-10-01 06:28:57 -07:00
thatandromeda 0955dc0f78 Merge pull request #29 from Gluejar/trivial_edits
Trivial edits
2012-10-01 06:16:46 -07:00
Andromeda Yelton 6117b8475f minor style edits 2012-10-01 09:15:38 -04:00
Andromeda Yelton abea3a67de updating handling of premiums and anonymity 2012-10-01 09:12:40 -04:00
eric 4a15cc5ce7 added documentation for mysql path, removed hard encoding from goodreads#253 2012-09-30 18:05:15 -04:00
Raymond Yee 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
eshellman 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
eric b07afdc97d fixing bug: successful campaigns were relaunchable. 2012-09-28 17:44:08 -04:00
eric 51f8e90487 fixed markup syntax of faq 2012-09-28 17:16:25 -04:00
eric 94ed8fa8df removed unbalanced <span> 2012-09-28 17:09:21 -04:00
eric 87e2d0e0b4 fix OLA work number 29340547 2012-09-28 16:02:03 -04:00
eric f336730800 [finish #31209035] found where that extra line came from
This is why I got email leakage
2012-09-28 15:50:43 -04:00
Raymond Yee 9e048c44f5 Get rid of print statement 2012-09-28 10:12:25 -07:00
Raymond Yee 750c86c16e changing to lxml 2.3.5 since 3.0alpha2 was problematic -- could not find package now. 2012-09-28 09:15:40 -07:00
eric a53c0ac4f3 Merge branch 'master' of https://github.com/Gluejar/regluit 2012-09-28 10:59:04 -04:00
eshellman 8cb4586f78 Merge pull request #20 from Gluejar/relaunch
Relaunch
2012-09-28 07:55:07 -07:00
Andromeda Yelton 839a864149 Merge branch 'relaunch' of github.com:Gluejar/regluit into relaunch 2012-09-28 10:40:56 -04:00
Andromeda Yelton 079487783c incorporating AM's revisions to FAQ 2012-09-28 10:40:44 -04:00
Raymond Yee 100ec44c0a Adjust library versions -- still experimenting 2012-09-28 03:14:40 +00:00
Raymond Yee 81708661bb Adding a requirements_relaunch.pip to see whether I can test whether I can the current master branch to run with the environment tested for relaunch 2012-09-27 19:12:46 -07:00
Raymond Yee 7ee772a16d Merge pull request #22 from Gluejar/automanage_db_changes
now adding credit records in migration [start #36325665]
2012-09-27 14:38:56 -07:00
Raymond Yee 800dc128ab Merge branch 'campaign_relaunch' into relaunch
Conflicts:
	frontend/templates/manage_campaign.html
2012-09-27 14:04:00 -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
Andromeda Yelton a859771c5c Merge branch 'relaunch' of github.com:Gluejar/regluit into relaunch 2012-09-27 13:30:46 -04:00
Andromeda Yelton 81f45984e8 prevent campaign launch button from being visible to non-staff during preview 2012-09-27 13:11:19 -04:00
eric 880a9f14bd now adding credit records in migration [start #36325665]
that wasn't so hard
2012-09-27 12:58:47 -04:00
Andromeda Yelton 2b2bea8978 not using that any more 2012-09-27 12:40:30 -04:00
Andromeda Yelton 57df9c116e removing references to paypal and amazon 2012-09-27 12:35:23 -04:00
Andromeda Yelton d1941de032 Merge branch 'relaunch' of github.com:Gluejar/regluit into relaunch 2012-09-27 11:34:15 -04:00
thatandromeda 99d4a3dd1c need to be in preview mode until relaunch 2012-09-27 12:14:41 -03:00
thatandromeda a48f61793d only staff can launch campaigns during preview 2012-09-27 12:14:09 -03:00
eshellman 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
eric 14139d5c49 Merge branch 'relaunch' 2012-09-26 15:05:40 -04:00
eric 2260437cfc Merge branch 'relaunch' 2012-09-26 15:01:39 -04:00
Andromeda Yelton 9af9c09e5d more thoughtful handling of readmill url 2012-09-26 14:59:13 -04:00
eric b75bb0c3a6 now adding credit records in migration [start #36325665]
that wasn't so hard
2012-09-26 13:52:21 -04:00
thatandromeda 77abb2d048 Merge pull request #18 from Gluejar/add_oclc
Add worldcat links and oclcnum editing [#32289887]
2012-09-26 06:36:07 -07:00
eric e23d706469 Added tests for campaign.clone and Premiums 2012-09-25 16:43:25 -04:00
eshellman 45318c4e81 stop using id as variable name 2012-09-25 17:26:45 -03:00
thatandromeda d8d035988a Merge pull request #17 from Gluejar/requirements_versioned_fix
A revised requirements_versioned.pip for relaunch
2012-09-25 13:13:36 -07:00
thatandromeda f18b7e80cb anchor text shouldn't be confusing 2012-09-25 16:46:58 -03:00
Andromeda Yelton e62484f46a whoops wrong edition 2012-09-25 12:27:39 -04:00
Andromeda Yelton 278a36e2f2 unglued_epub_url should be looking only at unglued books, not all epubs 2012-09-25 11:42:20 -04:00