Andromeda Yelton
|
45720197c6
|
ensuring that cancel message is not too wide
|
2012-05-16 14:29:15 -04:00 |
|
Andromeda Yelton
|
e60be456cc
|
whoops ungrammatical
|
2012-05-16 14:28:51 -04:00 |
|
Andromeda Yelton
|
c4053a4b59
|
communicating stuff more clearly
|
2012-05-16 14:03:14 -04:00 |
|
Andromeda Yelton
|
2a9ef4030f
|
rewording notification box to reflect current state
|
2012-05-16 12:18:35 -04:00 |
|
Andromeda Yelton
|
f5602b5756
|
we weren't using this
|
2012-05-16 11:38:53 -04:00 |
|
Andromeda Yelton
|
104b916171
|
changing http unglue.it links to https
|
2012-05-16 11:38:42 -04:00 |
|
Andromeda Yelton
|
b9de19bb09
|
modifying pledge_charged to only send transaction as context, and templates derive campaign and work info therefrom
|
2012-05-16 10:35:58 -04:00 |
|
Andromeda Yelton
|
775d1d4af2
|
fixing rendering of successful campaign notifications
|
2012-05-16 10:06:26 -04:00 |
eric
|
0f9d292e16
|
more andromeda's nits [#29281959]
|
2012-05-16 02:05:32 -04:00 |
|
eric
|
4a98076b63
|
fix andromeda's nits [#29281959]
|
2012-05-16 01:49:36 -04:00 |
|
eric
|
979bb8b037
|
missing humaize in pledged_charge [#28493739]
|
2012-05-16 01:48:41 -04:00 |
|
eric
|
36a5e92d25
|
[finish #29677811] removed completely useless UNGLUEIT_SHORTEST_DEADLINE setting
|
2012-05-15 23:42:31 -04:00 |
|
eric
|
06b002c276
|
[#28493739] fix heading of pleadge_charged notice
|
2012-05-15 23:07:18 -04:00 |
|
eric
|
a6e685618c
|
resolve conflicts
|
2012-05-15 22:54:23 -04:00 |
|
eric
|
8fd4edbe42
|
wired pledged_charged notice [finish #28493739]
|
2012-05-15 22:47:57 -04:00 |
|
Andromeda Yelton
|
b6a6b6df7d
|
first pass at making pledge amount and premium level boxes reconcile. needs to be made DRYer but works.
|
2012-05-15 19:31:49 -04:00 |
|
Andromeda Yelton
|
6c3c1a8cd5
|
Merge branch 'master' of github.com:Gluejar/regluit
|
2012-05-15 15:44:54 -04:00 |
|
Andromeda Yelton
|
03f98844fd
|
removing pledge_prefill script, moving tiny little focus script to here
|
2012-05-15 15:44:18 -04:00 |
|
eric
|
9d33a95147
|
[ fixed #29647161] fixed login redirect which was failing when next included a query string
|
2012-05-15 14:18:17 -04:00 |
|
eric
|
28a4eb5f57
|
[#29632523] pledge modify form now preselects the correct premium
|
2012-05-15 13:47:00 -04:00 |
|
Andromeda Yelton
|
8cba752057
|
more notices need html templates for display at /notifications
|
2012-05-15 10:27:57 -04:00 |
|
Andromeda Yelton
|
9e2050c000
|
adding answer to an actual question from an actual user
|
2012-05-15 09:33:12 -04:00 |
|
eric
|
d3bff4efb5
|
[#29481707] added explanation of how to "edit" a premium
|
2012-05-14 23:27:44 -04:00 |
|
Andromeda Yelton
|
95d4786c4b
|
notice templates should actually say stuff
|
2012-05-14 21:42:46 -04:00 |
|
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 |
|
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 |
|
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 |
|
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 |
|
eric
|
443c4b5d42
|
[finish #27015121] give focus to pledge amount box, select premium doesn't reduce pledge
|
2012-05-14 09:01:03 -04: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 |
|
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
|
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 |
|
Andromeda Yelton
|
f1a7d68f8a
|
Merge branch 'master' of github.com:Gluejar/regluit
|
2012-05-13 16:47:10 -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
|
e6467e4e85
|
even moar wordsmithing of notifications
|
2012-05-12 21:49:31 -04:00 |
|
Andromeda Yelton
|
6fe7aeeabb
|
even more notification wordsmithing
|
2012-05-12 21:28:27 -04: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 |
|
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 |
|
eric
|
76b8b9f33d
|
[#29488053] no use linking to google books if no google books id
|
2012-05-11 22:46:41 -04:00 |
|
Andromeda Yelton
|
8e3baba673
|
wordsmithing
|
2012-05-11 21:36:20 -04:00 |
|
eric
|
feb8650c10
|
[#29488053] add to wishlist now works for works without googlebooks_id
|
2012-05-11 21:29:03 -04:00 |
|
eric
|
5bd3f06903
|
[#28851641] removed some debug code
|
2012-05-11 21:29:03 -04:00 |
|
eric
|
ca2bfedafd
|
[#28851641] fillied in you_have_pledged templates
|
2012-05-11 21:29:03 -04:00 |
|
Raymond Yee
|
2590c5d58d
|
Trying to get production to line up with master
|
2012-05-11 15:05:40 -07:00 |
|
Raymond Yee
|
1b16603056
|
Merge branch 'production' of github.com:Gluejar/regluit into production
|
2012-05-11 15:05:18 -07:00 |
|
Raymond Yee
|
fbd58d5e4e
|
Add import of notification
|
2012-05-11 14:14:49 -07:00 |
|
Raymond Yee
|
ba36838dfa
|
must import notification
|
2012-05-11 14:03:28 -07:00 |
|
Raymond Yee
|
7c49427e2c
|
Revert "wired pledge_you_have_pledged [#27785469]"
This reverts commit 17d641cf65.
|
2012-05-11 14:00:17 -07:00 |
|
eric
|
17d641cf65
|
wired pledge_you_have_pledged [#27785469]
|
2012-05-11 15:53:46 -04:00 |
|
eric
|
36edf0a261
|
[#28851641] // was getting rewritten by apache, I think
|
2012-05-11 15:39:26 -04:00 |
|
thatandromeda
|
328cea6cf3
|
Update frontend/templates/notification/wishlist_active/full.txt
|
2012-05-11 16:05:47 -03:00 |
|
eric
|
81d158f505
|
[#28851641] Edition creation and editing !!! Needs a schema migration.
|
2012-05-11 14:13:09 -04:00 |
|
eric
|
0f1bfaebc4
|
[finish #29411521] added site to url
|
2012-05-10 17:13:09 -04:00 |
|
Andromeda Yelton
|
bc3045161c
|
clarified wording
|
2012-05-10 15:40:37 -04:00 |
|
Andromeda Yelton
|
71c174d012
|
need to expose paypal address field after all
|
2012-05-10 13:23:42 -04:00 |
|
Andromeda Yelton
|
4ba688dbad
|
minor fixes
|
2012-05-10 13:23:19 -04:00 |
|
Andromeda Yelton
|
c6186c7808
|
need to hardcode staff names and pics on recommended as is_staff doesn't produce behavior we want
|
2012-05-09 16:33:22 -04:00 |
|
Andromeda Yelton
|
fe84c09651
|
polishing for launch
|
2012-05-09 16:32:06 -04:00 |
|
Andromeda Yelton
|
41f662c048
|
updating pledging contextual FAQs
|
2012-05-09 13:40:01 -04:00 |
|
Andromeda Yelton
|
d0bac11ec4
|
clarifing CC noncommercial
|
2012-05-09 13:26:12 -04:00 |
|
Andromeda Yelton
|
e1835a7cc7
|
updating, including amazon and paypal language
|
2012-05-09 13:01:17 -04:00 |
|
Andromeda Yelton
|
665fb99af3
|
updating with paypal and amazon info
|
2012-05-09 12:49:49 -04:00 |
|
Andromeda Yelton
|
e4e66b2118
|
adding some more recent coverage
|
2012-05-09 12:45:00 -04:00 |
|
Andromeda Yelton
|
42d33794e3
|
sign up element in learn more section was misaligned
|
2012-05-09 12:20:41 -04:00 |
|
eric
|
0212136a43
|
Revert "unrequiring paypal address"
This reverts commit 32a4b29e33.
|
2012-05-09 09:37:57 -04:00 |
|
eric
|
4c20082d70
|
[#29281959] add feedback from lawyer
|
2012-05-09 09:37:33 -04:00 |
|
eric
|
8fa1f89eca
|
re-require Paypal address
|
2012-05-09 09:36:27 -04:00 |
|
Andromeda Yelton
|
beff46fd8c
|
standardizing on Unglue.it rather than Unglue.It
|
2012-05-08 16:15:23 -04:00 |
|
Andromeda Yelton
|
11c19b950d
|
preventing information leakage about campaign status changes during preview and preventing non-staff from launching campaigns
|
2012-05-08 15:51:17 -04:00 |