60f9bc29da
Merge branch 'master' of github.com:Gluejar/regluit
2012-01-12 13:58:03 -05:00
f80226fe5e
minor additions to the press page, plus new users now go to supporter page on login
2012-01-12 13:57:50 -05:00
c054c45f0f
press link in footer should actually link to press page, huh
2012-01-11 12:12:56 -05:00
5654b5cd5e
Merge branch 'master' of github.com:Gluejar/regluit
2012-01-11 10:01:14 -05:00
b6998daac3
now the press page has pretty images. and links get a text decoration on hover, to be more obvious.
2012-01-11 10:00:10 -05:00
7a16029d72
Small bug in the feedback view: user -> request.user
2012-01-10 17:21:37 -08:00
54f2411ab9
Put in a basic page for a pledge completion.
2012-01-10 17:15:39 -08:00
86ff9ccdee
Merge branch 'master' of github.com:Gluejar/regluit into payment
2012-01-10 15:27:38 -08:00
01f5664bf5
Some very basic functionality associated with cancel_url, including the ability to try again on the pledge.
2012-01-10 15:26:04 -08:00
9b6524c6fd
fleshing out the press kit
2012-01-10 16:27:31 -05:00
d7e5e6e1ed
Merge branch 'master' into generic_id
2012-01-10 15:40:15 -05:00
0d19018e62
api tests working; non-google id's working
2012-01-10 15:20:02 -05:00
3abd29f225
First pass at passing in campaign id into cancel_url (which is now calculated in payment/manager.py)
2012-01-10 12:16:04 -08:00
7ca9a5f0a7
it is the skeleton of a press kit
2012-01-10 11:10:27 -05:00
95f32400ec
Merge branch 'master' of github.com:Gluejar/regluit
2012-01-09 16:13:49 -05:00
556ecf8a06
now users can give us feedback on alpha
2012-01-09 15:53:09 -05:00
0b91017dd5
Did what edso told me not to do- re-architected db to use generic ids
2012-01-09 13:55:22 -05:00
a4957a5bf6
Merge branch 'master' of github.com:Gluejar/regluit
2012-01-09 12:47:51 -05:00
a7009b1998
whoops, should probably commit the version that passes tests
2012-01-09 12:44:35 -05:00
2d1ab0dba6
Merge branch 'master' of github.com:Gluejar/regluit
2012-01-09 12:40:03 -05:00
a174b3eb93
Putting in skeleton for pledge cancel and complete PayPal callbacks
2012-01-09 12:36:03 -05:00
a9fc98b771
work page now displays a modify-pledge button where appropriate. not yet wired to modification functionality.
2012-01-09 11:50:48 -05:00
9d8bf7be69
Merge branch 'master' of github.com:Gluejar/regluit
2012-01-06 11:04:17 -05:00
8460fba0bb
organizing the FAQ
2012-01-06 10:42:17 -05:00
8ba7570ea1
Adding a "thank you" to the pledge page
2012-01-04 21:14:58 -05:00
9182affeda
Merge branch 'master' of github.com:Gluejar/regluit into ry
2012-01-04 17:21:39 -05:00
13b01c2838
Added a test to ensure that a user needs to be logged in for the pledge view.
2012-01-04 17:14:37 -05:00
96587a0a2d
Merge branch 'master' of github.com:Gluejar/regluit
2012-01-04 12:51:45 -05:00
8e04bf3419
expanding the faq
2012-01-04 12:51:34 -05:00
68f0c255d5
Force login on PledgeView as a whole
2012-01-04 12:03:50 -05:00
79e7d9d7df
grammar!
2012-01-04 11:34:31 -05:00
aa10713e49
menu is more location-specific
2012-01-03 16:47:00 -05:00
7de1051448
it is not unlike a sidebar organizing the FAQs
2012-01-03 16:17:04 -05:00
1986b37857
tidying book panel
2012-01-03 09:59:17 -05:00
69087b0a33
suppressing useless add-wishlist element
2012-01-03 09:47:06 -05:00
8a59fc75f8
green circle+arrow in learn more area makes no sense outside of landing page
2012-01-03 09:19:50 -05:00
2ede7d7e7b
size of unglue definition text box does not change now as definitions change
2012-01-03 09:12:31 -05:00
9030e87b70
unhid wished_by from search results. Why was it hidden?
2012-01-02 19:08:24 -05:00
739fccbe83
roemoved vestigial code from search view
2012-01-02 19:08:23 -05:00
8d7f7fe612
now the unglue definitions are not placeholders
2012-01-02 17:17:35 -05:00
1e2e76cc69
Merge branch 'master' of github.com:Gluejar/regluit
2012-01-02 16:31:53 -05:00
4e23363a80
now the text before the learn more button randomizes onload and onclick
2012-01-02 16:20:07 -05:00
dfd20a7957
needed a comma
2012-01-02 13:39:58 -05:00
fba09f60a3
comments needs padding between avatar and text
2012-01-02 13:10:20 -05:00
8e383ce229
embed needs protocol
2012-01-02 12:59:26 -05:00
3a6ae3da94
maybe a more robust way to obtain the url base
2012-01-02 11:22:03 -05:00
29e6ba7ee0
build_absolute_uri returns the WHOLE uri, not the base, so lines had to be rewritten accordingly. don't use it for the embed line since that requires ONLY the url base
2012-01-02 11:10:33 -05:00
e287f6028d
replacing remove-this option with pledged where applicable
2012-01-02 11:09:48 -05:00
fb6d715429
user now sees pledged indicator rather than remove-wishlist option for pledged works
2012-01-02 10:59:00 -05:00
30703cdabc
Merge branch 'master' of github.com:Gluejar/regluit
2012-01-02 09:41:16 -05:00
03d94bfbc5
tweaking email sharing
2012-01-02 09:39:11 -05:00
1cad25da28
detab source file
2011-12-31 13:49:23 -05:00
9d6066c929
catch IndexErrors to fix HermanCain bug; there is a work with zero editions
2011-12-31 13:48:54 -05:00
c2789350d0
We have comments! sync your dbs.
2011-12-30 22:08:04 -05:00
a2ebda17b1
one more place to truncate
2011-12-29 12:57:43 -05:00
1ddbbf55a5
now there is a truncatechars filter, applied where relevant
2011-12-29 12:50:09 -05:00
9358004c9b
Merge branch 'master' of github.com:Gluejar/regluit
2011-12-29 10:40:51 -05:00
0550f9ac43
added some default field prepopulation to email share form
2011-12-29 10:40:35 -05:00
4f17b86878
more reversion to make login?next= work correctly
2011-12-29 00:11:28 -05:00
afccb45fe4
fixed redirect loop
2011-12-28 23:31:42 -05:00
a742773799
merging work.html changes
2011-12-28 23:19:18 -05:00
79bc9ac15a
now email share has marginal styling and returns users to their original page after form submission
2011-12-28 23:17:39 -05:00
f9adbd0bc3
social widgets on basedocumentation lit up
2011-12-28 21:13:32 -05:00
0717479238
lo-fi email sharing now works
2011-12-28 20:43:52 -05:00
a348743385
discovered at d applied the useful request.build_absolute_uri
2011-12-28 20:41:07 -05:00
57939300b1
another try for email activation
2011-12-28 15:02:12 -05:00
4c7e5e7f8c
revert; will need to use http rewrite in apache to enforce https
2011-12-28 13:58:28 -05:00
f493312782
Revert "added htmlbase to enforce https login"
...
This reverts commit 93afadcf46
2011-12-28 13:51:24 -05:00
93afadcf46
added htmlbase to enforce https login
2011-12-28 12:34:43 -05:00
697ee04a43
added site fixtures to make email registration emails work
2011-12-28 12:34:41 -05:00
97ee0a7fc4
shortened publication date in work page header, made book list cover clickable
2011-12-28 07:27:56 -05:00
f0e1d47ac4
remove this button on work page returns page to add-to-wishlist state
2011-12-27 21:39:40 -05:00
50aae788c6
further tidying up panel view hover state and making sure it works properly in widget form too
2011-12-27 19:17:44 -05:00
5fb28b709f
revived book covers
2011-12-27 13:00:42 -05:00
d940c9a46a
tidied up panel hover state: layout, more sensitivity to campaign status, live pledge link
2011-12-26 21:10:32 -05:00
a35ffb2ffa
Merge branch 'master' of github.com:Gluejar/regluit
2011-12-26 12:53:36 -05:00
c79b3bdd10
replaced useless status indicators with wished-by indicators on supporter page for status = initailized or no campaign and destroyed GR/LT modal dialog
2011-12-26 12:53:28 -05:00
ad2dd36613
Changed order of campaign classes in campaign_admin
2011-12-23 11:46:09 -05:00
c721c9c6b2
Now in campaign admin, you can pick specific campaign to take action on.
2011-12-23 09:59:07 -05:00
a757f6f99b
Versions that include movement to utcnow() and changing what comes out PaymentManager.checkStatus() -- but payment to primary recipient is now broken. Need to investigate
2011-12-22 20:34:24 -05:00
5c8f3beccc
working on goodreads/librarything import UI. in an intermediate state right now.
2011-12-22 16:03:15 -05:00
6f64434b4e
Merge branch 'master' of github.com:Gluejar/regluit
2011-12-22 09:51:59 -05:00
7130ee5625
progress icon replaced by wished-by-N text for books on supporter page with no campaign yet
2011-12-22 09:51:49 -05:00
81c99c8724
Merge branch 'master' of github.com:Gluejar/regluit into payment
2011-12-21 18:37:22 -05:00
17d4acceab
changed PaymentManager.cancel to PaymentManager.cancel_transaction and added PaymentManager.cancel_campaign to parallel other methods in PaymentManager
...
morphing the campaign_admin view towards being able to push all the campaigns through the various states
2011-12-21 17:32:08 -05:00
ddcee58eeb
badges on supporter page now stay put regardless of whose page you're looking at and whether they have a tagline
2011-12-21 14:33:48 -05:00
614b36d15c
Merge branch 'master' of github.com:Gluejar/regluit
2011-12-21 13:48:45 -05:00
d0b2809c9e
moving badges for recommended and popular into tab area
2011-12-21 13:48:34 -05:00
322f03a460
Merge branch 'master' of github.com:Gluejar/regluit into payment
2011-12-21 12:33:44 -05:00
e8860238e0
on-wishlist checkmark now displays properly on supporter page
2011-12-21 11:34:35 -05:00
2428a5eef9
moved support button on work page to be more prominent and align better with other icons
2011-12-21 10:59:49 -05:00
75fceed7c5
Now display the campaigns with three different types of transactions: ACTIVE, INCOMPLETE, COMPLETED on the campaign_admin view
2011-12-20 20:36:27 -05:00
4e36892910
Putting in stub for campaign_admin.
...
Let admin do a PaymentManger.checkStatus() to get the latest information about Transactions (using the PayPal PaymentDetails and PreapprovalDetails API methods)
2011-12-20 17:42:06 -05:00
12a3f7f72f
Merge branch 'master' of github.com:Gluejar/regluit
2011-12-20 16:13:28 -05:00
c7293e253a
updating look of campaign and landing page to match latest from Stefan
2011-12-20 15:33:20 -05:00
c055767173
set the expiry date based on the campaign deadline. There is a setting PREAPPROVAL_PERIOD_AFTER_CAMPAIGN for specifying how many days after the campaign deadline should we ask for a preapproval deadline. I've put in 90 days.
2011-12-20 14:56:01 -05:00
47399ab23a
Merge branch 'master' of github.com:Gluejar/regluit into payment
2011-12-20 14:07:43 -05:00
2432b991b5
the learn more section: it toggles. toggle toggle toggle
2011-12-20 13:31:20 -05:00
269ebc4789
Merge branch 'master' of github.com:Gluejar/regluit
2011-12-20 10:39:14 -05:00
c8c61b5ef9
separating the color green from an abstract call-to-action color(also at present green)
2011-12-20 10:39:02 -05:00
aab7b6f926
Merge branch 'master' of github.com:Gluejar/regluit into payment
2011-12-20 10:35:42 -05:00
f81a4e8e6d
removed isbn_10 column and fixed many isbn13 non-compliance issues
...
apply migrations!
2011-12-19 23:26:55 -05:00
bad343e3d2
views.py: wiring in the email address of partnering non-profit
...
payment/manager.py: wire in the email address of the campaign recipient and the Gluejar commission rate
move the Gluejar commission rate to dev.py/prod.py
2011-12-19 18:34:30 -05:00
22da90659c
added frontend tests; test_view_by_anonymous is now by anonymous
2011-12-19 17:09:12 -05:00
c703b1b367
tab coloring on support page and hover states in share column on work page
2011-12-19 12:22:00 -05:00
2417886169
removing 0014_populate_subjects migration since it is problematic to run with South ORM, instead have people run add_openlibrary management command
2011-12-19 02:20:24 -05:00
3282a24f7c
remove hard tabs
2011-12-19 02:10:35 -05:00
55656e2d3d
now getting subjects from openlibrary instead of from googlebooks. You will need to APPLY MIGRATIONS!
2011-12-19 01:33:13 -05:00
ea728750ae
draft terms added
2011-12-16 17:19:59 -05:00
cd53080ac6
eleventy billion css tweaks part quattuor
2011-12-16 12:17:08 -05:00
9085ce6db3
clicking header sign up button on home page now lightboxes signup form
2011-12-16 12:16:30 -05:00
b32cf80471
eleventy billion css tweaks, part tres
2011-12-15 13:55:26 -05:00
6e152acfe8
eleventy billion css tweaks, part deux
2011-12-15 10:28:23 -05:00
754fcc394e
eleventy billion css tweaks, part one
2011-12-14 16:49:36 -05:00
e624a35359
Merge branch 'master' of github.com:Gluejar/regluit
2011-12-13 16:37:55 -05:00
ffd8bdc0a2
added magnifying glass button back into landing page search box
2011-12-13 16:37:45 -05:00
deabe01385
moved as-yet unsaid campaign actions into their own table. Apply migrations!
2011-12-13 16:24:56 -05:00
a8c546e3b1
restored magnifying glass to default search box
2011-12-13 16:17:51 -05:00
43c0dfa67d
distributing image links to google across servers better
2011-12-13 14:49:41 -05:00
ddceff17c4
twitter sharing is less lame
2011-12-13 14:30:37 -05:00
a4d609c76f
added google books branding to extra search box on empty search results page
2011-12-13 13:32:29 -05:00
ea292c5600
Merge branch 'master' of github.com:Gluejar/regluit
2011-12-13 13:15:43 -05:00
fd9f0a8e0c
both supporter.html and base.html were including jquery, leading to script failures. removed include from supporter.
2011-12-13 13:14:56 -05:00
db47fafaf8
changed "Search results" to "Google Books search results" in compliance with Books API usage guidelines: http://code.google.com/apis/books/branding.html#naming
2011-12-13 11:55:34 -05:00
5188bfa519
Merge branch 'master' of github.com:Gluejar/regluit
2011-12-13 10:50:33 -05:00
8848ce9a0b
now ungluer avatar and book cover in who's ungluing list on landing page are clickable
2011-12-13 10:50:21 -05:00
4ba3081311
changed "Governing Agreement" to "Platform Services Agreement" and "rightsholder" to "Rights Holder" for consistency with current language
2011-12-13 09:35:14 -05:00
d08e939cc3
order editions in reverse chronological order
2011-12-12 21:44:35 -05:00
35014da286
watermark ALL the things
2011-12-12 16:09:18 -05:00
26806673e4
added google watermark to landing page search box
2011-12-12 14:10:49 -05:00
eb79099fbe
moving all the rightsholder stuff to the top of the details tab so editions stuff doesn't hide it
2011-12-09 16:17:10 -05:00
27e88e5458
Merge branch 'master' of github.com:Gluejar/regluit
2011-12-09 16:15:24 -05:00
66ebeaf07e
links to edition-specific google books in detail view
2011-12-09 16:15:11 -05:00
33532029c1
removing print statement (oops)
2011-12-09 13:23:28 -05:00
e5aab951a7
googreads, librarything links now show only when a member is logged in
2011-12-09 13:03:28 -05:00
eca82b3911
wired recent events to landing page ungluers
2011-12-08 19:12:26 -05:00
167dccf574
Wishlists are now filled using the Wishes intermediate table. It's named the same as previous intermediate table, and I've edited the migration so data is not lost.
...
Also, I've added methods od Wishlists to add and remove Works. There
are "source" and created columns on the Wishes table
2011-12-08 18:22:20 -05:00
aa0a935d16
details tab displays editions
2011-12-08 16:23:31 -05:00
60f4b141fc
Merge branch 'master' of github.com:Gluejar/regluit
2011-12-08 15:28:30 -05:00
1c623dcac7
made sure arrow and graphic aligned in a cross-browser way and moved long text to learn more space
2011-12-08 15:24:38 -05:00
1bef255813
now the embed text is in a textarea
2011-12-08 15:24:05 -05:00
5a8d7e8fa3
put a real query into landing page campaign slider
2011-12-08 08:10:58 -05:00
80a4fa5618
now the slideshow does not autoadvance
2011-12-07 15:07:39 -05:00
53f9f1d87e
you can create accounts from the landing page now\! hooray\!
2011-12-07 12:56:23 -05:00
e07c5506b4
wishlist add/remove now working on work page
2011-12-07 12:05:31 -05:00
d00adef207
campaign searches now use the status field
2011-12-06 16:37:03 -05:00
3f8c6321c7
Merge github.com:Gluejar/regluit
2011-12-06 15:08:55 -05:00
2396a3ff69
now there are book panels on the landing page with real (albeit silly) data. hover state of panels not working yet.
2011-12-06 15:08:36 -05:00
93cb548b42
fixed bug where non-logged in user trips on missing work.id in search results
2011-12-06 14:40:29 -05:00
2adc23b380
when a lookup on openlibrary fails, fall back to doing a search
2011-12-06 09:53:53 -05:00
Andromeda Yelton
Raymond Yee
eric
Ed Summers