eric
a9851314fa
Merge branch 'master' of https://github.com/Gluejar/regluit
2012-05-21 18:43:06 -04:00
eric
5f2ed14ff3
[ fix #29962925 ] Turns out you can't pledge without an amazon account
2012-05-21 18:42:56 -04:00
Raymond Yee
58fc82995c
a small type on the API help page
2012-05-21 14:47:11 -07:00
Raymond Yee
f0e6dd0555
Working around an element-not-visible error in Sn test
2012-05-21 14:21:04 -07:00
Raymond Yee
dd8b892a42
Merge branch 'master' of github.com:Gluejar/regluit into master_cancel
2012-05-21 13:57:59 -07:00
Andromeda Yelton
b5c2f743a6
need to move some styling to sitewide.css since the About section now means it may display anywhere on the site
2012-05-21 16:02:16 -04:00
Andromeda Yelton
f01c83f1b8
adding call to action for logged-in users [ #29777801 ]
2012-05-21 16:01:20 -04:00
Andromeda Yelton
2bcb4cfb00
made header more opaque and cursors less inviting when a lightbox is up, to discourage people from opening the other one on top of it
2012-05-21 15:49:24 -04:00
Andromeda Yelton
1cf9f4058d
fixing [ #29941831 ]
2012-05-21 14:06:48 -04:00
Andromeda Yelton
32a7699eb5
addressing some actual questions seen around the interwebs
2012-05-21 13:39:19 -04:00
Raymond Yee
c75148dc74
Merge branch 'master' of github.com:Gluejar/regluit into cancel_pledge
2012-05-21 09:55:56 -07:00
Andromeda Yelton
1a53d8b86d
that div was ugly and contentless
2012-05-21 12:19:50 -04:00
Andromeda Yelton
120e503222
should fade everything in background, including launch_top
2012-05-21 12:09:45 -04:00
Andromeda Yelton
efe7e41be4
got some feedbackfrom target audience types
2012-05-21 12:09:12 -04:00
Raymond Yee
2f232c29fd
Merge branch 'master' of github.com:Gluejar/regluit into cancel_pledge
2012-05-21 08:54:05 -07:00
Andromeda Yelton
66616f9f90
well that had been precisely the opposite if condition than I intended
2012-05-21 11:18:30 -04:00
Andromeda Yelton
7f730e53ef
restoring a bit of language with license choice flexibility
2012-05-21 11:17:44 -04:00
Andromeda Yelton
decdbef3a4
Merge branch 'launch' of github.com:Gluejar/regluit
...
Conflicts:
frontend/templates/faq.html
frontend/templates/press.html
2012-05-21 11:10:25 -04:00
Raymond Yee
b8336c4ed6
En route to implementing pledge cancellation
2012-05-21 07:56:18 -07:00
Andromeda Yelton
1b677087e2
add HuffPo article
2012-05-21 10:50:03 -04:00
Andromeda Yelton
690bd76357
Merge branch 'master' of github.com:Gluejar/regluit
...
Conflicts:
frontend/templates/press.html
2012-05-21 10:38:08 -04:00
Andromeda Yelton
b85d034030
we need an About link
2012-05-21 10:03:56 -04:00
Andromeda Yelton
42aaa90245
moar launch coverage
2012-05-21 10:03:45 -04:00
Andromeda Yelton
f32de7e935
added named url for sub-FAQs to improve linkability
2012-05-21 10:03:29 -04:00
Andromeda Yelton
61dd4124af
suppres percent-of-goal display when no campaign
2012-05-21 10:02:57 -04:00
eric
04d8c80cff
correct license test with correction from AY [ #29884981 ]
2012-05-21 09:25:38 -04:00
eric
22933b4ff5
Corrected api documentation error; added test for identifier api [finish #29892487 ]
2012-05-20 13:35:06 -04:00
eric
e61a818ad3
[finish #29885177 ] redirect user after login instead of just displaying link
2012-05-20 00:55:41 -04:00
eric
3de07e973f
[finish #29780503 ] add link to CC licence to rights tab of campaign page
2012-05-20 00:22:12 -04:00
eric
bd5b062d24
change manage_campaign to allow active campaigns to remove license restrictions [ #29884981 ]
2012-05-20 00:13:12 -04:00
eric
c61bc9985d
test for factored license url [ #29884981 ]
2012-05-20 00:12:16 -04:00
eric
f72796acdf
factor license URL and badge into one class [ #29884981 ]
2012-05-20 00:10:56 -04:00
eric
62c1d80547
changed wording to be more open to non NC licenses [ #29884981 ]
2012-05-20 00:08:04 -04:00
eric
61ec9db6a2
tab->spaces
2012-05-20 00:06:04 -04:00
Raymond Yee
272d795ded
Renaming the current functionality that has been named "cancel" to be "nevermind" because that functionality arose to support users changing their mind
...
The new PledgeCancel is a placeholder for the functionality I will build next to let users actually cancel existing transactions
Finally, I use the setting.PAYMENT_PROCESSOR to set the default value of Transaction.host ('paypal' or 'amazon')
2012-05-18 16:59:48 -07:00
Raymond Yee
93aa8d54f2
The selenium test is now working again
2012-05-18 15:06:35 -07:00
Andromeda Yelton
e64e3722ea
added guidance to deal with the username/email prefill bug, let's see if it helps
2012-05-18 13:47:12 -04:00
Andromeda Yelton
a5df3b608a
fixing broken link
2012-05-18 11:35:08 -04:00
Andromeda Yelton
9cac73f036
Merge branch 'master' of github.com:Gluejar/regluit
2012-05-18 11:29:51 -04:00
Andromeda Yelton
bfc958fd06
updating with launch coverage
2012-05-18 11:29:37 -04:00
Andromeda Yelton
333de6ce6b
mildly humiliating grammar mistake
2012-05-18 11:28:58 -04:00
Raymond Yee
0d5392aeae
Merge branch 'ry'
2012-05-17 14:05:33 -07:00
Raymond Yee
b532a13bd0
Putting in MAINTENANCE_MODE for various local configurations
2012-05-17 13:56:44 -07:00
Raymond Yee
cbb7045ad9
Another set of URLs for DEBUG only
2012-05-17 13:55:02 -07:00
Raymond Yee
1ca930440c
certain test views that should be on only if DEBUG = True
2012-05-17 13:54:09 -07:00
Raymond Yee
04ec596dc1
pieces of django-maintenance
2012-05-17 13:28:48 -07:00
Andromeda Yelton
085b67fb93
making sure not to run into int/float mismatch problems, and also it's ok if the percent goes over 100
2012-05-17 14:51:53 -04:00
Andromeda Yelton
d94b23e2fe
wow so calculating percents totally works better when you multiply by one hundred huh
2012-05-17 14:47:32 -04:00
Raymond Yee
b233c5f03a
Undo the work I started with to finish pledge_cancel.
2012-05-17 10:52:12 -07:00
Raymond Yee
ac44911fa7
Merge branch 'master' of github.com:Gluejar/regluit into ry
2012-05-17 10:48:04 -07:00