Andromeda Yelton
|
26061cd240
|
hey the reason I wasn't getting the layout I expected was that I'm an idiot. sweet\!
|
2012-05-14 21:09:29 -04:00 |
|
Andromeda Yelton
|
fe9ee13ae1
|
adding eric's ccc podcast
|
2012-05-14 20:53:05 -04:00 |
|
Andromeda Yelton
|
4fec8438a6
|
communicating a little more clearly
|
2012-05-14 20:44:27 -04:00 |
|
Andromeda Yelton
|
ff5e0b76a9
|
Merge branch 'master' of github.com:Gluejar/regluit
|
2012-05-14 20:38:28 -04:00 |
|
Andromeda Yelton
|
2617deb636
|
standardized font size of error message (which triggered recompilation of css files depending on variables.less)
|
2012-05-14 20:37:57 -04:00 |
|
Andromeda Yelton
|
50d9fcc6d6
|
filling box with number, not string
|
2012-05-14 20:37:29 -04:00 |
|
thatandromeda
|
0e59ee746b
|
Update frontend/views.py
|
2012-05-14 18:23:13 -03:00 |
|
Andromeda Yelton
|
6d14ba1c30
|
only really need to set context for site once, not separately for view and triggered notification
|
2012-05-14 16:56:36 -04:00 |
|
Andromeda Yelton
|
33bfb73a25
|
the sharing options in the you_have_pledged notice.html should be real live links
|
2012-05-14 16:53:53 -04:00 |
|
Andromeda Yelton
|
407c8ed376
|
Merge branch 'master' of github.com:Gluejar/regluit
|
2012-05-14 16:41:13 -04:00 |
|
Andromeda Yelton
|
54e9f8ad17
|
changed from click to on syntax in hopes of addressing possible IE9 event handling weirdness
|
2012-05-14 16:27:48 -04:00 |
eric
|
e42ecfbec5
|
html cleanup on pledge page
|
2012-05-14 15:56:19 -04:00 |
|
eric
|
98aca7b474
|
Attorney review done [finish #29281959]
|
2012-05-14 15:43:22 -04:00 |
Raymond Yee
|
58fbc843a9
|
Merging Jason's code in -- first and hopefully successful pass
Conflicts:
payment/manager.py
|
2012-05-14 11:52:01 -07:00 |
|
eric
|
6451e1adba
|
Do number comparison, not string comparison, on pledge amounts
|
2012-05-14 14:05:40 -04:00 |
|
Andromeda Yelton
|
3fe2800dfa
|
Merge branch 'master' of github.com:Gluejar/regluit
|
2012-05-14 13:51:06 -04:00 |
|
Andromeda Yelton
|
1c5d517d93
|
setting clearer expectations about communication in response to user feedback
|
2012-05-14 13:50:55 -04:00 |
|
Andromeda Yelton
|
2b9b4a7331
|
share links in pledge_complete need to include url base
|
2012-05-14 13:42:34 -04:00 |
|
Raymond Yee
|
cd9bdf70b5
|
Merge branch 'master' of github.com:Gluejar/regluit into ry
|
2012-05-14 10:16:26 -07:00 |
|
Raymond Yee
|
b07d6c267d
|
Customize paymentReason for amazon -- in Paypal, we don't have it wired up anywhere yet
|
2012-05-14 10:15:40 -07:00 |
Raymond Yee
|
32250157e3
|
Merge branch 'real_money' of github.com:Gluejar/regluit
|
2012-05-14 15:41:55 +00:00 |
|
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 |