eric
|
33e652881c
|
Merge branch 'master' into pledged_badges
|
2012-10-01 15:38:52 -04:00 |
eric
|
99c228323e
|
fix double toggle when clicking on star
|
2012-10-01 15:24:11 -04:00 |
eric
|
bf212ed165
|
prettier stars matching site colors
|
2012-10-01 15:10:45 -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 |
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 |
Andromeda Yelton
|
2e23ddfd54
|
with format icons now in download page link counts are different
|
2012-09-25 11:10:23 -04:00 |
Andromeda Yelton
|
b03decfb00
|
wrap ebook link separately around each icon so underline doesn't show up in spaces onhover
|
2012-09-25 11:09:33 -04:00 |
Andromeda Yelton
|
0f546f50a3
|
invoke target script directly rather than invoking script that (inconsistently) invokes it
|
2012-09-25 10:54:31 -04:00 |
Andromeda Yelton
|
0989319430
|
inline script wasn't actually doing anything
|
2012-09-25 10:53:54 -04:00 |
Andromeda Yelton
|
38d115e5a1
|
no longer need readmill script since we're pulling send script directly
|
2012-09-25 10:53:23 -04: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 |
Raymond Yee
|
30f1cad6f1
|
A revised requirements_versioned.pip for relaunch
|
2012-09-24 12:46:52 -07:00 |
eric
|
ccc082545a
|
[#32289887] add worldcat learn more...
test it on /work/82838/
|
2012-09-24 15:36:39 -04:00 |
Andromeda Yelton
|
d84c1ef617
|
Merge branch 'relaunch' of github.com:Gluejar/regluit into relaunch
|
2012-09-24 14:21:33 -04:00 |
Raymond Yee
|
de4092d23d
|
Merge pull request #14 from Gluejar/nonprofit_switch
Nonprofit switch [deliver #36476831]
|
2012-09-24 09:50:22 -07:00 |
Raymond Yee
|
a91a70e6ef
|
Merge pull request #12 from Gluejar/master
merge all the mester into relaunch
|
2012-09-24 09:07:44 -07:00 |
thatandromeda
|
44ed8fdfcf
|
stop referring to acknowledgements as rewards to avoid confusing people
|
2012-09-24 11:52:30 -03:00 |
eric
|
4b49b1df4b
|
display badges on user profiles [#29340547]
|
2012-09-22 23:55:07 -04:00 |