Andromeda Yelton
|
18a598f628
|
need to change lockss page since unglued adheres to editions
|
2012-09-12 10:11:49 -04:00 |
|
Andromeda Yelton
|
3733780ef3
|
Merge branch 'master' of github.com:Gluejar/regluit
|
2012-09-12 10:00:31 -04:00 |
|
Andromeda Yelton
|
d8316c76ec
|
user isn't in the context so we shouldn't reference it
|
2012-09-12 08:41:22 -04:00 |
eric
|
c457dec497
|
helpful ebook format notations
|
2012-09-12 00:20:09 -04:00 |
|
eric
|
64461cc49e
|
one letter typo was messing up unglued ebooks display
|
2012-09-12 00:09:29 -04:00 |
Raymond Yee
|
e6f94223f4
|
Merge branch 'master' into relaunch_ry
|
2012-09-11 15:55:58 -07:00 |
|
Raymond Yee
|
77ceed03ad
|
Now -- a checkbox for whether to retain CC info and functionality for creating Customer / charge vs charge directly
|
2012-09-11 15:53:39 -07:00 |
|
Raymond Yee
|
2ab1f8c7ea
|
Now creating a charge based on token
|
2012-09-11 15:17:37 -07:00 |
|
Raymond Yee
|
d4729bbac1
|
Merge branch 'master' into ola_announce
|
2012-09-11 11:29:49 -07:00 |
|
Andromeda Yelton
|
b383c9717d
|
hijax script should be in base so it works sitewide, and hijax class must be applied to download link to trigger
|
2012-09-11 14:14:57 -04:00 |
|
Andromeda Yelton
|
5fa34858df
|
download button overlapped with some titles
|
2012-09-11 14:12:00 -04:00 |
|
eric
|
dc94a207cc
|
[start #35862759] fixed bug in handle_wishlist_added
|
2012-09-11 14:06:46 -04:00 |
|
Andromeda Yelton
|
ba6c7165b3
|
OLA launch announcement
|
2012-09-11 14:03:33 -04:00 |
|
Andromeda Yelton
|
0773a10d16
|
streamlining
|
2012-09-11 13:57:00 -04:00 |
|
Raymond Yee
|
5636637266
|
Merge branch 'master' into relaunch_ry
Conflicts:
frontend/views.py
|
2012-09-11 10:42:49 -07:00 |
|
eric
|
5ddc050ff9
|
[finished #35857177] fixed missing user wishlist context for bookpanel on supporter page
bug introduced in
https://github.com/Gluejar/regluit/commit/fd44471aaecc08c30dd1688b060cd1
18174d910e
|
2012-09-11 13:41:53 -04:00 |
|
eric
|
2df3047dc0
|
display all editions for staff
|
2012-09-10 23:51:22 -04:00 |
|
eric
|
e5804a4d4d
|
please use spaces, not tabs to indent
|
2012-09-10 23:47:06 -04:00 |
|
Raymond Yee
|
c4494de34c
|
Merge branch 'relaunch_ry' into relaunch
|
2012-09-10 17:07:51 -07:00 |
|
Raymond Yee
|
a161b1f28b
|
integrating Credit card form in
|
2012-09-10 17:02:34 -07:00 |
|
Raymond Yee
|
35e399553f
|
restore CCForm
|
2012-09-10 16:47:36 -07:00 |
|
Raymond Yee
|
a2040dfe90
|
had to fix a conflict I missed in core/signals.py
|
2012-09-10 14:31:21 -07:00 |
|
Raymond Yee
|
7f344c0ca9
|
dealing with merge conflicts
|
2012-09-10 14:27:14 -07:00 |
|
Raymond Yee
|
deee2ab75a
|
Merge branch 'master' into relaunch
Conflicts:
core/signals.py
frontend/views.py
|
2012-09-10 14:25:43 -07:00 |
|
Raymond Yee
|
0e1839d531
|
Merge branch 'master' into relaunch_ry
Conflicts:
core/signals.py
frontend/views.py
|
2012-09-10 14:18:30 -07:00 |
|
Raymond Yee
|
bcceaa719b
|
integrating stripe into fund_the_pledge
|
2012-09-10 13:17:30 -07:00 |
|
Andromeda Yelton
|
7f6b149773
|
Merge branch 'master' of github.com:Gluejar/regluit
|
2012-09-10 15:23:25 -04:00 |
|
Andromeda Yelton
|
7398fdf161
|
unglued property should adhere to editions, not ebooks
|
2012-09-10 15:18:40 -04:00 |
|
Andromeda Yelton
|
3a0d09db33
|
edition-adding on rights tab was hard to read with multiple editions
|
2012-09-10 14:37:37 -04:00 |
|
Raymond Yee
|
e0bc5ee996
|
Merge branch 'master' into relaunch
|
2012-09-10 08:52:23 -07:00 |
|
Raymond Yee
|
add83c9d9e
|
fixed case of LOCKSSpreserved.png
|
2012-09-10 08:49:12 -07:00 |
|
Andromeda Yelton
|
d9147fd088
|
clarifying instructions
|
2012-09-10 10:51:52 -04:00 |
|
Andromeda Yelton
|
3a1a523acb
|
typo
|
2012-09-10 10:51:43 -04:00 |
|
Raymond Yee
|
2f0cf85734
|
Merge branch 'relaunch' of github.com:Gluejar/regluit into relaunch
|
2012-09-10 07:25:29 -07:00 |
|
Raymond Yee
|
3417c6372c
|
Allow for passing in card instead of customer for creating stripe charge
|
2012-09-10 07:23:03 -07:00 |
|
eric
|
de9da54206
|
sorting the premiums turned out to be easy
|
2012-09-07 17:56:58 -04:00 |
|
eric
|
92a2ccc7ce
|
cleaned up the response when a pledge is modified rather than created
|
2012-09-07 17:48:48 -04:00 |
|
eric
|
f3ecec8410
|
just some tweaking to get the premium selection right
|
2012-09-07 17:11:25 -04:00 |
|
Raymond Yee
|
b8c0c8f98e
|
Remove remnants of balanced and wepay that I missed earlier
|
2012-09-07 13:47:15 -07:00 |
|
Raymond Yee
|
f639aa02dd
|
Merge branch 'newpayment' into relaunch
Conflicts:
frontend/views.py
payment/manager.py
|
2012-09-07 13:46:09 -07:00 |
|
eric
|
4700e63b06
|
resolve conflict
|
2012-09-07 16:26:09 -04:00 |
|
eric
|
f1b22649a5
|
cruft
|
2012-09-07 16:20:12 -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 |
|
Andromeda Yelton
|
18fbe3a175
|
Merge branch 'master' of github.com:Gluejar/regluit
|
2012-09-07 14:48:35 -04:00 |
|
eric
|
6762c7d3f2
|
not really supposed to use Decimal.NaN changed to Decimal('NaN')
|
2012-09-07 14:40:00 -04:00 |
|
Raymond Yee
|
101cf1e7a0
|
Removed references to wepay and balanced
|
2012-09-07 11:31:49 -07:00 |
|
Raymond Yee
|
f9b3a5ddb5
|
updating version for stripe
|
2012-09-07 07:37:17 -07:00 |