Raymond Yee
|
27d0a808e0
|
get rid of more paypal references
|
2012-10-02 10:16:34 -07:00 |
Andromeda Yelton
|
0ec9789e56
|
merging in relaunch_ry in hopes that stripe wil work
|
2012-10-02 10:25:43 -04:00 |
|
Andromeda Yelton
|
4cf4787a95
|
don't display username
|
2012-10-02 09:32:33 -04:00 |
|
Andromeda Yelton
|
2c2ce2a34f
|
suppress display of any amount premium if it's the only premium
|
2012-10-02 09:29:18 -04:00 |
|
Andromeda Yelton
|
2371aad994
|
update FAQ to reflect new payment system
|
2012-10-02 09:18:44 -04:00 |
|
Andromeda Yelton
|
a9d9cde55a
|
grammar
|
2012-10-02 07:55:11 -04:00 |
eric
|
3abd95d482
|
Revert "made some changes to reduce the likelihood of circular import dependencies in stripe code."
This reverts commit 166afece62.
|
2012-10-01 20:05:35 -04:00 |
|
Raymond Yee
|
166afece62
|
made some changes to reduce the likelihood of circular import dependencies in stripe code.
Made sure there is a core_key table in campaidgn_starter sql
|
2012-10-01 16:38:51 -07:00 |
|
eric
|
759e39f61d
|
wired badge awarding into pledge modified and pledge complete signals
|
2012-10-01 18:28:26 -04:00 |
|
Andromeda Yelton
|
d54f45d511
|
further aesthetic refinements
|
2012-10-01 15:53:41 -04:00 |
|
eric
|
33e652881c
|
Merge branch 'master' into pledged_badges
|
2012-10-01 15:38:52 -04:00 |
|
Andromeda Yelton
|
6a6045e9ab
|
first pass at prettifying stripe process
|
2012-10-01 15:31:17 -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 |
|
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 |
|
Andromeda Yelton
|
fd845d627b
|
is unglued is not grammatical here
|
2012-10-01 09:47:32 -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 |
|
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 |
|
Raymond Yee
|
0f91fddea5
|
Make requirements_relaunch.pip available on production branch to make it easy to do migration to Django 1.4
|
2012-09-29 11:30:02 -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
|
8952886171
|
Merge branch 'master' into relaunch_ry
|
2012-09-27 20:15:57 -07:00 |
Raymond Yee
|
100ec44c0a
|
Adjust library versions -- still experimenting
|
2012-09-28 03:14:40 +00:00 |
|
Raymond Yee
|
62e89f469f
|
Adjusting library versions
seems like lxml 3.0alpha2 gone -> back to 2.3.5
|
2012-09-27 20:12:40 -07: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
|
d72df702aa
|
Merge branch 'master' into relaunch_ry
|
2012-09-27 15:01:20 -07:00 |
|
Raymond Yee
|
fe5df0fab8
|
Merge branch 'relaunch' into relaunch_ry
|
2012-09-27 14:39:50 -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
|
859f62a3d7
|
Merge branch 'automanage_db_changes' into relaunch_ry
|
2012-09-27 14:17:30 -07:00 |
|
Raymond Yee
|
3b04ddb4a9
|
Merge branch 'relaunch' into relaunch_ry
|
2012-09-27 14:07:47 -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 |