9badabb53b
Merge branch 'master' of github.com:Gluejar/regluit into ry
2012-05-13 13:33:53 -07:00
89c4fa451f
extends directive needs to be the first line in Django template
2012-05-13 13:32:34 -07:00
100dc9d9b6
spurious <br>s
2012-05-13 16:06:48 -04:00
9ed4186124
Merge branch 'master' of https://github.com/Gluejar/regluit
2012-05-13 15:37:28 -04:00
aad5593c1d
resolve conflicts
2012-05-13 15:37:20 -04:00
193e4ef324
methods are not properties, whoops
2012-05-13 15:33:54 -04:00
4a9b9b1f31
Merge branch 'master' of github.com:Gluejar/regluit into ry
2012-05-13 12:33:20 -07:00
c38a3a320f
fixing some URLs
2012-05-13 15:33:19 -04:00
0cdac29c22
apply intcomma to currency display everywhere and add humanize
2012-05-13 15:32:32 -04:00
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
ea5664b08c
that ampersand should not be URLencoded since it's actually a parameter
2012-05-13 15:22:38 -04:00
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
d2cf8a773b
improvifying pledge front end around modify and cancel
2012-05-13 10:49:23 -04:00
ae76f89034
fixing problems with context for you_have_pledged notification
2012-05-12 22:42:09 -04:00
e6467e4e85
even moar wordsmithing of notifications
2012-05-12 21:49:31 -04:00
6fe7aeeabb
even more notification wordsmithing
2012-05-12 21:28:27 -04:00
54e1e3e98b
merge all the things
2012-05-12 12:25:17 -04:00
83730badbb
more wordsmithing
2012-05-12 11:58:33 -04:00
77a66e5420
[ #29498563 ] fixed urls by moving email share messages to django templates; eliminated sender from form
2012-05-12 11:12:43 -04:00
76b8b9f33d
[ #29488053 ] no use linking to google books if no google books id
2012-05-11 22:46:41 -04:00
8e3baba673
wordsmithing
2012-05-11 21:36:20 -04:00
feb8650c10
[ #29488053 ] add to wishlist now works for works without googlebooks_id
2012-05-11 21:29:03 -04:00
5bd3f06903
[ #28851641 ] removed some debug code
2012-05-11 21:29:03 -04:00
ca2bfedafd
[ #28851641 ] fillied in you_have_pledged templates
2012-05-11 21:29:03 -04:00
2590c5d58d
Trying to get production to line up with master
2012-05-11 15:05:40 -07:00
1b16603056
Merge branch 'production' of github.com:Gluejar/regluit into production
2012-05-11 15:05:18 -07:00
fbd58d5e4e
Add import of notification
2012-05-11 14:14:49 -07:00
ba36838dfa
must import notification
2012-05-11 14:03:28 -07:00
7c49427e2c
Revert "wired pledge_you_have_pledged [ #27785469 ]"
...
This reverts commit 17d641cf65
2012-05-11 14:00:17 -07:00
17d641cf65
wired pledge_you_have_pledged [ #27785469 ]
2012-05-11 15:53:46 -04:00
36edf0a261
[ #28851641 ] // was getting rewritten by apache, I think
2012-05-11 15:39:26 -04:00
328cea6cf3
Update frontend/templates/notification/wishlist_active/full.txt
2012-05-11 16:05:47 -03:00
81d158f505
[ #28851641 ] Edition creation and editing !!! Needs a schema migration.
2012-05-11 14:13:09 -04:00
0f1bfaebc4
[finish #29411521 ] added site to url
2012-05-10 17:13:09 -04:00
bc3045161c
clarified wording
2012-05-10 15:40:37 -04:00
71c174d012
need to expose paypal address field after all
2012-05-10 13:23:42 -04:00
4ba688dbad
minor fixes
2012-05-10 13:23:19 -04:00
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
fe84c09651
polishing for launch
2012-05-09 16:32:06 -04:00
41f662c048
updating pledging contextual FAQs
2012-05-09 13:40:01 -04:00
d0bac11ec4
clarifing CC noncommercial
2012-05-09 13:26:12 -04:00
e1835a7cc7
updating, including amazon and paypal language
2012-05-09 13:01:17 -04:00
665fb99af3
updating with paypal and amazon info
2012-05-09 12:49:49 -04:00
e4e66b2118
adding some more recent coverage
2012-05-09 12:45:00 -04:00
42d33794e3
sign up element in learn more section was misaligned
2012-05-09 12:20:41 -04:00
0212136a43
Revert "unrequiring paypal address"
...
This reverts commit 32a4b29e33
2012-05-09 09:37:57 -04:00
4c20082d70
[ #29281959 ] add feedback from lawyer
2012-05-09 09:37:33 -04:00
8fa1f89eca
re-require Paypal address
2012-05-09 09:36:27 -04:00
beff46fd8c
standardizing on Unglue.it rather than Unglue.It
2012-05-08 16:15:23 -04:00
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
f232bc1048
we're not using this any more
2012-05-08 14:41:04 -04:00
6e1aa4dfd0
changed work_list page to clearly communicate that it's staff picks when facet = recommended
2012-05-08 14:28:06 -04:00
32a4b29e33
unrequiring paypal address
2012-05-08 13:48:32 -04:00
9549b34d9e
parts of Description tab now conditional on campaign status, rather than offering RHs options they're not allowed to use
2012-05-08 13:48:24 -04:00
5004256f78
better wording
2012-05-08 13:47:58 -04:00
9fc2444f37
need to be explicit that premium_id is a list or it will try to iterate through a string and fail bafflingly
2012-05-08 10:51:04 -04:00
7dbb2e2276
Merge branch 'master' of github.com:Gluejar/regluit
2012-05-08 09:50:32 -04:00
73157c8720
clarified manage campaign workflow
2012-05-08 09:27:03 -04:00
dd3eb97a65
updating for launch
2012-05-08 08:34:52 -04:00
b06a1e218a
Merge branch 'fps' of github.com:Gluejar/regluit into ry
2012-05-07 16:50:00 -07:00
32a39635b4
[finish #29037717 ] added sentences explaining form limits
2012-05-07 18:00:52 -04:00
1ab9304475
[finish #28949611 ] rights holders are now the default campaign manager; they can remove themselves after they add another manager
2012-05-07 17:32:58 -04:00
2159cb32d5
added section on license terms, updated verb tense, Unglue.It to Unglue.it
2012-05-07 13:39:24 -04:00
181cf1a28b
rearchitecting for launch
2012-05-07 13:10:42 -04:00
2cf23aeac0
commented the scripts
2012-05-07 13:10:18 -04:00
5b617370a8
moved boilerplate paragraph
2012-05-07 13:09:41 -04:00
dbadaf8241
removed alpha announcement
2012-05-07 13:07:54 -04:00
57cebd126d
[accept #28451269 ] added 2 headings and a preview link. Nice job.
2012-05-07 12:19:19 -04:00
1d005fae95
[finish #29170153 ] Improved display of no-google works
2012-05-07 11:36:34 -04:00
a32b09a4cb
Revert "Revert "[ #28945859 ] removed description from edition. Be sure to do data migration before applying this schema migration""
...
This reverts commit 2d344a09c6
2012-05-07 01:18:11 -04:00
c0cb99e040
Revert "Revert "Revert "[ #28945859 ] removed description from edition. Be sure to do data migration before applying this schema migration"""
...
This reverts commit c8be251ffa
2012-05-07 01:18:11 -04:00
d334fa58b0
Revert "Revert "Revert "Revert "[ #28945859 ] removed description from edition. Be sure to do data migration before applying this schema migration""""
...
This reverts commit b21787a590
2012-05-07 01:18:11 -04:00
e10136f1b2
Revert "Revert "Revert "[ #28945859 ] removed description from edition. Be sure to do data migration before applying this schema migration"""
...
This reverts commit 1bbac102a2
2012-05-07 01:18:11 -04:00
1bbac102a2
Revert "Revert "[ #28945859 ] removed description from edition. Be sure to do data migration before applying this schema migration""
...
This reverts commit 2d344a09c6
2012-05-07 01:14:47 -04:00
b21787a590
Revert "Revert "Revert "[ #28945859 ] removed description from edition. Be sure to do data migration before applying this schema migration"""
...
This reverts commit c8be251ffa
2012-05-07 01:14:47 -04:00
c8be251ffa
Revert "Revert "[ #28945859 ] removed description from edition. Be sure to do data migration before applying this schema migration""
...
This reverts commit 2d344a09c6
2012-05-07 01:14:01 -04:00
2d344a09c6
Revert "[ #28945859 ] removed description from edition. Be sure to do data migration before applying this schema migration"
...
This reverts commit 7043e71c39
2012-05-07 01:11:26 -04:00
7043e71c39
[ #28945859 ] removed description from edition. Be sure to do data migration before applying this schema migration
...
also fixed issues with tests failing in add_openlibrary
2012-05-07 00:42:11 -04:00
e09418a7a2
Updating paypal code to use common global transaciton status, fixing bugs in paypal interface with abstract payment manager class
2012-05-04 10:30:05 -04:00
4be0cab5a0
Merge branch 'master' of github.com:Gluejar/regluit
2012-05-04 10:05:54 -04:00
8902ec84b3
made manage_campaign workflow suck less
2012-05-04 09:56:41 -04:00
b9bbecb351
Merge branch 'master' of github.com:Gluejar/regluit into fps
...
Conflicts:
settings/common.py
settings/dev.py
settings/prod.py
2012-05-02 18:01:20 -07:00
a3ce812467
small formatting changes
2012-05-02 14:10:58 -04:00
b8b007c427
last_campaign_status is a string not function
2012-05-02 17:53:45 +00:00
122454b949
Merge branch 'master' of github.com:Gluejar/regluit
2012-05-01 13:56:12 -04:00
3deb660ce3
more css tweaks per stefan
2012-05-01 13:49:23 -04:00
1c2e48bc87
added edition to campaign model to allow selection of a preferred edition [finish #28736373 ]
2012-05-01 10:56:19 -04:00
c0625d78b8
banish isbn 10 display because it might not exist and prefer not to address the issue
2012-05-01 10:54:29 -04:00
fb5333be2e
only use role account email addresses in documentation pages
2012-05-01 10:02:07 -04:00
ce36f6771d
css changes per Stefan, part 1
2012-05-01 09:56:19 -04:00
8999afb7f1
Merge branch 'master' of github.com:Gluejar/regluit
2012-04-30 11:28:52 -04:00
5421793f02
minor styling tweaks
2012-04-30 11:03:15 -04:00
4f524a792f
[ #24088823 ] ebook downloads now drop down if more than 1
2012-04-28 21:05:41 -04:00
61a4878b54
[finish #24030945 ] tested it! scheduled notification for 12:30 at night via celerybeat. fixed various messge problems.
2012-04-28 13:02:38 -04:00
6cd6064387
[start #24030945 ] notification that ebooks have been added to database
2012-04-27 17:29:57 -04:00
bc9f1d3cd3
[ fix #28759049 ] prefixing ebook contribution form not handled properly in view or form
2012-04-27 17:14:57 -04:00
47a22f3ccb
Merge branch 'master' of github.com:Gluejar/regluit into fps
2012-04-26 15:50:49 -07:00
274762d7de
[deliver #24088823 ] rights and filetype images for pd, cc books
2012-04-26 17:26:27 -04:00
c6b05bd577
footer now points to wordpress blog
2012-04-26 15:37:41 -04:00
4219149132
Small tweaks to get rid of remnants of PayPal IPN_* variables -- I can now use campaign_admin to actually move fake amazon bucks. Still some IPN_* stuff remaining to clean up.
2012-04-26 19:31:55 +00:00
2ab1df92c2
addressing user feedback, highlighting field validation errors better
2012-04-26 15:30:28 -04:00
061f656e63
Merge branch 'jkace' of github.com:Gluejar/regluit into fps
...
Also fixed things so that regluit.test.campaigntest.support_campaign runs for Amazon without error -- though I still need to confirm that the status of transactions properly handled
Next up: see whether this works for PayPal too.
Conflicts:
frontend/views.py
2012-04-25 13:10:53 -07:00
3bc14c1ac9
Modifying frontend/views to use new transaction status codes
2012-04-25 13:55:30 -04:00
8706e9a900
email sharing needs to populate the sender field in order to validate
2012-04-25 13:45:18 -04:00
6246b231b1
[finish #27115511 ] remove html from wishlist_active notice
2012-04-25 10:20:04 -04:00
3709fa3ba8
polish up notice settings [finish #27014673 ]
2012-04-25 10:06:22 -04:00
ae1983be3d
Merge branch 'master' of https://github.com/Gluejar/regluit
2012-04-24 22:45:19 -04:00
028aa8f10d
reorganize notifications [ #27014673 ]
2012-04-24 22:44:19 -04:00
d0148cf6dc
[finish #28524505 ] add change email form
2012-04-24 22:20:10 -04:00
2a79a82dd7
detab text
2012-04-24 22:17:30 -04:00
709cb4ce41
now stuck on the status of an ACTIVE transaction in amazon in campaign_test
2012-04-24 18:03:57 -07:00
15a08bdfeb
Merge branch 'master' of github.com:Gluejar/regluit
2012-04-24 12:54:11 -04:00
a40e694faf
some phrasing help, plus made the offer details field not required
2012-04-24 12:54:05 -04:00
d652767a79
change supporters to ungluers on work page tab, see if that helps overflow problem
2012-04-23 12:08:11 -04:00
ba9123ba39
Sets form action properly in pledge.html depending on whether new pledge or modified pledge.
...
campaigntest.support_campaign changed to handle new premium selection process, which now changes the preapproval amount
2012-04-19 15:43:21 -07:00
911f6f6212
pledge and pledge_modify don't need to use different templates, just an if statement or two. DRY
2012-04-19 10:50:40 -04:00
e85ae79c35
Merge branch 'master' of github.com:Gluejar/regluit
2012-04-17 16:28:27 -04:00
d78fbf963c
notifications div ids replaced with snarkier, more-likely-to-be-unique text
2012-04-17 16:28:10 -04:00
d32190e905
[ #27115511 ] removed user avatar from comment notices because it didn't look right next to book cover.
...
Can revisit with professional design help.
2012-04-17 15:16:07 -04:00
8a24f860ee
[ #27470543 ] html fixes
2012-04-17 14:30:38 -04:00
7791de3c29
fixed html error [ #27310245 ]
2012-04-17 14:10:14 -04:00
8dda3369b5
minor language tweak per AM
2012-04-17 10:10:40 -04:00
434c6d048b
synced label for and input id so that clicking anywhere on the label selects the radio button
2012-04-17 09:33:47 -04:00
ecf1a7e604
selecting a premium now autofills pledge box with that number [ #26659097 ]
2012-04-17 09:26:45 -04:00
be510587ff
clarified error messages
2012-04-16 15:28:06 -04:00
7ef482b1ac
ensuring that errors display before form fields everywhere and switching css to make that apparent. if you write a custom form display, put errors before fields [ #27310245 ]
2012-04-16 14:18:04 -04:00
941fb78bf0
Merge branch 'master' of github.com:Gluejar/regluit
2012-04-13 15:40:33 -04:00
8434bb981f
header now contains an alert badge for notifications [ #27777943 ]
2012-04-13 15:29:46 -04:00
bf68f2f587
corrected bad reference to rightsholder name
2012-04-11 13:39:32 -04:00
8cb1375ffe
friendlification of comment notifications
2012-04-11 13:39:03 -04:00
80c3a0090f
fix spelling before it leads to bugs. will need to syncdb
2012-04-11 13:37:36 -04:00
d88a908082
[finish #27470423 ] provide preview of unlaunched campaigns
2012-04-10 16:13:28 -04:00
6ccdd8a798
Merge branch 'master' of github.com:Gluejar/regluit
2012-04-10 15:05:29 -04:00
edf3617f5a
partial de-suckification of pledge_complete page
2012-04-10 15:00:28 -04:00
89d385d51f
less and more text should toggle when editions info toggles
2012-04-10 14:33:34 -04:00
e38e0dcb37
Forgot to commit templates for successful_campaign notice type
2012-04-10 10:09:51 -07:00
e36facbeda
[finish #27468521 ] campaign form must also be valid to launch it
2012-04-09 16:52:24 -04:00
8c77057c0b
Merge branch 'master' of github.com:Gluejar/regluit
2012-04-09 11:26:32 -04:00
acd4d7048c
making sure it isn't barfing on context variables
2012-04-09 11:26:12 -04:00
39129877ae
more edits to notification display, trying to get column widths right
2012-04-09 11:15:48 -04:00
75da0a95d5
improved error message for missing campaign manager [ #27468285 ]
2012-04-09 11:14:31 -04:00
0f24099400
add instructions for RHs needing html help
2012-04-09 10:11:06 -04:00
f71366cb13
non-link title should be italicized
2012-04-09 10:10:19 -04:00
3888dc5a21
Merge branch 'master' of github.com:Gluejar/regluit
2012-04-09 08:39:19 -04:00
163c7a924a
[finish #27522103 ] clear rightsholder creation form when new rightsholder successfully created
2012-04-07 15:31:11 -04:00
773b0fb568
more consistency on terms labeling [finish #27646209 ]
2012-04-07 15:19:23 -04:00
4be26a6d89
[finish #27646209 ] improve consistency of what we call the website terms
2012-04-07 15:12:25 -04:00
dae1c430d6
Per legal counsel, we may not use the noun "offering" on our site. the verb is ok, the noun "offer" is ok.
2012-04-07 14:59:25 -04:00
44c6e29ff9
replaced "electronic rights" with "commercial rights" in faq
2012-04-07 14:55:47 -04:00
a700275b88
[finish #27524965 ] removed ids from submit. added paragraph on interfering claims.
2012-04-07 14:49:31 -04:00
Raymond Yee
Andromeda Yelton
eric
Jason
Ed Summers
Raymond Yee