Raymond Yee
|
78791a454f
|
Merge branch 'master' of github.com:Gluejar/regluit into ry
|
2012-05-14 06:32:15 -07:00 |
eric
|
443c4b5d42
|
[finish #27015121] give focus to pledge amount box, select premium doesn't reduce pledge
|
2012-05-14 09:01:03 -04:00 |
|
Raymond Yee
|
ef0ea5569a
|
Merge branch 'master' of github.com:Gluejar/regluit
|
2012-05-13 23:12:16 -07:00 |
|
Raymond Yee
|
c500b8dbaa
|
TURN ON FPS PAYMENT -- let's see what happens
|
2012-05-13 23:11:47 -07:00 |
|
eric
|
6bb564aca6
|
[finish #28851641]campaign managers now have access to edition creation and editing for works they manage
|
2012-05-14 01:07:02 -04:00 |
|
eric
|
08290c0128
|
[#28736373] fixed problem with not being able to select no edition
|
2012-05-14 01:05:14 -04:00 |
|
eric
|
4d1a1aba35
|
fixed missing inputs for manage campaign form [fix #29179771] which prevented active campaigns from saving edits
|
2012-05-14 00:56:32 -04:00 |
|
Raymond Yee
|
5ccf1fe0d1
|
Merge branch 'master' of github.com:Gluejar/regluit into ry
|
2012-05-13 21:43:36 -07:00 |
|
eric
|
3c98e65217
|
whoops. So used to django knowing what I meant...
|
2012-05-13 23:11:06 -04:00 |
|
eric
|
ea9ac7508e
|
repaired the invocation ot I_just_pledged emailshare [#27785469]
|
2012-05-13 22:59:07 -04:00 |
|
eric
|
296b5b5b20
|
countdown broke preview
|
2012-05-13 22:13:45 -04:00 |
|
Raymond Yee
|
4889e349ce
|
Merge branch 'master' of github.com:Gluejar/regluit into ry
|
2012-05-13 14:14:30 -07:00 |
|
Raymond Yee
|
66f08eab10
|
Merge branch 'master' of github.com:Gluejar/regluit
|
2012-05-13 13:55:08 -07:00 |
Andromeda Yelton
|
1270907295
|
merge these changes to master when the real money bit is flipped
|
2012-05-13 16:50:33 -04:00 |
|
Raymond Yee
|
1cc95ab45c
|
Merge branch 'master' of github.com:Gluejar/regluit into ry
|
2012-05-13 13:48:59 -07:00 |
|
Andromeda Yelton
|
f1a7d68f8a
|
Merge branch 'master' of github.com:Gluejar/regluit
|
2012-05-13 16:47:10 -04:00 |
|
Andromeda Yelton
|
fc14bda80e
|
y u wanna track clerybeat.pid
|
2012-05-13 16:46:25 -04:00 |
|
Andromeda Yelton
|
48b05f6fba
|
making our orange a variable so having to look it up stops annoying me
|
2012-05-13 16:46:03 -04:00 |
|
eric
|
d9a96c2ada
|
putting from email in reply-to: header [#29498563]
|
2012-05-13 16:38:58 -04:00 |
|
eric
|
cc097b0aa3
|
more fixing extends directive
|
2012-05-13 16:38:06 -04:00 |
|
Raymond Yee
|
9badabb53b
|
Merge branch 'master' of github.com:Gluejar/regluit into ry
|
2012-05-13 13:33:53 -07:00 |
|
Raymond Yee
|
89c4fa451f
|
extends directive needs to be the first line in Django template
|
2012-05-13 13:32:34 -07:00 |
|
Andromeda Yelton
|
100dc9d9b6
|
spurious <br>s
|
2012-05-13 16:06:48 -04:00 |
|
eric
|
9ed4186124
|
Merge branch 'master' of https://github.com/Gluejar/regluit
|
2012-05-13 15:37:28 -04:00 |
|
eric
|
aad5593c1d
|
resolve conflicts
|
2012-05-13 15:37:20 -04:00 |
|
Andromeda Yelton
|
193e4ef324
|
methods are not properties, whoops
|
2012-05-13 15:33:54 -04:00 |
|
Raymond Yee
|
4a9b9b1f31
|
Merge branch 'master' of github.com:Gluejar/regluit into ry
|
2012-05-13 12:33:20 -07:00 |
|
Andromeda Yelton
|
c38a3a320f
|
fixing some URLs
|
2012-05-13 15:33:19 -04:00 |
|
eric
|
0cdac29c22
|
apply intcomma to currency display everywhere and add humanize
|
2012-05-13 15:32:32 -04:00 |
|
Andromeda Yelton
|
9a6ea26266
|
check to see if people have pledged and if so direct them to pledge_modify from sidebar rather than spawning new pledge
|
2012-05-13 15:23:04 -04:00 |
|
Andromeda Yelton
|
ea5664b08c
|
that ampersand should not be URLencoded since it's actually a parameter
|
2012-05-13 15:22:38 -04:00 |
|
Raymond Yee
|
a54aa1a342
|
First pass -- pledge view will redirect to pledge modify view if there is already an active transaction
|
2012-05-13 12:18:48 -07:00 |
|
Andromeda Yelton
|
d2cf8a773b
|
improvifying pledge front end around modify and cancel
|
2012-05-13 10:49:23 -04:00 |
|
Andromeda Yelton
|
ae76f89034
|
fixing problems with context for you_have_pledged notification
|
2012-05-12 22:42:09 -04:00 |
|
Andromeda Yelton
|
737c90a62a
|
Merge branch 'master' of github.com:Gluejar/regluit
|
2012-05-12 21:53:54 -04:00 |
|
Andromeda Yelton
|
e6467e4e85
|
even moar wordsmithing of notifications
|
2012-05-12 21:49:31 -04:00 |
|
Andromeda Yelton
|
33f7c99a5b
|
added a campaign.rightsholder property to make it not annoying to put rh names into templates
|
2012-05-12 21:49:18 -04:00 |
|
Raymond Yee
|
1c9fe4ff8f
|
Merge branch 'ry'
|
2012-05-12 18:47:27 -07:00 |
|
Andromeda Yelton
|
6fe7aeeabb
|
even more notification wordsmithing
|
2012-05-12 21:28:27 -04:00 |
|
Raymond Yee
|
7387350427
|
the fingerprint of the rsa key for a host is in /etc/ssh
|
2012-05-12 18:23:09 -07:00 |
|
Andromeda Yelton
|
54e1e3e98b
|
merge all the things
|
2012-05-12 12:25:17 -04:00 |
|
Andromeda Yelton
|
83730badbb
|
more wordsmithing
|
2012-05-12 11:58:33 -04:00 |
|
Raymond Yee
|
2dee8c3895
|
Merge branch 'master' of github.com:Gluejar/regluit
|
2012-05-12 08:28:58 -07:00 |
|
Raymond Yee
|
5cf4c17c33
|
Put in the right BASE_URL for production
|
2012-05-12 08:28:17 -07:00 |
|
eric
|
77a66e5420
|
[#29498563] fixed urls by moving email share messages to django templates; eliminated sender from form
|
2012-05-12 11:12:43 -04:00 |
|
Raymond Yee
|
43162c0406
|
On second thoughts, let's just try the sandbox first on unglue.it, then clear the transactions and the turn on the real money....
|
2012-05-12 08:10:31 -07:00 |
|
Raymond Yee
|
50d6998a92
|
TURNING THE REAL AMAZON PAYMENT SYSTEM ON!!!
|
2012-05-12 08:06:51 -07:00 |
|
Raymond Yee
|
9378f91777
|
Merge branch 'master' of github.com:Gluejar/regluit into ry
|
2012-05-12 07:37:26 -07:00 |
|
eric
|
76b8b9f33d
|
[#29488053] no use linking to google books if no google books id
|
2012-05-11 22:46:41 -04:00 |
|
eric
|
a30976373f
|
better default cover for works with no google id [#29488053]
|
2012-05-11 22:46:03 -04:00 |