Raymond Yee
|
4cfabf6efe
|
Turning on embedded view to test
|
2011-11-22 14:17:54 -08:00 |
Raymond Yee
|
5512f221db
|
I think we need to change _last_change to something like _last_change_ so that the variable doesn't alreay exist in Work. Also return None if there are no campaigns.
|
2011-11-22 12:55:05 -08:00 |
Raymond Yee
|
9b815e7e28
|
Merge branch 'master' of github.com:Gluejar/regluit into payment
|
2011-11-22 11:53:06 -08:00 |
Raymond Yee
|
979a403a06
|
Merge branch 'jkace' of github.com:Gluejar/regluit into payment
Conflicts:
frontend/templates/campaign_detail.html
frontend/views.py
|
2011-11-22 11:30:45 -08:00 |
Andromeda Yelton
|
47754ddd6c
|
now you can get embed code from the work page
|
2011-11-22 14:28:27 -05:00 |
Andromeda Yelton
|
f544b7684a
|
now there is Twitter sharing
|
2011-11-22 13:59:37 -05:00 |
Andromeda Yelton
|
c9e899bac1
|
fixed widget sizing
|
2011-11-22 13:59:25 -05:00 |
Andromeda Yelton
|
3c61c13e59
|
cleaning up: fixed sizing, removed background image, switched to more recent (and unglueit-hosted) jquery version
|
2011-11-22 13:49:59 -05:00 |
Andromeda Yelton
|
25d2177ca4
|
restoring background color alternation of books in list view of supporter page after widgetization
|
2011-11-22 13:33:57 -05:00 |
Raymond Yee
|
5f4496a290
|
Merge branch 'master' of github.com:Gluejar/regluit into campaign_widget
|
2011-11-22 06:45:07 -08:00 |
Jason
|
58eb67e0aa
|
Adding code to support embedded payments
|
2011-11-22 06:14:58 -05:00 |
eric
|
0bad939bfb
|
Though the form is ugly, a campaign manager can now launch a campaign and set info
I also learned what it means when a form is bound to a model object
|
2011-11-22 00:28:16 -05:00 |
Raymond Yee
|
726f086c4c
|
Adjust the size of the iframe
|
2011-11-21 20:36:14 -08:00 |
Raymond Yee
|
e99c98a014
|
kludge a new ISBN into widget embed test
|
2011-11-21 18:13:39 -08:00 |
Raymond Yee
|
78339e3de5
|
Added a rough textarea for someone to copy embedding iframe for widget
|
2011-11-21 18:06:44 -08:00 |
Raymond Yee
|
e09cf8186d
|
Merge branch 'master' of github.com:Gluejar/regluit into goodreads
|
2011-11-21 17:34:44 -08:00 |
Ed Summers
|
bd9084ffea
|
readded pointer icon for add/remove from wishlist
|
2011-11-21 20:28:41 -05:00 |
Raymond Yee
|
994be3f732
|
Attempt to factor out book panel so it can be used in widget and supporter page
|
2011-11-21 17:21:06 -08:00 |
Ed Summers
|
8b9b692085
|
removed hard tabs
|
2011-11-21 20:17:31 -05:00 |
Ed Summers
|
8008a5df51
|
added /googlebooks/{googlebooks_id}/ route which will add the book to gluejar and redirect to the new work url, for use on the search results page
|
2011-11-21 20:12:13 -05:00 |
Andromeda Yelton
|
bdf30251c4
|
Merge branch 'master' of github.com:Gluejar/regluit
|
2011-11-21 16:08:12 -05:00 |
Andromeda Yelton
|
b48d6c1091
|
styling tweaks; working on making sure everything can & does use same version of jquery (1.6.3)
|
2011-11-21 16:05:55 -05:00 |
eric
|
a6c84aea89
|
should now be back where I was
|
2011-11-21 15:49:29 -05:00 |
Ed Summers
|
dcd07138e7
|
Merge branch 'master' of github.com:Gluejar/regluit
|
2011-11-21 15:18:42 -05:00 |
Ed Summers
|
d3d059b1b7
|
trying local mysql
|
2011-11-21 15:08:44 -05:00 |
eric
|
6e5d51f24f
|
is_staff, not is_staff()
|
2011-11-21 15:08:28 -05:00 |
Andromeda Yelton
|
b865086cb4
|
figured out why documentation.css was not being applied to all descendants of basedocumentation.html; fixed that. descendant extrahead content should go in the extra_extra_head block now.
|
2011-11-21 15:07:10 -05:00 |
Andromeda Yelton
|
f3c7e6b9dd
|
Merge branch 'master' of github.com:Gluejar/regluit
|
2011-11-21 14:54:42 -05:00 |
Ed Summers
|
3b777f87aa
|
allow empty publication date, also make sure test database uses charset utf8 or else tests will fail
|
2011-11-21 14:13:29 -05:00 |
Andromeda Yelton
|
495f447b1a
|
now the supporters tab on the work page is populated
|
2011-11-21 13:06:23 -05:00 |
Ed Summers
|
b9b99b4b34
|
lets try putting the mysql hostname in there
|
2011-11-21 12:45:58 -05:00 |
Ed Summers
|
20d7751c96
|
going to switch jenkins to use mysql
|
2011-11-21 12:38:24 -05:00 |
Ed Summers
|
765968272a
|
Merge branch 'master' of github.com:Gluejar/regluit
|
2011-11-21 11:32:34 -05:00 |
Andromeda Yelton
|
a749c165cb
|
fixing layout of pagination div to avoid clashes with panel view
|
2011-11-21 11:32:05 -05:00 |
Ed Summers
|
d57f93f6f2
|
added new migrations
|
2011-11-21 11:29:37 -05:00 |
Ed Summers
|
a98ce5373c
|
removing migrations
|
2011-11-21 11:26:31 -05:00 |
Andromeda Yelton
|
80d3b10279
|
fixing initial appearance of toggle icons
|
2011-11-21 11:10:31 -05:00 |
Andromeda Yelton
|
ade372baa6
|
fixed placement of hover state of panel view
|
2011-11-21 11:06:00 -05:00 |
Andromeda Yelton
|
8fcfffb8dc
|
fixing overzealous indentation
|
2011-11-21 10:53:45 -05:00 |
Andromeda Yelton
|
44e14ab2a8
|
pushed some logic into views so that work page will be making fewer db calls on net
|
2011-11-21 10:51:50 -05:00 |
Andromeda Yelton
|
afa936258b
|
cross-browser compatibility fix for rounded corners on tabs
|
2011-11-21 10:50:54 -05:00 |
eric
|
43d3f3f553
|
halfway through implementation of campaign management. can't launch campaigns yet. migrate schemas!
|
2011-11-20 22:23:51 -05:00 |
eric
|
8169e7ecb3
|
fixed assorted html errors
|
2011-11-20 17:43:55 -05:00 |
eric
|
1189ab02c4
|
switched to using is_staff set by django admin to determine website "staff" (also fixed a bug from last commit)
|
2011-11-20 14:22:51 -05:00 |
eric
|
fa68e52260
|
switched campaign manager field to AutoCompleteSelectMultipleField
|
2011-11-20 14:02:09 -05:00 |
eric
|
43f1d9cdeb
|
settings.prod now set to use accounts@gluejar.com mail account
|
2011-11-20 09:51:19 -05:00 |
eric
|
c8cb7853c6
|
Sorry, wrong test!
|
2011-11-20 09:28:53 -05:00 |
eric
|
cd8dc2d825
|
Oh yeah, the tests
|
2011-11-20 09:25:18 -05:00 |
eric
|
497d883a43
|
fixed no results bug in gluejar-search; started passing remote IP address to google api
|
2011-11-20 09:20:08 -05:00 |
eric
|
9638ff9a97
|
moved claiming form back to Details Tab
|
2011-11-19 22:54:59 -05:00 |