90e1e56405
<pre> section was causing width overflow, added calculator link
2013-10-17 08:39:21 -04:00
c2649f6ab2
implemented borrowing methods, "BORROWED" license acq, RESERVES
...
includes a schema migration!
2013-10-16 22:48:29 -04:00
e6573ac0c5
library user can buy a library license
2013-10-15 16:18:30 -04:00
99c7b73d4a
purchase page reflects library membership and purchased status
2013-10-14 22:51:48 -04:00
4710c5d413
Merge branch 'master' into add_libraries
2013-10-14 18:20:14 -04:00
6e5eab447c
whoops! more tou changes
2013-10-14 13:43:08 -04:00
882feda6c3
now reviewed by attorney
2013-10-14 11:22:42 -04:00
b1d8b2338a
list of unlguit libraries at libraryauth/list/
2013-10-12 22:39:47 -04:00
c552057291
comments page gets some small tweaks
...
Going to use this page as a model for the library list.
2013-10-12 20:31:05 -04:00
29d000b39b
fix test for libraries
2013-10-12 19:14:17 -04:00
157d41eead
make the purchase options reflect user libraries
2013-10-11 17:50:54 -04:00
a57fa7e822
one more nit
2013-10-11 15:19:56 -04:00
fcc1876859
Revisit manage_campaign page for b2u
2013-10-11 12:50:59 -04:00
d99aaa97c9
card number authentication!
...
create libraries and administer them in admin.
card patterns mimc ezproxy format
http://www.oclc.org/support/services/ezproxy/documentation/usr/number.en
.html
after you join a library, it appears in your explore bar
2013-10-10 02:41:50 -04:00
439169a1ab
Implemented IP authentication
...
libraries get associated with a library_block table (IP ranges)
moved superlogin here
IP stuff mostly copied from
https://github.com/benliles/django-ipauth/blob/master/ipauth/models.py
The model is that you need to be in an allowed IP range to "join" a
library. Once you've joined, you can use your login from anywhere. to
use that library.
Asign IP ranges in admin
2013-10-08 15:37:22 -04:00
2f703a7815
Merge branch 'master' into add_libraries
2013-10-07 12:35:55 -04:00
56a4856080
wording tweak
2013-10-07 12:35:26 -04:00
ec7a3155b2
exclude incomplete transactions from event display on landing page
2013-10-05 11:41:12 -04:00
19101a3109
ungluing date calculator and many documetation improvements
2013-10-03 22:54:25 -04:00
076ce51efd
draft of revised TOU
2013-10-02 17:21:22 -04:00
b7393e7825
change copyright notice per lawyer
2013-10-02 12:09:26 -04:00
ab473f5411
libraries, phase 1.
...
admin can create a library connected to a user
other users can "join" the library
2013-10-02 12:02:08 -04:00
6b5dbc16c0
we haven't used some info and will have better conversion as we ask for less info
2013-09-27 14:03:01 -04:00
0d14b9ac3e
mis-spellings, we're not selling pdf yet
2013-09-27 14:01:10 -04:00
b091612605
Merge branch 'master' into b2u_errata
...
Conflicts:
frontend/views.py (kindle config bug already fixed)
2013-09-26 09:57:06 -04:00
93b7ffc951
Improve language on campaign pages, make text bigger
2013-09-26 09:49:39 -04:00
5976803cb4
fix bug in kindle config, improve doumentation
2013-09-26 09:36:03 -04:00
9b5a254f1d
Adapt marc record machinery to B2U titles
2013-09-23 12:39:47 -04:00
99fe9f9011
rewrite license page
2013-09-20 17:46:06 -04:00
ed341884ea
add license page to epub before sending it for watermarking
2013-09-15 21:43:58 -04:00
2329f9b088
Merge branch 'master' into preview_pledge
2013-09-09 08:32:56 -07:00
2b11153fc6
Merge pull request #205 from Gluejar/messages_notices
...
Notices, not Messages
2013-09-09 08:30:38 -07:00
63f0ee3794
Remove pledge form error when campaign is not active. [ #56565596 ]
2013-09-09 09:54:16 -04:00
de17f02298
[ #56528504 ] fixed lanfing page for purchases
2013-09-06 22:19:46 -04:00
f98684e1f8
Notices, not Messages
...
A review of the entire site reveals that we use "Messages" in only one
place, the sitewide menu item leading to the notices page. Most of our
Notices are more acurately described as notices than as messages, so
will change the menu item.
2013-09-06 16:06:10 -04:00
4b3c899088
[ #55666760 ] make fund-complete page sensetive to action
2013-09-06 13:58:23 -04:00
b801eb4927
add acq handling to download
...
needs migration. should migrate core back to 0052 to refresh acq table
download page no longer passes ebook ids to send_to_kindle, url
calculations are now done in view
2013-09-05 22:54:11 -04:00
0ba5c9a00e
cleanup, plus tests
2013-08-27 18:03:35 -04:00
e51fa1190e
wired watermarker into file uploads. migration needed
2013-08-26 23:56:01 -04:00
1c33c34f21
purchase complete notification, contextual wishlist active, fulfillment in signal handler
2013-08-22 14:30:56 -04:00
bec85ff82e
1st crack at faq revision
2013-08-20 14:11:11 -04:00
ff2d995cd5
minor wording changes
2013-08-20 12:41:39 -04:00
18c836d6cd
connect purchases to the new Acq table which records purchases
2013-08-19 22:54:43 -04:00
4a3cfc6840
Merge branch 'master' into ebook_selling
2013-08-18 18:11:13 -04:00
94eb6aeab0
Demphasize "wishes" on the website in preparation for B2U
2013-08-18 18:10:25 -04:00
d5b9f88380
move "extra data" into a json field dict to improve payment code tidieness
...
need to install jsonfield
note: this is https://bitbucket.org/schinckel/django-jsonfield
I tried https://github.com/bradjasper/django-jsonfield but it was not
compatible with South
2013-08-18 15:21:55 -04:00
c007df0803
Merge branch 'master' into social_auth_password
2013-08-17 17:41:15 -04:00
c88f8165ba
Merge branch 'master' into ebook_selling
2013-08-16 15:50:24 -04:00
837de35375
selling now works up to purchase page
2013-08-16 15:49:44 -04:00
f607ab026d
Make sign-up box validate and make error notices less in-your-face
2013-08-15 12:43:20 -04:00
d941686c50
now does password reset for a socialauth account
2013-08-14 17:29:38 -04:00
c415340356
change Pledge button to Purchase
2013-08-13 23:47:55 -04:00
40bcf62f99
edition.ebooks is always true
2013-08-12 17:22:55 -04:00
2c06139a6f
make dollar/day a float validate cc_date_initial, max target prevent changes after launch
2013-08-10 16:29:58 -04:00
7f325c0775
Finish B2U Campaign setup
2013-08-09 19:00:54 -04:00
75c32569e2
B2U campaign percentages
2013-08-08 22:32:58 -04:00
587323196a
Merge branch 'master' into ebook_selling
2013-08-08 20:02:25 -04:00
e64c128f7e
Merge branch 'master' into ebook_selling
...
Conflicts:
frontend/forms.py
2013-08-08 19:59:29 -04:00
613c3770e0
Bake in CC Date concept according to blog post, up to campaign creation
...
http://blog.unglue.it/2013/08/06/a-new-kind-of-ungluing-campaign/
moving the migration...
2013-08-08 19:56:26 -04:00
27bc134fa4
Merge branch 'expiring_cc' of github.com:Gluejar/regluit into expiring_cc
2013-08-08 12:28:36 -04:00
a9b5d51b36
Merge branch 'master' into expiring_cc
2013-08-07 22:59:37 -04:00
f30d662cd9
Merge branch 'master' into marc_provision
2013-08-07 22:10:01 -04:00
1bd2918bc3
Merge branch 'master' into ebook_selling
2013-08-07 15:21:57 -04:00
69e3ec0722
Add path back to landing in faq menu
2013-08-05 17:41:38 -04:00
a1b8ac6dba
change Rghts tab to More… tab
2013-08-05 17:40:42 -04:00
e78d5c7472
clean up account update notices
2013-08-05 12:18:51 -04:00
f2fbfed79e
Merge branch 'master' into expiring_cc
2013-08-03 16:19:53 -04:00
84c18ee65d
Make sure current staff is described accurately on ungluue.it site
2013-08-01 19:28:20 -04:00
cf640baff8
fix problem found with token test
2013-07-29 21:38:16 -04:00
313e46341b
can't figure out how to get loading gif to go away, so will forget about it for now
2013-07-29 18:53:09 -04:00
a5cc59d6f9
filter marc records based on a user's wishlist
2013-07-29 17:59:52 -04:00
1872180c22
add upload MARC link to work page
2013-07-29 16:35:50 -04:00
8576a7fb7b
Make marc records accessible from work page
2013-07-29 15:57:33 -04:00
1307ae7091
move 856 documentation to template from settings
2013-07-26 22:31:41 -04:00
2c75ecb9ce
html nits
2013-07-26 21:01:19 -04:00
91e2d41b67
moved the link target pref into a library prefs only table
2013-07-26 18:30:45 -04:00
767733ea26
anon user friendly
2013-07-26 16:12:10 -04:00
32f6546a04
spinny thing should go away if they want to use the form again
2013-07-26 08:59:31 -04:00
8281d99563
edge cases
2013-07-25 10:25:14 -04:00
da08afd0b8
now users can select the MARC records they want and get as single download
2013-07-24 14:52:01 -04:00
ec57b7efee
user preference affects which MARC records we make available
2013-07-23 16:07:47 -04:00
bb5c1079b6
user can now change marc preferences
2013-07-23 12:23:04 -04:00
287f017551
documentation for CC/PD MARC records
2013-07-22 14:23:59 -04:00
9cb3dcdadf
documenting how you get MARCXML from LOC
2013-07-19 09:56:47 -04:00
516c8c768a
I can harvest files from the db instead of tempting error by entering them twice
2013-07-18 16:36:01 -04:00
0e143b15ba
persist information about where to find AWS files
2013-07-18 15:49:54 -04:00
54e422e217
parametrizing formats and license choices, bugfixing
2013-07-17 13:03:35 -04:00
87c27cecee
wiring ungluify_record to front end and s3
2013-07-17 10:34:01 -04:00
fe2e3b72c5
argh
2013-07-16 11:42:17 -04:00
e3b6288e23
iterating unglify script, starting to integrate into front end
2013-07-15 16:35:41 -04:00
5f10047691
clarifying
2013-07-15 08:38:20 -04:00
bbeb086cbc
bugfixing
2013-07-08 15:54:36 -04:00
46d1d4f767
Merge branch 'master' into expiring_cc
...
Conflicts:
payment/models.py
payment/tests.py
2013-07-08 10:52:44 -07:00
214467e8f1
display available MARC records
2013-07-08 11:14:09 -04:00
6e853fc8f9
exclude google books, align error message with page text
2013-07-05 09:05:26 -04:00
c88e002ccb
get manage campaign to work a second time
2013-07-01 03:20:58 -04:00
7eeb114d03
tweek status messages
2013-06-29 23:14:33 -04:00
2a7a42fbfe
Merge branch 'master' into ebook_selling
...
Resolved Conflicts:
frontend/templates/download.html
frontend/views.py
static/css/enhanced_download.css
static/css/enhanced_download_ie.css
static/css/sitewide4.css
static/js/download_page.js
static/less/enhanced_download.less
static/less/enhanced_download_ie.less
static/less/sitewide4.less
2013-06-27 15:26:04 -04:00
b0f4eda221
show offers on work page
2013-06-27 13:10:33 -04:00
a6879ac20d
unbind send-to-kindle action after send, don't display options not available without javascript to non-js users
2013-06-26 09:43:15 -04:00
8395a4afb4
other things have logos, readmill should too
2013-06-26 09:31:26 -04:00
bb5bc2112d
add readmill and send to kindle instructions
2013-06-25 17:42:06 -04:00
6dd6d7de5a
add instructions and png for embedded browser
2013-06-25 17:41:14 -04:00
e92532524f
merge session.next_page into cookie.next functionality
2013-06-25 16:02:12 -04:00
fbe37359f2
simplify kindle_config view and add link to the work page
2013-06-25 16:01:08 -04:00
ff65b6b7dd
validation nit
2013-06-25 15:59:00 -04:00
3407b7cec4
add helpful link to response from send-to-kindle
...
also, move the kindle result messages into a template
2013-06-25 01:11:43 -04:00
e33077138f
move ebook id to title attribute
2013-06-25 01:09:36 -04:00
bcec6d4914
no smtp auth failures for you
2013-06-24 15:42:51 -04:00
aa7e5bfe5e
kindle instructions
2013-06-24 14:52:03 -04:00
50fce4bb1a
sharing->email
2013-06-24 14:28:01 -04:00
1380040bd2
Merge branch 'simpler_download' of github.com:Gluejar/regluit into simpler_download
2013-06-24 13:56:39 -04:00
69f0451bea
segregate flows of one-click and information-seeking options, address feedback
2013-06-24 13:53:28 -04:00
3c950966bc
Merge branch 'master' into simpler_download
2013-06-24 08:36:51 -04:00
5fe6f5d3a0
no campaigns *right now*
2013-06-18 09:39:57 -04:00
835ff4be8e
Rightsholder can upload ebook files and set buy-to unglue prices [ #51733385 ][ #51745045 ]
...
note that to test file upload loacal, you need to set up file storage
in local settings. for example,
MEDIA_ROOT = '/Documents/media/'
DEFAULT_FILE_STORAGE = 'django.core.files.storage.FileSystemStorage'
2013-06-17 18:53:28 -04:00
1ea77acf09
move latest ending logic from form to model/settings
2013-06-17 18:53:28 -04:00
9e5f41968b
download options should be sensitive to filetype
2013-06-17 18:53:28 -04:00
cd504780e6
redesigning information flow to address feedback
2013-06-17 18:53:28 -04:00
8fd153f085
rewiring to remove buttons
2013-06-17 18:53:28 -04:00
1e310e8896
fix overzealous global replace
2013-06-14 23:09:55 -04:00
7070f033e7
download options should be sensitive to filetype
2013-06-12 15:24:26 -04:00
2337676e1c
redesigning information flow to address feedback
2013-06-12 15:11:43 -04:00
0819c77312
rewiring to remove buttons
2013-06-12 14:05:30 -04:00
e21b002b6a
Merge branch 'master' into simpler_download
2013-06-10 11:59:19 -04:00
3b159db315
email validation
2013-06-10 11:57:59 -04:00
afe7e3ca54
kindle sending should only fire if we have an address on file
2013-06-10 11:23:06 -04:00
ff8f063b7f
provide backlink
2013-06-10 09:57:18 -04:00
2fb93dbbef
login or account creation after kindle sending now adds kindle email to profile
2013-06-10 09:29:18 -04:00
b23b617e4b
prompt not-logged-in users for kindle delivery email
2013-06-07 10:19:06 -04:00
b98a36d8e8
should be a view for coming-soon campaigns
2013-06-05 15:08:29 -04:00
c8ff245e80
show coming soon campaigns if none active, or skip section if none initialized either
2013-06-05 15:05:14 -04:00
63d87434ab
android instructions were slightly wrong. tested, fixed.
2013-06-05 14:53:14 -04:00
72b0977914
clarifying filetypes
2013-06-05 11:21:52 -04:00
1fa713cf12
encourage downloading of readmill app
2013-06-05 11:15:05 -04:00
2f3f8997ad
make sure graceful degradation works, fix bugs
2013-06-05 11:06:07 -04:00
8a859e6757
provide feedback, protect against file-too-big error
2013-06-04 10:22:11 -04:00
b3181f0e22
first pass at sending kindle files as attachments
2013-05-31 17:15:22 -04:00
236302342e
users can add and change kindle email
2013-05-31 15:19:58 -04:00
e75a7b9642
skeleton of send-to-kindle support
2013-05-31 11:34:51 -04:00
c797de93e6
download instruction buttons now work via ajax too
2013-05-31 10:46:26 -04:00
792d977a61
download page now prettifies via hijax links as well as download page
2013-05-30 09:17:34 -04:00
b5fd91006b
jquery to hide/show downloading options
2013-05-28 09:23:57 -04:00
b943e82012
CSS for streamlined downloads
2013-05-24 14:54:05 -04:00
177f60be0d
preparing HTML for streamlined downloading experience
2013-05-24 14:16:13 -04:00
31b978bb25
Merge branch 'master' into expiring_cc
2013-05-20 11:36:42 -07:00
8dbf20e143
added submit warning
2013-05-16 11:25:20 -03:00
f2e6d10469
allow new edition id oclc but no isbn; allow new publishernames
2013-05-13 17:32:30 -04:00
73290fdfc1
fixed up text for account_active notice -- even though at this point, it's not being fired
2013-05-08 16:49:43 -07:00
b224e99346
Merge branch 'master' into expiring_cc
2013-05-08 14:05:57 -07:00
97bc857eab
Merge pull request #168 from Gluejar/degruyter_stub_template
...
put status information in de gruyter initialized campaigns
2013-05-06 13:04:50 -07:00
db1ee70647
fixed up notice texts for account_expired
...
also made sure that user is properly passed to sender of notices
2013-04-26 10:50:28 -07:00
7265488484
Merge branch 'master' into expiring_cc
2013-04-26 08:58:47 -07:00
c5517df1c9
Merge pull request #167 from Gluejar/less_officious_comments
...
Less officious comments
2013-04-25 15:26:47 -07:00
a375112e72
Merge branch 'master' into expiring_cc
2013-04-24 13:50:33 -07:00
babeb9e4aa
Merge pull request #164 from Gluejar/manage_book_data
...
Manage book data
2013-04-24 11:31:07 -07:00
3b44e643d5
put status information in de gruyter initialized campaigns
2013-04-24 14:26:23 -04:00
aca759447d
test for staffness in template
2013-04-24 11:28:05 -04:00
08d4adf50b
implement adromeda suggestions
2013-04-24 11:14:25 -04:00
80ee477198
disambiguate staff and RH
2013-04-23 10:22:08 -04:00
516f867d87
removing word 'official'
2013-04-23 10:07:59 -04:00
a2606b2e08
move download count display to work infobox and rh_tools
2013-04-20 10:08:10 -04:00
de442c8f63
count downloads. migrate schemas!
2013-04-20 00:02:36 -04:00
aaaa9e0e56
need a link to repeat the proces
2013-04-18 11:29:34 -04:00
aac69cf64c
Fixed up account_expiring text...next step is to fix up account_expired and account_active
2013-04-17 15:43:44 -07:00
3b900e2328
Align names signals.py with those in the short.txt for notices
2013-04-17 13:24:43 -07:00
86dcdea1b7
updated text for cc notices
2013-04-17 11:42:49 -07:00
11381a99c9
add edition management links
2013-04-16 16:46:45 -04:00
31a1f46666
add split works funtionality
2013-04-16 16:46:25 -04:00
3c61e292d9
Fix edition editing, add other identifiers
2013-04-13 10:59:11 -04:00
9cc2e3121e
Merge branch 'master' into expiring_cc
2013-04-10 09:14:29 -07:00
d977fd6338
Merge pull request #161 from Gluejar/fix_authcanceled
...
add a special response for failed social auths
2013-04-10 08:38:14 -07:00
7e95d5f0d7
Merge pull request #162 from Gluejar/rh_is_not_user_friendly
...
altering term 'rights holder' in places where non-RHs are likely to enco...
2013-04-09 12:22:40 -07:00
24392c5b3e
missing </div>
2013-04-09 15:07:30 -04:00
075dfc3c55
altering term 'rights holder' in places where non-RHs are likely to encounter it and be confused
2013-04-09 12:31:19 -04:00
1ee2d5c634
add a special response for failed social auths
2013-04-09 00:05:31 -04:00
71306108b0
point press page at new version, tidy up submitterator
2013-04-08 14:16:08 -04:00
2bb69d9e82
Merge pull request #149 from Gluejar/verify_email_change
...
Verify email change
2013-04-08 07:28:32 -07:00
fabc7e6802
merge from master again except views
2013-04-05 13:07:13 -04:00
04aa440cd2
including untracked files is fun and useful
2013-04-04 11:34:54 -04:00
7e2d57b299
force css reload
2013-04-02 11:58:50 -04:00
040cd6d144
add de gruyter news by hand
2013-04-02 11:21:44 -04:00
d861aafdc3
Merge branch 'master' into landing_page
2013-04-02 07:55:42 -07:00
7dd1b994cd
fixing syntax error
2013-04-01 10:28:19 -04:00
6505384a1a
Merge pull request #152 from Gluejar/improve_login_to_add
...
"login to add" now adds, uses triple login page [#30497175 ]
2013-04-01 07:15:25 -07:00
f958693931
Merge pull request #150 from Gluejar/add_publisher_model
...
Add publisher model
2013-03-30 10:03:30 -07:00
1992c15c65
put production into maintenance mode
2013-03-30 09:55:32 -07:00
1f522e0112
maintenance mode
2013-03-30 09:47:45 -07:00
2aabf09161
merge from master
2013-03-29 19:41:28 -04:00
1a5477b271
as we can link straihgt to the comments tab, let's
2013-03-29 16:25:58 -04:00
b5af0fd98b
Merge branch 'landing_page' of github.com:Gluejar/regluit into landing_page
2013-03-29 16:24:34 -04:00
d90c8580e4
adds arrows for more, removes placeholder, changes header bars to pale-blue
2013-03-29 16:23:43 -04:00
35b4c7b91f
remove placeholder until I come up with a video to go here
2013-03-29 15:23:37 -04:00
097127ab7c
resolve conficts in merge from master
2013-03-29 12:03:15 -04:00
1ace0a5479
"login to add" now adds, uses triple login page [ #30497175 ]
2013-03-29 11:50:07 -04:00
63c6b35a30
Merge branch 'master' into add_publisher_model
2013-03-29 08:43:15 -07:00
c832f2f281
Merge pull request #148 from Gluejar/improve_avatars
...
Improve avatars (gravatar, update social_auth, avatars selectable)
2013-03-29 08:26:41 -07:00
44daa18f30
Merge branch 'master' into add_publisher_model
2013-03-28 22:46:38 -07:00
5bb546bd0d
fixed bad url
2013-03-28 14:16:52 -04:00
f804a0df66
adding read-faq option into learn-more area, since we've removed it from giant graphic
2013-03-28 10:59:36 -04:00
17a9847b66
segregating learn_more area css fully into learnmore.less
2013-03-28 10:38:57 -04:00
24a08d2979
Implement Andromeda suggestions
2013-03-27 21:46:52 -04:00
70beef83d5
display of works in our db were being excluded from google search results
2013-03-27 21:31:30 -04:00
8366b08c69
get email_change working again
2013-03-27 17:57:08 -04:00
af0d42b9ff
removed unused sharing features
2013-03-27 15:06:28 -04:00
3a81db3804
Implement publisher and feedback email in campaign management
...
(feedback view made more flexible)
2013-03-27 12:22:30 -04:00
5c2b639e98
as seen on section
2013-03-27 10:33:47 -04:00
79ddb02df9
need to have a content-block id around book panels for greenpanel.js to bind
2013-03-26 15:31:44 -04:00
6e801e6841
adding bookish activity to main content area
2013-03-26 14:55:50 -04:00
2b28add6a8
first pass at publisher page
...
in admin created publisher "De Gruyter" url=http://degruyter.com/ "
logo_url=https://www.degruyter.com/skin/20130326/images/logo.png
description=For more than two-hundred and sixty years the name De
Gruyter has been synonymous with high-quality, landmark publications in
the humanities and natural sciences. The scope of our publishing
program includes theology and philosophy, biology and chemistry,
linguistics and literature, mathematics and physics, history and
archaeology, as well as law and medicine. In all these areas De Gruyter
has consistently partnered with exceptional scholars to establish
itself as a key international publisher.
page at http://localhost:8000/bypub/all/de%20gruyter and
http://localhost:8000/pid/all/4702 (my db pubname id for de gruyter is
4702)
2013-03-26 14:53:48 -04:00
782f2bd712
can now admin the publishernames.
...
Setting a publisher moves the editions to that publisher's name
2013-03-26 14:12:58 -04:00
7f59be6ada
kill crowdfunding graphic and slideshow
2013-03-26 13:55:14 -04:00
998f33c770
more exciting news feed for home page
2013-03-26 13:54:03 -04:00
b3a5e0ce45
add placeholder
2013-03-26 13:53:53 -04:00
3bef92b484
Publishers can now be added in Admin
2013-03-26 10:56:49 -04:00
90d01894d2
don't ask people to add books by publisher
2013-03-25 23:41:59 -04:00
1881660089
intoduce Publisher and PublisherName Models
...
Also change our by publisher lists to key on the new name ids rather
than the names, which was yucky.
Migrations!
Data migration takes a while, don't be allarmed if it sits a while.
2013-03-25 23:41:19 -04:00
d905f288d7
merge from master
2013-03-22 16:45:41 -04:00
c26f9e1505
merge from master
2013-03-22 16:39:23 -04:00
e4a39647b9
expand and rename who's ungluing what area
2013-03-22 15:47:03 -04:00
750ced0686
Merge branch 'improve_registration' of github.com:Gluejar/regluit into improve_registration
...
Conflicts:
static/css/book_panel.css
static/css/registration2.css
2013-03-22 11:25:06 -04:00
edb174fc96
Merge branch 'master' into improve_registration
...
Conflicts:
frontend/templates/pledge_complete.html
static/css/sitewide2.css
2013-03-22 11:22:23 -04:00
543adf2bc4
Merge pull request #144 from Gluejar/fix_bookpanel_button
...
Fix bookpanel read it now button [#45869489 ]
2013-03-22 07:48:56 -07:00
a5a000ef7f
triple sign-in form when non-logged-in user tries to pledge
2013-03-21 14:24:11 -04:00
cc48ef8362
merge from master
2013-03-21 08:44:43 -04:00
f3cbd82336
fix "On Wishlist" link when it's not my wishlist
2013-03-21 08:38:46 -04:00
9a15545567
Merge branch 'search_on_campaigns'
2013-03-20 16:46:40 -04:00
53ee1c8b29
Addressed Andromeda's comments
...
Didn't know LESS well enough to remove hover state on "Pledged!", so
added a link; removed extra "pledged!"; all ebook links now point to
download page.
2013-03-20 15:24:53 -04:00
6ebdd1610d
urldecode the next path when pulled from cookie
2013-03-20 14:15:30 -04:00
f19cb8935b
fix cookiepusher javascript on landing page, persist it
...
on the landing page, what is the first signup for for?
2013-03-20 13:45:16 -04:00
aca38d66a1
Merge branch 'master' into expiring_cc
...
Conflicts:
payment/tests.py
2013-03-20 09:41:30 -07:00
e8a87e498e
Merge branch 'list_by_a_publisher'
2013-03-19 20:30:16 -07:00
6de3b806a6
change name of book_panel stylesheet to force reload on deployment
2013-03-19 14:53:11 -04:00
50ec6ddb06
merge from master
2013-03-19 14:38:09 -04:00
af8c3ff1fd
merge from master
2013-03-19 10:02:06 -04:00
e2ab3d75a8
Big merge from master
2013-03-19 09:40:18 -04:00
392a751abb
html nits
2013-03-18 22:07:19 -04:00
bd9a746422
merge in master
2013-03-18 21:50:22 -04:00
ff58e5cd97
add link to gravatar in ui
2013-03-18 16:30:43 -04:00
937f17eb73
and now everything works again
2013-03-18 14:56:27 -04:00
494457ae73
Merge pull request #143 from Gluejar/seo
...
sitemap, schema.org and fix bad urls in wishlist feeds
2013-03-15 14:43:55 -07:00
f3b48fa9a9
Merge pull request #142 from Gluejar/fix_stripe_spinny_thing
...
one line js fix to stop the spinny thing when stripe reports an error
2013-03-15 12:55:41 -07:00
dc8dea0768
moving countdown out of context to models.py, standardizing button appearance
2013-03-15 15:51:17 -04:00
014f15d8ee
start on the profile editor mods...
2013-03-14 21:42:00 -04:00
7f64189284
create and deploy avatar_source and avatar_url
2013-03-14 15:43:24 -04:00
6143c6a3aa
normalize invocation of supporter url, fix wrong user for comment links
2013-03-14 15:33:00 -04:00
54d0aa1d59
merge master into seo
...
schema.org stuff into work page
2013-03-13 10:48:36 -04:00
28045aed77
merge master into improve_registration
2013-03-13 10:40:20 -04:00
a4cc2ce1f0
misc template fixes
2013-03-12 21:58:29 -04:00
7bf62d665e
rip out old password change code
2013-03-12 21:58:15 -04:00
eric
Raymond Yee
Andromeda Yelton
