dcd4727c95
a start on showing how to embed a widget in a third party site
2011-10-22 08:18:04 -07:00
246924c03f
still merging changes after internet librarian
2011-10-21 15:35:31 -04:00
c7a760b4d3
added last campaign method to Work class to help with status display in frontend
2011-10-21 14:47:23 -04:00
ce0d20a028
added random activation of some campaigns
2011-10-21 14:45:43 -04:00
e41e1e7b6d
just merging my local codebase post-internet librarian...
2011-10-21 12:51:07 -04:00
6aa01701a4
Got rid of explore sidebar in API help.
...
Got rid of 'undefined' class for something in widget we are currently calculating
2011-10-20 13:53:35 -07:00
3fb56a9c44
Place the API help page into the frame with the explorer sidebar.
2011-10-20 13:27:52 -07:00
2e83847fa7
rolling back the add_related option on add_by_isbn until it is better thought out, and does not break the build...
2011-10-20 18:43:40 +00:00
9901408b00
added list of supporters to the work page, just as a proof of concept more than anything.
2011-10-20 18:16:42 +00:00
62dcf73570
Small correction:
...
django-admin.py celeryd --loglevel=INFO
2011-10-20 10:28:33 -07:00
b1526ea284
Merge branch 'master' into tastypie2
...
Conflicts:
core/models.py
2011-10-20 10:00:45 -07:00
e164744872
order editions by most recent to oldest
2011-10-20 05:42:49 +00:00
07073f8620
have tasks return bookloader return values
2011-10-20 05:23:30 +00:00
11e75cb0a9
added celery config for jenkins
2011-10-20 05:19:19 +00:00
dbcd8e3465
use redis in production environment for pub/sub instead of polling
2011-10-20 05:18:04 +00:00
a79de596bb
added production deployment information and scripts for celeryd
2011-10-20 04:36:41 +00:00
0c1411f2e8
added celery async task for add_related that gets exercised when a book is added to a wishlist. includes new settings for the djkombu celery backend
2011-10-19 23:31:16 -04:00
a6e8d115db
added celery async task for add_related that gets exercised when a book is added to a wishlist. includes new settings for the djkombu celery backend
2011-10-19 23:28:36 -04:00
a2b622b061
Added status and current_total data to Campaign resource in the API.
...
Added an API help page to describe how to use the API and which shows a user's api_key and sample calls and link to campaign widgets.
Added facility to redirect back to current URL after sign in.
2011-10-19 17:08:17 -07:00
7212a31257
Merge branch 'master' of github.com:Gluejar/regluit into tastypie2
2011-10-19 10:47:52 -07:00
ce9f04619a
Removing Work.status because it doesn't meet current needs for how we think of the status of a work.
2011-10-19 10:41:13 -07:00
d9e4b06f99
don't render settings on somebody else's supporter page
2011-10-19 12:55:48 -04:00
0ed1d229f5
Updating campaign widget to show status and progress. Don't have a way to calculate a graphic representation of progress yet.
2011-10-19 09:45:25 -07:00
cbb801b9d9
Merge branch 'master', remote branch 'origin' into tastypie2
2011-10-19 08:26:43 -07:00
74e6f7a374
wired user profile edit form to supporter page
...
you can now edit tagline from supporter page
2011-10-19 03:13:29 -04:00
7810893c84
Merge branch 'master' of github.com:Gluejar/regluit into tastypie2
2011-10-18 23:09:31 -07:00
76b70f3676
minor doc fix
2011-10-18 23:47:48 -04:00
7bfb7c3f7f
need to trap errors when looking up a LibraryThing ISBN in GoogleBooks and getting no hit
2011-10-18 23:45:02 -04:00
5c88878a30
added merge_works function for merging the one work into another when adding related editions based on ThingISBN. also added a test that makes sure related campaigns and wishlists are appropriately updated.
2011-10-18 23:00:07 -04:00
0a84f525f7
A first cut at a Work.status property: UNGLUED, ACTIVE CAMPAIGN, NO ACTIVE CAMPAIGN
2011-10-18 19:00:51 -07:00
d5b45d75b1
Merge branch 'master', remote branch 'origin' into tastypie2
2011-10-18 19:00:11 -07:00
55af98b05f
artifact of some download?
2011-10-18 21:33:22 -04:00
3d676eae8c
Merge branch 'master' into tastypie2
2011-10-18 16:46:46 -07:00
8cab4dc425
First pass integration of preapproval into campaign pledge form
2011-10-18 16:27:20 -07:00
f92f39dc35
don't run settings.me/settings.dev alignment if we can't import modules
2011-10-18 08:02:49 -07:00
8d27cfc89e
Merge branch 'master', remote branch 'origin' into payment_integration
2011-10-18 07:43:42 -07:00
fa3dfe19a0
getting basic comparison of current status of a transaction with that in the database
2011-10-18 07:42:56 -07:00
a086143495
pointer cursor when hovering over "find"
2011-10-18 05:13:57 +00:00
5965687dbb
added some hopefully not too cheesy info about adding to wishlist when a user has an empty wishlist
2011-10-18 00:21:49 -04:00
b33ea3ac34
put a bit of space between "add to wishlist" and status. attempted to remove redundant book list css since it was confusing
2011-10-18 02:58:15 +00:00
fd5cf49460
Merge branch 'master' of github.com:Gluejar/regluit
2011-10-17 22:32:40 -04:00
1ddf12ddab
anon user gets redirected to login page when attempting to add an item to a wishlist. fixes https://www.pivotaltracker.com/story/show/19249923
2011-10-17 22:32:31 -04:00
ffcb298376
again
2011-10-17 22:07:34 -04:00
f8b599ffcc
removed capitalization style in .header-text
2011-10-17 22:03:06 -04:00
cdca7c6525
include book_list.css so we the remove/add areas appear clickable
2011-10-17 21:35:58 -04:00
f870cc6243
added regression test for non-logged in user viewing the supporter page
2011-10-17 18:37:31 +00:00
d09bc33989
fix for https://www.pivotaltracker.com/story/show/19784723
2011-10-17 18:16:34 +00:00
cd805d14ab
added raymond to the admins who get emailed with exceptions
2011-10-17 18:06:11 +00:00
0d21e77fd3
Merge branch 'master' of github.com:Gluejar/regluit into payment_integration
2011-10-17 07:23:59 -07:00
bb3a445a79
put a bit of temporary whitespace in between the footer
2011-10-14 20:48:40 +00:00
Raymond Yee
Andromeda Yelton
Ed Summers
eric