eric
|
4700e63b06
|
resolve conflict
|
2012-09-07 16:26:09 -04:00 |
|
eric
|
18608d3e7d
|
preapproval amount is now amount for requested premium, not previously pledged amount
|
2012-09-07 16:13:53 -04:00 |
|
eric
|
a361d7b53d
|
so we didn't really need to put premium description directly into context
|
2012-09-07 16:12:32 -04:00 |
Raymond Yee
|
1742572d95
|
Merge branch 'master' into relaunch
Conflicts:
frontend/views.py
|
2012-09-07 13:08:03 -07:00 |
|
eric
|
6f63c047ce
|
DRY pub year code moved to work model
|
2012-09-07 16:07:47 -04:00 |
|
eric
|
c2636f5bba
|
removed legacy DonateView
|
2012-09-07 01:11:28 -04:00 |
|
eric
|
4d4e61d338
|
donation modification now works [#21784207]
|
2012-09-06 16:55:32 -04:00 |
|
eric
|
bd794a2ac5
|
clean up the donation endpoint pages so they work (if a bit ugly!)
|
2012-09-06 14:04:47 -04:00 |
|
eric
|
9395cd058b
|
now donating cents works, too
|
2012-09-06 11:36:13 -04:00 |
|
eric
|
8eeadc99d3
|
woo hoo, credit and donation scaffolding works end to end [#21784207]
|
2012-09-06 01:01:17 -04:00 |
|
eric
|
94270f33c6
|
add in credi processing; overhaul the PledgeView forms and partition authorize fn in Manager
also removed unused target, lists, ack-link,
|
2012-08-31 03:16:04 -04:00 |
|
eric
|
f299d9ecf7
|
rip out paypal and amazon code
|
2012-08-31 03:12:15 -04:00 |
Andromeda Yelton
|
863bfe5856
|
/about/ pages need appropriate styling and should not conflict if user clicks on About in header
|
2012-08-28 13:47:29 -04:00 |
|
Andromeda Yelton
|
13171f6472
|
making sure the styling works no matter where download link is clicked from
|
2012-08-28 10:22:47 -04:00 |
|
Andromeda Yelton
|
07c529a715
|
read it now should link to download page
|
2012-08-28 10:22:30 -04:00 |
|
Andromeda Yelton
|
24abca09b7
|
revising download instructions per feedback from testers
|
2012-08-28 10:08:06 -04:00 |
|
Andromeda Yelton
|
eb5eb17d83
|
was driving me crazy that that went to preview rather than campaign itself for active campaigns
|
2012-08-27 16:40:40 -04:00 |
|
Andromeda Yelton
|
48e20a7cdd
|
bringing all the lightboxes under the hijax.js system
|
2012-08-27 15:35:29 -04:00 |
|
Andromeda Yelton
|
307e0d41c7
|
completed first draft of download instructions
|
2012-08-27 14:13:50 -04:00 |
|
Andromeda Yelton
|
cc70ff1765
|
adding download instructions
|
2012-08-24 18:48:28 -04:00 |
|
Andromeda Yelton
|
a6e034a36a
|
rudimentary download page plus logic to serve it
|
2012-08-24 15:14:32 -04:00 |
|
eric
|
9c602cf530
|
typo
|
2012-08-23 18:24:52 -04:00 |
|
Andromeda Yelton
|
4fe0c3ff05
|
Merge branch 'master' of github.com:Gluejar/regluit
|
2012-08-23 14:10:11 -04:00 |
|
Andromeda Yelton
|
aa3667d260
|
working on download page
|
2012-08-23 13:38:48 -04:00 |
|
eric
|
599d333e34
|
typo
|
2012-08-22 14:38:49 -04:00 |
|
Andromeda Yelton
|
adef29f536
|
Merge branch 'relaunch' of github.com:Gluejar/regluit into relaunch
Conflicts:
core/signals.py
|
2012-08-16 17:11:12 -04:00 |
|
Andromeda Yelton
|
368a3ca8ec
|
making license display more standards-compliant
|
2012-08-15 10:05:10 -04:00 |
|
Andromeda Yelton
|
28670ed01a
|
building LOCKSS manifest page
|
2012-08-15 09:40:37 -04:00 |
|
eric
|
10560fb36b
|
merge credit into relaunch
|
2012-08-14 21:15:31 -04:00 |
|
Andromeda Yelton
|
6d6c324a82
|
tweaking
|
2012-08-14 15:03:33 -04:00 |
|
Andromeda Yelton
|
e2957abf25
|
tweaking
|
2012-08-14 14:53:48 -04:00 |
|
Andromeda Yelton
|
07f1177c08
|
we kinda got a lot of press coverage following the amazon shutdown
|
2012-08-14 10:11:31 -04:00 |
|
eric
|
403420a283
|
Add user-to-user credit transfers [#21784207]
|
2012-08-13 21:00:28 -04:00 |
|
eric
|
e928a2dfa1
|
edit alert, make the box red again
|
2012-08-09 06:28:42 -04:00 |
|
thatandromeda
|
e902c3c704
|
announcement at top of site edited to reflect Amazon situation
|
2012-08-08 16:11:52 -03:00 |
|
Andromeda Yelton
|
8ef30302d4
|
notice templates for campaign shutoffs due to amazon payment suspension
|
2012-08-08 14:19:04 -04:00 |
|
eric
|
0d13fe9ba4
|
2 more minus_amount s [#21784207]
|
2012-08-07 16:18:03 -04:00 |
|
eric
|
5362c202bb
|
added management command to create credits, balance notification [#21784207]
|
2012-08-07 14:12:50 -04:00 |
|
Andromeda Yelton
|
da0f4970c2
|
improving data flow of acks throughout system
|
2012-08-06 15:44:43 -04:00 |
|
Andromeda Yelton
|
8db1e5b59a
|
set up acks page to deal with ack_name, _link, _dedication and anonymity bit
|
2012-08-06 13:35:29 -04:00 |
|
Andromeda Yelton
|
270a686049
|
Merge branch 'master' of github.com:Gluejar/regluit into mandatory_premiums
Conflicts:
static/css/lists.css
|
2012-08-06 09:37:09 -04:00 |
|
Andromeda Yelton
|
2b16fc06a8
|
clarifying where the acks will happen
|
2012-08-01 12:08:52 -04:00 |
|
Andromeda Yelton
|
f6f624fe87
|
addressing some questions we actually get about Amazon and Paypal and making sure answers on page are correct
|
2012-08-01 09:19:09 -04:00 |
|
Andromeda Yelton
|
b041430731
|
front end for new pledge page, plus just enough back end that it displays
|
2012-08-01 08:52:39 -04:00 |
|
eric
|
e8bd5ab2dc
|
added ckeditor to manage campaign forms to provide rich text editing and image uploads [#32447975]
|
2012-07-27 14:23:44 -04:00 |
|
eric
|
d478836e0e
|
use profile.home_url in acks page where it's been set [#32366341]
|
2012-07-26 12:07:16 -04:00 |
|
thatandromeda
|
29fd89011c
|
removing reference to "donate"
|
2012-07-25 11:51:05 -03:00 |
|
Raymond Yee
|
7f6b1fd684
|
refining script to produce data for OLA
add user profile tagline to acks
|
2012-07-25 07:15:51 -07:00 |
|
thatandromeda
|
b691c8f896
|
Update frontend/templates/notification/notice_template.html
|
2012-07-24 14:52:39 -03:00 |
|
eric
|
0d8604e1bd
|
to be safe, removed the word "donation" from website
|
2012-07-24 10:45:49 -04:00 |