eric
82443593ea
make zeros show
2013-12-15 00:46:50 -05:00
eric
1598f181d8
assorted updates
2013-12-15 00:31:43 -05:00
eric
40e611bac5
revive the gift/donation credit funtionality, at least for b2u campaigns
...
The reason for doing this is so a library can put in money with one
check, then use it up gradually. (we get to pocket the fees that would
go to stripe) One change here- in b2u there is an extra click to get to
download page, even if no gift credit is involved - this way the user
knows what and how he's bee charged
2013-12-15 00:31:06 -05:00
eric
223c005b86
simplify and update slideshow
2013-12-14 13:24:29 -05:00
eric
2892a22824
change terminology from "donation" to "gift"
2013-12-13 15:15:35 -05:00
eric
8c974ca343
moved library list generation into a template tag
...
previously, if you created or updated a library, the list
(/libraryauth/list/ )would not get updated
2013-12-13 14:25:18 -05:00
eric
4836c6f8df
add info
2013-12-12 10:52:42 -05:00
eric
c7e1d6a674
fix typo
2013-12-12 10:27:33 -05:00
eric
9440f88d67
https://ahrefs.com/robot/ got stuck in our site.
2013-12-11 11:52:48 -05:00
Raymond Yee
314a8d6eb4
Merge pull request #256 from Gluejar/creat_library
...
ask user to sign in before showing them library validation --> ok let's merge to try out on just
2013-12-03 14:07:45 -08:00
eric
4d2f2b4fed
ask user to sign in before showing them library validation
2013-12-03 13:50:12 -05:00
Raymond Yee
a7db1790e7
Merge pull request #255 from Gluejar/creat_library
...
Create library
2013-12-03 08:28:26 -08:00
eric
02103a8a29
show approval status
2013-12-02 10:28:58 -05:00
eric
8b53581169
clean up instructions
2013-12-02 10:12:22 -05:00
eric
45d96f21bc
Add explanation of verification options
2013-12-02 00:46:25 -05:00
eric
8a9b29946c
spelling correction
2013-12-01 19:42:19 -05:00
eric
36df27cbc2
surface admin links
2013-12-01 19:22:42 -05:00
eric
ff0f7e5446
can now create and admin user validation
2013-11-30 15:40:45 -05:00
eric
ccb1f0dd86
create and edit Library objects, which now have names and owners
2013-11-27 22:14:52 -05:00
Raymond Yee
42694299e5
Add missing {{ acq.work.title }} to library_reserve/full.txt
2013-11-26 16:53:26 -08:00
eric
af553056e8
update pledge_failed notices
2013-11-25 13:29:31 -05:00
eric
dd83434282
Fix error handling in Pay
2013-11-25 13:01:16 -05:00
Raymond Yee
2959b68549
Merge pull request #246 from Gluejar/b2u_ungluify
...
B2u ungluify
2013-11-15 15:59:05 -08:00
eric
6787ccd5d8
faq: Why don't you use Paypal or Amazon?
2013-11-15 13:43:38 -05:00
eric
47dd298a78
update campaign successful notifications
2013-11-15 12:06:06 -05:00
eric
efea7d0198
on success, add a cc license, watermark (and generate mobi), and save
2013-11-14 23:16:55 -05:00
eric
c6edd83884
Merge branch 'master' into b2u_ungluify
2013-11-14 14:58:22 -05:00
eric
c5eee08034
edit wording
2013-11-14 14:58:02 -05:00
eric
5d4539b305
enable ebookfile download and secure ebookfile storage
2013-11-14 14:48:16 -05:00
eric
8bb514a401
somehow the "borrow" function wasn't tested in "reserves"
2013-11-12 17:28:07 -05:00
Raymond Yee
0875482611
Merge pull request #242 from Gluejar/library_agreement
...
added docracy links
2013-11-12 10:55:14 -08:00
Raymond Yee
dd5d1630b5
Merge pull request #238 from Gluejar/fix_email_change
...
didn't have a template for a failed email-change
2013-11-12 10:49:15 -08:00
eric
510f0a2d41
added docracy links
2013-11-12 11:35:12 -05:00
eric
1713a9fbb2
prettier
2013-11-11 14:09:41 -05:00
eric
264c7c9946
didn't have a template for a failed email-change
2013-11-11 14:01:40 -05:00
eric
4582537f05
add onhover explainers to ungluing date and amount to go
...
on work and purchase pages
2013-11-09 20:34:13 -05:00
eric
00693f7a23
Merge branch 'master' into reserves
...
Conflicts:
core/models.py
2013-11-08 16:07:29 -05:00
eric
e5a9b5384f
change alert messages
2013-11-08 13:38:07 -05:00
eric
b14122613e
fix tests
2013-11-08 12:49:22 -05:00
eric
0840a1fd71
implement holds. Also fix borrow view that didn't specify work.
2013-11-08 12:13:34 -05:00
Raymond Yee
fe17499af8
Merge pull request #233 from Gluejar/epub_errors
...
improve bad epub error handling -- Se test runs -- passing to Jenkins
2013-11-08 08:20:19 -08:00
eric
275f299f81
campaign setup cleanup: was broken when more than one claim existed
2013-11-07 13:35:35 -05:00
eric
e6692f7932
This was causing reserved licenses to be immediately borrowed
2013-11-07 13:32:00 -05:00
eric
30f7f2c4ba
Raymond's editis
2013-11-06 15:34:11 -05:00
eric
43ea692802
It turns out that "congratulations" triggers spam filters
2013-11-06 15:22:30 -05:00
eric
ca540c4cb4
wired up claim notifications [ #37257639 ]
2013-11-06 14:58:50 -05:00
eric
499378ccf7
improve bad epub error handling
2013-11-05 00:57:15 -05:00
eric
1944f1dd9e
Address AM 11/4 comments
2013-11-04 13:24:43 -05:00
eric
dd84c36418
subsume calculator view into faq view
2013-11-03 00:27:52 -04:00
eric
b5db02e1d0
incorporate AM suggestions into FAQs
2013-11-03 00:07:52 -04:00
eric
ebea84427a
repeated "visited the" typo
2013-11-02 15:31:28 -04:00
eric
0f38e35368
no empty-list slideshows on library page
2013-11-02 13:31:39 -04:00
eric
f1a5a89ba7
update purchase notification to indicate multiple copies
2013-11-01 16:32:10 -04:00
eric
6bdbe1d046
user can buy multiple library licenses [ #59827932 ]
...
also, some logic needed cleaning for setting expires on reserves
2013-11-01 16:15:01 -04:00
eric
143b24c368
acquired ebooks failed to show if wishlist empty [ #59972462 ]
...
some complicated interaction with wishlists because this template
copies a user's
2013-11-01 14:33:52 -04:00
eric
6ce980810e
library_join notification to library should differ from not to user
2013-11-01 14:30:41 -04:00
eric
c79572e8e4
notifications when user joins library or user borrows a book
2013-10-31 12:26:43 -04:00
Raymond Yee
0d103f2768
Merge pull request #225 from Gluejar/library_inserted_page
...
added cases for library licenses
2013-10-30 14:55:14 -07:00
eric
75ef87a11a
added cases for library licenses
2013-10-30 11:44:02 -04:00
eric
a73e62f5d0
add links to calculator
2013-10-30 09:53:02 -04:00
eric
2f8d4bc0c4
[finish #59785084 ] review campaign instructions
2013-10-30 09:12:04 -04:00
eric
7254dcd55e
list of library users
...
visible to other library users and unglue.it staff
2013-10-27 13:15:18 -04:00
Raymond Yee
eacb801af9
Merge pull request #221 from Gluejar/add_libraries
...
Add libraries
2013-10-22 16:02:26 -07:00
eric
0d81e22ff1
add "reserve" to purchase page
2013-10-20 14:18:17 -04:00
eric
53d9f2c8be
library ungluer list is library members
2013-10-19 21:01:10 -04:00
eric
76562f83ad
fix test errors
2013-10-19 17:27:53 -04:00
eric
cc8375bf4a
bookpanel reflects in-library and out on loan state
2013-10-19 16:54:09 -04:00
eric
6e7344d8a4
and now, you can borrow a library book! yay!
2013-10-18 15:35:48 -04:00
eric
60cd2f626b
borrowability reflected on work page
2013-10-18 13:33:47 -04:00
eric
93d128102e
display of borrowability and library holdings
...
needed another date column on acqs to manage this
bookpanel getting complicated- moved some logic into tempalte tags
library page now shows b2u books it owns
"library" has its own view now
2013-10-18 12:36:55 -04:00
eric
6910f1aa0c
cleanup of supporter view
2013-10-17 12:44:47 -04:00
eric
90e1e56405
<pre> section was causing width overflow, added calculator link
2013-10-17 08:39:21 -04:00
eric
b9b5f9e389
download changes a reserve to a borrow
2013-10-16 22:53:47 -04:00
eric
c2649f6ab2
implemented borrowing methods, "BORROWED" license acq, RESERVES
...
includes a schema migration!
2013-10-16 22:48:29 -04:00
eric
e6573ac0c5
library user can buy a library license
2013-10-15 16:18:30 -04:00
eric
99c7b73d4a
purchase page reflects library membership and purchased status
2013-10-14 22:51:48 -04:00
eric
4710c5d413
Merge branch 'master' into add_libraries
2013-10-14 18:20:14 -04:00
eric
6e5eab447c
whoops! more tou changes
2013-10-14 13:43:08 -04:00
eric
882feda6c3
now reviewed by attorney
2013-10-14 11:22:42 -04:00
eric
b1d8b2338a
list of unlguit libraries at libraryauth/list/
2013-10-12 22:39:47 -04:00
eric
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
eric
29d000b39b
fix test for libraries
2013-10-12 19:14:17 -04:00
eric
157d41eead
make the purchase options reflect user libraries
2013-10-11 17:50:54 -04:00
eric
a57fa7e822
one more nit
2013-10-11 15:19:56 -04:00
eric
fcc1876859
Revisit manage_campaign page for b2u
2013-10-11 12:50:59 -04:00
eric
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
eric
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
eric
2f703a7815
Merge branch 'master' into add_libraries
2013-10-07 12:35:55 -04:00
eric
56a4856080
wording tweak
2013-10-07 12:35:26 -04:00
eric
ec7a3155b2
exclude incomplete transactions from event display on landing page
2013-10-05 11:41:12 -04:00
eric
19101a3109
ungluing date calculator and many documetation improvements
2013-10-03 22:54:25 -04:00
eric
076ce51efd
draft of revised TOU
2013-10-02 17:21:22 -04:00
eric
b7393e7825
change copyright notice per lawyer
2013-10-02 12:09:26 -04:00
eric
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
eric
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
eric
0d14b9ac3e
mis-spellings, we're not selling pdf yet
2013-09-27 14:01:10 -04:00
eric
b091612605
Merge branch 'master' into b2u_errata
...
Conflicts:
frontend/views.py (kindle config bug already fixed)
2013-09-26 09:57:06 -04:00
eric
93b7ffc951
Improve language on campaign pages, make text bigger
2013-09-26 09:49:39 -04:00
eric
5976803cb4
fix bug in kindle config, improve doumentation
2013-09-26 09:36:03 -04:00
eric
9b5a254f1d
Adapt marc record machinery to B2U titles
2013-09-23 12:39:47 -04:00
eric
be711e142d
cleaned up marc file storage issues before implementing b2u
...
MIGRATION!
1. multi-record marc files no longer saved, sent to user directly
2. works with both s3 and file system- default storage by name used for
both read and write.
3. stupid storage of computed filenames/urls eliminated
4. removed verbose logging
5. no need to have pymarc write to a StringIO
6. the MARCRecord.clean method didn't do anything
2013-09-23 00:34:51 -04:00
eric
99fe9f9011
rewrite license page
2013-09-20 17:46:06 -04:00
eric
ed341884ea
add license page to epub before sending it for watermarking
2013-09-15 21:43:58 -04:00
eric
2e58255e6c
readmill downloads can't have mixed redirects
2013-09-11 11:31:20 -04:00
eric
4038ea53e7
fix Kindle_config 404
2013-09-09 15:48:27 -04:00
eric
4509cea6dd
only 2 o's in ebook
2013-09-09 15:20:58 -04:00
Raymond Yee
2329f9b088
Merge branch 'master' into preview_pledge
2013-09-09 08:32:56 -07:00
Raymond Yee
2b11153fc6
Merge pull request #205 from Gluejar/messages_notices
...
Notices, not Messages
2013-09-09 08:30:38 -07:00
eric
63f0ee3794
Remove pledge form error when campaign is not active. [ #56565596 ]
2013-09-09 09:54:16 -04:00
eric
de17f02298
[ #56528504 ] fixed lanfing page for purchases
2013-09-06 22:19:46 -04:00
eric
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
eric
4b3c899088
[ #55666760 ] make fund-complete page sensetive to action
2013-09-06 13:58:23 -04:00
eric
6294c15aad
TGFT
2013-09-06 00:14:06 -04:00
eric
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
eric
5bb359fb1e
safe_get_work not used everywhere it should have been
2013-09-05 16:14:51 -04:00
eric
0ba5c9a00e
cleanup, plus tests
2013-08-27 18:03:35 -04:00
eric
e51fa1190e
wired watermarker into file uploads. migration needed
2013-08-26 23:56:01 -04:00
eric
e5a162061d
only epub files to be uploaded for now
2013-08-26 23:54:19 -04:00
eric
cbc34db3d7
fix bug found by luc
2013-08-22 16:12:27 -04:00
eric
1c33c34f21
purchase complete notification, contextual wishlist active, fulfillment in signal handler
2013-08-22 14:30:56 -04:00
eric
3bdb755419
move constant to params file to improve import
2013-08-22 14:22:54 -04:00
eric
bec85ff82e
1st crack at faq revision
2013-08-20 14:11:11 -04:00
eric
ff2d995cd5
minor wording changes
2013-08-20 12:41:39 -04:00
eric
159ad0db05
fix tests, fix bugs found by tests
2013-08-20 01:01:36 -04:00
eric
80d78e624f
remove amazon cruft to get current_total correct
2013-08-19 23:23:27 -04:00
eric
18c836d6cd
connect purchases to the new Acq table which records purchases
2013-08-19 22:54:43 -04:00
eric
91f7c5f23d
Remove some payment dependence on campaign details
2013-08-19 22:52:22 -04:00
eric
26c4d522b4
made the cc_date and test consistent whether its a date or a datetime
2013-08-19 16:01:32 -04:00
eric
4a3cfc6840
Merge branch 'master' into ebook_selling
2013-08-18 18:11:13 -04:00
eric
94eb6aeab0
Demphasize "wishes" on the website in preparation for B2U
2013-08-18 18:10:25 -04:00
eric
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
Raymond Yee
c007df0803
Merge branch 'master' into social_auth_password
2013-08-17 17:41:15 -04:00
eric
c88f8165ba
Merge branch 'master' into ebook_selling
2013-08-16 15:50:24 -04:00
eric
837de35375
selling now works up to purchase page
2013-08-16 15:49:44 -04:00
eric
f607ab026d
Make sign-up box validate and make error notices less in-your-face
2013-08-15 12:43:20 -04:00
eric
d941686c50
now does password reset for a socialauth account
2013-08-14 17:29:38 -04:00
eric
c415340356
change Pledge button to Purchase
2013-08-13 23:47:55 -04:00
eric
40bcf62f99
edition.ebooks is always true
2013-08-12 17:22:55 -04:00
eric
2c06139a6f
make dollar/day a float validate cc_date_initial, max target prevent changes after launch
2013-08-10 16:29:58 -04:00
eric
7f325c0775
Finish B2U Campaign setup
2013-08-09 19:00:54 -04:00
eric
75c32569e2
B2U campaign percentages
2013-08-08 22:32:58 -04:00
eric
c2f3910fe8
set approriate open campaign params
2013-08-08 22:32:12 -04:00
eric
587323196a
Merge branch 'master' into ebook_selling
2013-08-08 20:02:25 -04:00
eric
e64c128f7e
Merge branch 'master' into ebook_selling
...
Conflicts:
frontend/forms.py
2013-08-08 19:59:29 -04:00
eric
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
eric
69f9e1838f
harmonization with master for merge
2013-08-08 18:21:33 -04:00
Raymond Yee
27bc134fa4
Merge branch 'expiring_cc' of github.com:Gluejar/regluit into expiring_cc
2013-08-08 12:28:36 -04:00
Raymond Yee
a9b5d51b36
Merge branch 'master' into expiring_cc
2013-08-07 22:59:37 -04:00
Raymond Yee
f30d662cd9
Merge branch 'master' into marc_provision
2013-08-07 22:10:01 -04:00
eric
1bd2918bc3
Merge branch 'master' into ebook_selling
2013-08-07 15:21:57 -04:00
eric
69e3ec0722
Add path back to landing in faq menu
2013-08-05 17:41:38 -04:00
eric
a1b8ac6dba
change Rghts tab to More… tab
2013-08-05 17:40:42 -04:00
eric
e78d5c7472
clean up account update notices
2013-08-05 12:18:51 -04:00
eric
f2fbfed79e
Merge branch 'master' into expiring_cc
2013-08-03 16:19:53 -04:00
eric
84c18ee65d
Make sure current staff is described accurately on ungluue.it site
2013-08-01 19:28:20 -04:00
eric
cf640baff8
fix problem found with token test
2013-07-29 21:38:16 -04:00
eric
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
eric
a5cc59d6f9
filter marc records based on a user's wishlist
2013-07-29 17:59:52 -04:00
eric
9b901d838c
token test for marc page
2013-07-29 16:49:50 -04:00
eric
1872180c22
add upload MARC link to work page
2013-07-29 16:35:50 -04:00
eric
8576a7fb7b
Make marc records accessible from work page
2013-07-29 15:57:33 -04:00
eric
1307ae7091
move 856 documentation to template from settings
2013-07-26 22:31:41 -04:00
eric
2c75ecb9ce
html nits
2013-07-26 21:01:19 -04:00
eric
eff880ce0b
get license from database, not from the record submitter
2013-07-26 19:52:15 -04:00
eric
91e2d41b67
moved the link target pref into a library prefs only table
2013-07-26 18:30:45 -04:00
Andromeda Yelton
d2f3a2547e
change default
2013-07-26 16:12:24 -04:00
Andromeda Yelton
767733ea26
anon user friendly
2013-07-26 16:12:10 -04:00
Andromeda Yelton
32f6546a04
spinny thing should go away if they want to use the form again
2013-07-26 08:59:31 -04:00
Andromeda Yelton
8281d99563
edge cases
2013-07-25 10:25:14 -04:00
Andromeda Yelton
3a9e588fc7
replacing confusing field names
2013-07-25 10:18:36 -04:00
Andromeda Yelton
da08afd0b8
now users can select the MARC records they want and get as single download
2013-07-24 14:52:01 -04:00
Andromeda Yelton
ec57b7efee
user preference affects which MARC records we make available
2013-07-23 16:07:47 -04:00
Andromeda Yelton
bb5c1079b6
user can now change marc preferences
2013-07-23 12:23:04 -04:00
Andromeda Yelton
287f017551
documentation for CC/PD MARC records
2013-07-22 14:23:59 -04:00
Andromeda Yelton
f18fc27f91
Merge branch 'marc_provision' of github.com:Gluejar/regluit into marc_provision
2013-07-19 15:34:53 -04:00
eric
1bebec42af
what about public domain ebooks?
2013-07-19 13:13:53 -04:00
eric
4c62a2b555
catch bad file errors
2013-07-19 12:47:36 -04:00
Andromeda Yelton
9cb3dcdadf
documenting how you get MARCXML from LOC
2013-07-19 09:56:47 -04:00
Andromeda Yelton
516c8c768a
I can harvest files from the db instead of tempting error by entering them twice
2013-07-18 16:36:01 -04:00
Andromeda Yelton
0e143b15ba
persist information about where to find AWS files
2013-07-18 15:49:54 -04:00
Raymond Yee
37ce78fda2
Merge branch 'master' into expiring_cc
2013-07-17 18:12:30 -07:00
Andromeda Yelton
54e422e217
parametrizing formats and license choices, bugfixing
2013-07-17 13:03:35 -04:00
Andromeda Yelton
87c27cecee
wiring ungluify_record to front end and s3
2013-07-17 10:34:01 -04:00
Andromeda Yelton
e5a907644c
Merge branch 'master' into marc_provision
2013-07-16 11:43:28 -04:00
Andromeda Yelton
fe2e3b72c5
argh
2013-07-16 11:42:17 -04:00
Raymond Yee
dabaa2f843
update tests to account for new events (now stripe allows multiple cards/customer and now generates card related events in addition to customer events)
2013-07-15 14:52:29 -07:00
Andromeda Yelton
e3b6288e23
iterating unglify script, starting to integrate into front end
2013-07-15 16:35:41 -04:00
Andromeda Yelton
5f10047691
clarifying
2013-07-15 08:38:20 -04:00
Andromeda Yelton
bbeb086cbc
bugfixing
2013-07-08 15:54:36 -04:00
Raymond Yee
46d1d4f767
Merge branch 'master' into expiring_cc
...
Conflicts:
payment/models.py
payment/tests.py
2013-07-08 10:52:44 -07:00
Andromeda Yelton
214467e8f1
display available MARC records
2013-07-08 11:14:09 -04:00
Andromeda Yelton
6e853fc8f9
exclude google books, align error message with page text
2013-07-05 09:05:26 -04:00
Andromeda Yelton
8ff9bfc52f
filesize under Amazon SES 10MB limit
2013-07-05 08:43:02 -04:00
eric
c88e002ccb
get manage campaign to work a second time
2013-07-01 03:20:58 -04:00
eric
7eeb114d03
tweek status messages
2013-06-29 23:14:33 -04:00
Raymond Yee
9205dd6f3d
patch to limit attempts to send to kindle files that are on the order of the size of OLA --> Amazon SES has 10 MB limit
2013-06-27 14:14:54 -07:00
Raymond Yee
221a4bbfd2
Merge pull request #186 from Gluejar/fix_worklist_ordering
...
remove conflicting "order by"
2013-06-27 13:22:21 -07:00
eric
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
eric
b0f4eda221
show offers on work page
2013-06-27 13:10:33 -04:00
eric
98ba975eec
remove conflicting "order by"
2013-06-27 12:00:47 -04:00
eric
51c86867a0
don't pop a param that isn't there
2013-06-27 10:31:01 -04:00
eric
f2f02237a8
fix KeyError at source, not in test
2013-06-26 14:36:04 -04:00
Andromeda Yelton
14051e2f21
pop kindle email from session after use
2013-06-26 09:46:56 -04:00
Andromeda Yelton
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
Andromeda Yelton
8395a4afb4
other things have logos, readmill should too
2013-06-26 09:31:26 -04:00
eric
bb5bc2112d
add readmill and send to kindle instructions
2013-06-25 17:42:06 -04:00
eric
6dd6d7de5a
add instructions and png for embedded browser
2013-06-25 17:41:14 -04:00
eric
e92532524f
merge session.next_page into cookie.next functionality
2013-06-25 16:02:12 -04:00
eric
fbe37359f2
simplify kindle_config view and add link to the work page
2013-06-25 16:01:08 -04:00
eric
ff65b6b7dd
validation nit
2013-06-25 15:59:00 -04:00
eric
f79c456f53
I don't like putting None in a dict, especially when it bloats the code
2013-06-25 01:35:09 -04:00
eric
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
eric
e33077138f
move ebook id to title attribute
2013-06-25 01:09:36 -04:00
Andromeda Yelton
bcec6d4914
no smtp auth failures for you
2013-06-24 15:42:51 -04:00
Andromeda Yelton
aa7e5bfe5e
kindle instructions
2013-06-24 14:52:03 -04:00
Andromeda Yelton
50fce4bb1a
sharing->email
2013-06-24 14:28:01 -04:00
Andromeda Yelton
1380040bd2
Merge branch 'simpler_download' of github.com:Gluejar/regluit into simpler_download
2013-06-24 13:56:39 -04:00
Andromeda Yelton
69f0451bea
segregate flows of one-click and information-seeking options, address feedback
2013-06-24 13:53:28 -04:00
Andromeda Yelton
3c950966bc
Merge branch 'master' into simpler_download
2013-06-24 08:36:51 -04:00
eric
5d1f6fa224
quick fix for readmill
2013-06-20 14:34:44 -04:00
eric
5fe6f5d3a0
no campaigns *right now*
2013-06-18 09:39:57 -04:00
eric
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
eric
1ea77acf09
move latest ending logic from form to model/settings
2013-06-17 18:53:28 -04:00
Andromeda Yelton
9e5f41968b
download options should be sensitive to filetype
2013-06-17 18:53:28 -04:00
Andromeda Yelton
cd504780e6
redesigning information flow to address feedback
2013-06-17 18:53:28 -04:00
Andromeda Yelton
8fd153f085
rewiring to remove buttons
2013-06-17 18:53:28 -04:00
eric
1e310e8896
fix overzealous global replace
2013-06-14 23:09:55 -04:00
Andromeda Yelton
7070f033e7
download options should be sensitive to filetype
2013-06-12 15:24:26 -04:00
Andromeda Yelton
2337676e1c
redesigning information flow to address feedback
2013-06-12 15:11:43 -04:00
Andromeda Yelton
8e00242c35
Merge branch 'simpler_download' of github.com:Gluejar/regluit into simpler_download
2013-06-12 14:05:46 -04:00
Andromeda Yelton
0819c77312
rewiring to remove buttons
2013-06-12 14:05:30 -04:00
eric
a5af94be7a
add user agent inspection
2013-06-10 12:58:19 -04:00
Andromeda Yelton
e21b002b6a
Merge branch 'master' into simpler_download
2013-06-10 11:59:19 -04:00
Andromeda Yelton
704fdc5b60
Merge branch 'simpler_download' of github.com:Gluejar/regluit into simpler_download
2013-06-10 11:58:03 -04:00
Andromeda Yelton
3b159db315
email validation
2013-06-10 11:57:59 -04:00
Andromeda Yelton
afe7e3ca54
kindle sending should only fire if we have an address on file
2013-06-10 11:23:06 -04:00
eric
1a6107d025
this is how you log an exception
2013-06-10 11:12:54 -04:00
Andromeda Yelton
778983efb5
see if this fixes the formatting error
2013-06-10 11:08:48 -04:00
Andromeda Yelton
ff8f063b7f
provide backlink
2013-06-10 09:57:18 -04:00
Andromeda Yelton
8eb45252b6
correctly log exception
2013-06-10 09:57:12 -04:00
Andromeda Yelton
2fb93dbbef
login or account creation after kindle sending now adds kindle email to profile
2013-06-10 09:29:18 -04:00
Andromeda Yelton
e71ccfcfa5
add kindle email to user profile after login or account creation
2013-06-07 11:22:54 -04:00
Andromeda Yelton
b23b617e4b
prompt not-logged-in users for kindle delivery email
2013-06-07 10:19:06 -04:00
Andromeda Yelton
b98a36d8e8
should be a view for coming-soon campaigns
2013-06-05 15:08:29 -04:00
Andromeda Yelton
6dbdc243e3
prevent overflow of books onto second line
2013-06-05 15:06:07 -04:00
Andromeda Yelton
c8ff245e80
show coming soon campaigns if none active, or skip section if none initialized either
2013-06-05 15:05:14 -04:00
Andromeda Yelton
63d87434ab
android instructions were slightly wrong. tested, fixed.
2013-06-05 14:53:14 -04:00
Andromeda Yelton
72b0977914
clarifying filetypes
2013-06-05 11:21:52 -04:00
Andromeda Yelton
1fa713cf12
encourage downloading of readmill app
2013-06-05 11:15:05 -04:00
Andromeda Yelton
2f3f8997ad
make sure graceful degradation works, fix bugs
2013-06-05 11:06:07 -04:00
Andromeda Yelton
f4ffd5da6f
Merge branch 'master' into simpler_download
2013-06-04 10:48:49 -04:00
Andromeda Yelton
8a859e6757
provide feedback, protect against file-too-big error
2013-06-04 10:22:11 -04:00
Andromeda Yelton
0273a907da
skeleton of error handling
2013-06-03 17:18:42 -04:00
eric
dd72b0d997
add the downoad_count to form exclude
2013-06-03 16:23:21 -04:00
Andromeda Yelton
ad69580b2d
PEP 8, PEP 328. I feel better now.
2013-06-03 12:31:39 -04:00
Andromeda Yelton
4354d3abee
now kindle sending usually works
2013-06-03 11:17:25 -04:00
Andromeda Yelton
b3181f0e22
first pass at sending kindle files as attachments
2013-05-31 17:15:22 -04:00
Andromeda Yelton
236302342e
users can add and change kindle email
2013-05-31 15:19:58 -04:00
Andromeda Yelton
e75a7b9642
skeleton of send-to-kindle support
2013-05-31 11:34:51 -04:00
Andromeda Yelton
c797de93e6
download instruction buttons now work via ajax too
2013-05-31 10:46:26 -04:00
Andromeda Yelton
792d977a61
download page now prettifies via hijax links as well as download page
2013-05-30 09:17:34 -04:00
Andromeda Yelton
b5fd91006b
jquery to hide/show downloading options
2013-05-28 09:23:57 -04:00
Andromeda Yelton
b943e82012
CSS for streamlined downloads
2013-05-24 14:54:05 -04:00
Andromeda Yelton
177f60be0d
preparing HTML for streamlined downloading experience
2013-05-24 14:16:13 -04:00
Raymond Yee
31b978bb25
Merge branch 'master' into expiring_cc
2013-05-20 11:36:42 -07:00
Andromeda Yelton
830e1248c3
probably more efficient
2013-05-17 11:30:22 -04:00
Andromeda Yelton
2ecf4d94e4
work lists with active campaigns should highlight them
2013-05-16 11:43:25 -04:00
eshellman
8dbf20e143
added submit warning
2013-05-16 11:25:20 -03:00
eric
f2e6d10469
allow new edition id oclc but no isbn; allow new publishernames
2013-05-13 17:32:30 -04:00
Raymond Yee
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
Raymond Yee
b224e99346
Merge branch 'master' into expiring_cc
2013-05-08 14:05:57 -07:00
thatandromeda
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
eric
1788705bd7
fix bad links from stupid robots [ #49219467 ]
2013-05-03 14:48:36 -04:00
eric
6b7fb7fd00
fix ebook url in reverse method
2013-04-26 17:49:57 -04:00
Raymond Yee
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
Raymond Yee
7265488484
Merge branch 'master' into expiring_cc
2013-04-26 08:58:47 -07:00
eshellman
c5517df1c9
Merge pull request #167 from Gluejar/less_officious_comments
...
Less officious comments
2013-04-25 15:26:47 -07:00
Raymond Yee
a375112e72
Merge branch 'master' into expiring_cc
2013-04-24 13:50:33 -07:00
thatandromeda
babeb9e4aa
Merge pull request #164 from Gluejar/manage_book_data
...
Manage book data
2013-04-24 11:31:07 -07:00
Andromeda Yelton
e7cea6c8f4
clarifying
2013-04-24 14:30:39 -04:00
Andromeda Yelton
3b44e643d5
put status information in de gruyter initialized campaigns
2013-04-24 14:26:23 -04:00
Andromeda Yelton
aca759447d
test for staffness in template
2013-04-24 11:28:05 -04:00
eric
08d4adf50b
implement adromeda suggestions
2013-04-24 11:14:25 -04:00
Andromeda Yelton
80ee477198
disambiguate staff and RH
2013-04-23 10:22:08 -04:00
Andromeda Yelton
516f867d87
removing word 'official'
2013-04-23 10:07:59 -04:00
eric
fb77f5a372
fixed ebook admin to allow setting of counts, etc
2013-04-20 10:34:44 -04:00
eric
a2606b2e08
move download count display to work infobox and rh_tools
2013-04-20 10:08:10 -04:00
eric
de442c8f63
count downloads. migrate schemas!
2013-04-20 00:02:36 -04:00
eric
aaaa9e0e56
need a link to repeat the proces
2013-04-18 11:29:34 -04:00
Raymond Yee
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
Raymond Yee
3b900e2328
Align names signals.py with those in the short.txt for notices
2013-04-17 13:24:43 -07:00
Raymond Yee
86dcdea1b7
updated text for cc notices
2013-04-17 11:42:49 -07:00
eric
11381a99c9
add edition management links
2013-04-16 16:46:45 -04:00
eric
31a1f46666
add split works funtionality
2013-04-16 16:46:25 -04:00
eric
3c61e292d9
Fix edition editing, add other identifiers
2013-04-13 10:59:11 -04:00
Raymond Yee
9cc2e3121e
Merge branch 'master' into expiring_cc
2013-04-10 09:14:29 -07:00
Raymond Yee
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
eshellman
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
thatandromeda
70cf09403d
Merge pull request #163 from Gluejar/press_updater
...
missing </div>
2013-04-09 12:10:27 -07:00
eric
24392c5b3e
missing </div>
2013-04-09 15:07:30 -04:00
Andromeda Yelton
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
eshellman
97e750867b
Merge pull request #160 from Gluejar/press_updater
...
point press page at new version, tidy up submitterator
2013-04-09 05:46:05 -07:00
eric
1ee2d5c634
add a special response for failed social auths
2013-04-09 00:05:31 -04:00
Raymond Yee
74c8d52176
Restored mistakenly deleted import: 6cf42b1a67 (L0L43)
2013-04-08 13:51:08 -07:00
Andromeda Yelton
71306108b0
point press page at new version, tidy up submitterator
2013-04-08 14:16:08 -04:00
Raymond Yee
2bb69d9e82
Merge pull request #149 from Gluejar/verify_email_change
...
Verify email change
2013-04-08 07:28:32 -07:00
eric
6cf42b1a67
resolve conflict
2013-04-05 13:10:03 -04:00
eric
fabc7e6802
merge from master again except views
2013-04-05 13:07:13 -04:00
Andromeda Yelton
a3ca1d3867
press coverage should be ordered by date
2013-04-04 11:40:44 -04:00
Andromeda Yelton
a7adca844e
submitterator needs to allow us to submit past press coverage
2013-04-04 11:40:03 -04:00
Andromeda Yelton
04aa440cd2
including untracked files is fun and useful
2013-04-04 11:34:54 -04:00
Andromeda Yelton
57f7c81ec0
adds press item submission functionality
2013-04-04 11:09:18 -04:00
Andromeda Yelton
db0a967963
new press template and view
2013-04-04 10:15:29 -04:00
Andromeda Yelton
7e2d57b299
force css reload
2013-04-02 11:58:50 -04:00
eric
040cd6d144
add de gruyter news by hand
2013-04-02 11:21:44 -04:00
Raymond Yee
d861aafdc3
Merge branch 'master' into landing_page
2013-04-02 07:55:42 -07:00
Andromeda Yelton
7dd1b994cd
fixing syntax error
2013-04-01 10:28:19 -04:00
thatandromeda
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
Raymond Yee
f029da02c6
Merge pull request #154 from Gluejar/fix_null_search
...
fix error when search has no q
2013-03-30 10:31:36 -07:00
Raymond Yee
f958693931
Merge pull request #150 from Gluejar/add_publisher_model
...
Add publisher model
2013-03-30 10:03:30 -07:00
Raymond Yee
1992c15c65
put production into maintenance mode
2013-03-30 09:55:32 -07:00
Raymond Yee
1f522e0112
maintenance mode
2013-03-30 09:47:45 -07:00
eric
d19b9e7d8e
fix error when search has no q
2013-03-29 21:11:01 -04:00
eric
2aabf09161
merge from master
2013-03-29 19:41:28 -04:00
Andromeda Yelton
1a5477b271
as we can link straihgt to the comments tab, let's
2013-03-29 16:25:58 -04:00
Andromeda Yelton
b5af0fd98b
Merge branch 'landing_page' of github.com:Gluejar/regluit into landing_page
2013-03-29 16:24:34 -04:00
Andromeda Yelton
d90c8580e4
adds arrows for more, removes placeholder, changes header bars to pale-blue
2013-03-29 16:23:43 -04:00
Andromeda Yelton
35b4c7b91f
remove placeholder until I come up with a video to go here
2013-03-29 15:23:37 -04:00
eric
097127ab7c
resolve conficts in merge from master
2013-03-29 12:03:15 -04:00
eric
1ace0a5479
"login to add" now adds, uses triple login page [ #30497175 ]
2013-03-29 11:50:07 -04:00
Raymond Yee
63c6b35a30
Merge branch 'master' into add_publisher_model
2013-03-29 08:43:15 -07:00
Raymond Yee
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
Raymond Yee
44daa18f30
Merge branch 'master' into add_publisher_model
2013-03-28 22:46:38 -07:00
eric
5bb546bd0d
fixed bad url
2013-03-28 14:16:52 -04:00
Andromeda Yelton
520beedfc7
made it faster
2013-03-28 11:38:40 -04:00
Andromeda Yelton
9661c97bf3
whoops ordering queryset on wrong thing
2013-03-28 11:12:55 -04:00
Andromeda Yelton
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
Andromeda Yelton
17a9847b66
segregating learn_more area css fully into learnmore.less
2013-03-28 10:38:57 -04:00
eric
24a08d2979
Implement Andromeda suggestions
2013-03-27 21:46:52 -04:00
eric
70beef83d5
display of works in our db were being excluded from google search results
2013-03-27 21:31:30 -04:00
eric
8366b08c69
get email_change working again
2013-03-27 17:57:08 -04:00
Andromeda Yelton
af0d42b9ff
removed unused sharing features
2013-03-27 15:06:28 -04:00
eric
3a81db3804
Implement publisher and feedback email in campaign management
...
(feedback view made more flexible)
2013-03-27 12:22:30 -04:00
Andromeda Yelton
5c2b639e98
as seen on section
2013-03-27 10:33:47 -04:00
Andromeda Yelton
79ddb02df9
need to have a content-block id around book panels for greenpanel.js to bind
2013-03-26 15:31:44 -04:00
Andromeda Yelton
6e801e6841
adding bookish activity to main content area
2013-03-26 14:55:50 -04:00
eric
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
eric
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
Andromeda Yelton
7f59be6ada
kill crowdfunding graphic and slideshow
2013-03-26 13:55:14 -04:00
Andromeda Yelton
998f33c770
more exciting news feed for home page
2013-03-26 13:54:03 -04:00
Andromeda Yelton
b3a5e0ce45
add placeholder
2013-03-26 13:53:53 -04:00
eric
3bef92b484
Publishers can now be added in Admin
2013-03-26 10:56:49 -04:00
eric
90d01894d2
don't ask people to add books by publisher
2013-03-25 23:41:59 -04:00
eric
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
eric
d905f288d7
merge from master
2013-03-22 16:45:41 -04:00
eric
c26f9e1505
merge from master
2013-03-22 16:39:23 -04:00
Andromeda Yelton
e4a39647b9
expand and rename who's ungluing what area
2013-03-22 15:47:03 -04:00
Andromeda Yelton
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
Andromeda Yelton
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
thatandromeda
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
eric
a5a000ef7f
triple sign-in form when non-logged-in user tries to pledge
2013-03-21 14:24:11 -04:00
eric
1fcd0e54ed
fixed bug that broke return path to pledge
2013-03-21 10:14:23 -04:00
eric
cc48ef8362
merge from master
2013-03-21 08:44:43 -04:00
eric
f3cbd82336
fix "On Wishlist" link when it's not my wishlist
2013-03-21 08:38:46 -04:00
Andromeda Yelton
9a15545567
Merge branch 'search_on_campaigns'
2013-03-20 16:46:40 -04:00
eric
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
eric
6ebdd1610d
urldecode the next path when pulled from cookie
2013-03-20 14:15:30 -04:00
eric
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
Raymond Yee
aca38d66a1
Merge branch 'master' into expiring_cc
...
Conflicts:
payment/tests.py
2013-03-20 09:41:30 -07:00
Raymond Yee
e8a87e498e
Merge branch 'list_by_a_publisher'
2013-03-19 20:30:16 -07:00
eric
25937e1016
fix stupid bug on page2+ of search result
2013-03-19 16:43:23 -04:00
eric
6de3b806a6
change name of book_panel stylesheet to force reload on deployment
2013-03-19 14:53:11 -04:00
eric
50ec6ddb06
merge from master
2013-03-19 14:38:09 -04:00
eric
a22e5e95e5
fix bad welcome page and login
2013-03-19 10:33:57 -04:00
eric
af8c3ff1fd
merge from master
2013-03-19 10:02:06 -04:00
eric
e2ab3d75a8
Big merge from master
2013-03-19 09:40:18 -04:00
eric
392a751abb
html nits
2013-03-18 22:07:19 -04:00
eric
bd9a746422
merge in master
2013-03-18 21:50:22 -04:00
eric
ff58e5cd97
add link to gravatar in ui
2013-03-18 16:30:43 -04:00
eric
937f17eb73
and now everything works again
2013-03-18 14:56:27 -04:00
Raymond Yee
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
thatandromeda
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
Andromeda Yelton
dc8dea0768
moving countdown out of context to models.py, standardizing button appearance
2013-03-15 15:51:17 -04:00
eric
014f15d8ee
start on the profile editor mods...
2013-03-14 21:42:00 -04:00
eric
7f64189284
create and deploy avatar_source and avatar_url
2013-03-14 15:43:24 -04:00
eric
6143c6a3aa
normalize invocation of supporter url, fix wrong user for comment links
2013-03-14 15:33:00 -04:00
Andromeda Yelton
db0eec3b6c
Merge branch 'master' into work_page_CTAs
2013-03-13 11:30:28 -04:00
eric
54d0aa1d59
merge master into seo
...
schema.org stuff into work page
2013-03-13 10:48:36 -04:00
eric
28045aed77
merge master into improve_registration
2013-03-13 10:40:20 -04:00
Raymond Yee
037c917d74
Change expected http response code from 302 to 200 on wishlist add to match change in UI.
2013-03-12 20:37:53 -07:00
eric
581944c3f9
fix bug on cancel pledge
2013-03-12 23:11:59 -04:00
eric
a4cc2ce1f0
misc template fixes
2013-03-12 21:58:29 -04:00
eric
7bf62d665e
rip out old password change code
2013-03-12 21:58:15 -04:00
eric
7cbbf31268
clean up templates
2013-03-12 21:25:39 -04:00
eric
131010300a
std install of email_change
...
decided not to use pip install because the code needs some mods, and
doesn't seem to be maintained.
2013-03-12 20:45:09 -04:00
Andromeda Yelton
2da23dbd64
Merge branch 'master' into work_page_CTAs
...
Conflicts:
frontend/templates/work.html
frontend/views.py
static/css/campaign.css
2013-03-12 15:59:24 -04:00
thatandromeda
7dc1f4cba3
Merge pull request #129 from Gluejar/manager_supporter_msgs
...
Managers and staff can send messages to supporters [#36991391 ]
2013-03-12 11:52:43 -07:00
Andromeda Yelton
fae6c8f3a9
reverting to earlir add-wishlist functionality
2013-03-12 14:48:20 -04:00
eric
cc2623e196
login form now remembers the username you picked [ #23965785 ]
2013-03-12 14:26:40 -04:00
eric
5dd70006c9
conditional to correct add-to-wishlist on slideshow [ #32295071 ]
2013-03-12 10:35:27 -04:00
eric
cb55922036
Doublecheck the merge
2013-03-11 22:46:26 -04:00
eric
57ebbc087e
merge master into work_page_CTAs
2013-03-11 22:39:48 -04:00
eric
c724786c97
remove redundant with clauses
2013-03-11 16:23:52 -04:00
eric
88c2edb58d
refactor
2013-03-11 16:09:40 -04:00
eric
4e8f1b2fdc
reshuffle back of bookpanel to allow front bottom buttons to be clicked
2013-03-11 15:38:04 -04:00
eric
55b30f494e
schema.org metadata!
2013-03-09 20:25:47 -05:00
eric
d3077c988b
links should not point to http from https
2013-03-09 13:29:03 -05:00
eric
303c53c82e
While I'm looking at this, make the cvc input a password [ #41678953 ]
2013-03-08 18:50:35 -05:00
eric
e757eae0a3
one line js fix
2013-03-08 18:33:10 -05:00
eric
a2329de3b1
merge master into improve_registration
2013-03-08 17:14:22 -05:00
eric
7ef408115e
fix one template
2013-03-08 16:46:33 -05:00
eric
800d0ffdeb
cleanup of css and js imports, also mapping
2013-03-08 14:16:24 -05:00
eric
62627a80cf
fix "next" behavior, poor sign-up/pledge flow [ #40841931 ]
...
Sign In lightbox had broken cookie pusher on reg/auth pages.
Many holes had developed that broke return-to-page-after-auth (for
example, sign-in from pledge page).
Sporadic encoding issues.
2013-03-08 02:43:11 -05:00
eric
339d4653ab
migrate and clean urls
2013-03-07 21:53:32 -05:00
eric
80536a491a
superlogin- failed logins check for socialauth and if so, as user to use it
...
superlogin injects extra_context into regular login method
2013-03-07 21:48:56 -05:00
eric
3ccad0770b
refactor work list templates
2013-03-06 21:54:48 -05:00
eric
a44a505157
optimize the shit out of work lists [ #45623361 ]
...
so, it turns out you need a migration to apply db-index changes to your
db. blazing speed ensues.
2013-03-06 21:54:12 -05:00
eric
9e65349336
turns out pubdate messes up distinct, MySQL doesn't support DISTINCT ON
2013-03-06 14:15:07 -05:00
Raymond Yee
14174ecb17
Merge pull request #135 from Gluejar/list_by_a_publisher
...
publisher name can now have a "/" in it. (changed URLs)
2013-03-06 10:22:32 -08:00
eric
760cbe70cf
publisher name can now have a "/" in it. (changed URLs)
2013-03-06 12:45:27 -05:00
Raymond Yee
8759dad546
Merge pull request #133 from Gluejar/list_by_a_publisher
...
basic by-publisher list [#45617641 ]
2013-03-06 08:37:18 -08:00
Raymond Yee
d82959c42f
small typo
2013-03-05 19:10:22 -08:00
eric
06b43ed8d1
basic by-publisher list [ #45617641 ]
...
a bit slow, but that's a separate issue.
Not conspicuously surfaces yet, look at the links in the editions list
in rights tab.
2013-03-05 16:18:54 -05:00
eric
4cd83d69d4
added logging so we know what happens when messages fail to send
2013-03-04 23:35:43 -05:00
eric
2153a6c589
added hover to message icon, moved css and js to files
2013-03-04 23:25:22 -05:00
eric
a56222426e
set queueing to use the master switch
...
use NOTIFICATION_QUEUE_ALL = False in m.py for testing
2013-03-04 23:11:50 -05:00
eric
14a6803b9f
mailchimp integration [finish #37732465 ]
...
need to pip install postmonkey
2013-03-04 17:01:33 -05:00
eric
989fff8926
Added unglue.it search at top of search page [finish #37199475 ]
2013-03-01 12:07:15 -05:00
eric
a53c99e295
decided that supporter_message signal belonged in core
2013-03-01 09:46:52 -05:00
eric
d08ca3efbd
Turns out site was already in context for notifications as "current_site"
...
Also, added sender to notification calls for messages and comments
2013-02-28 16:04:41 -05:00
Raymond Yee
7fef0a65f0
refining account_* notices
2013-02-27 15:18:32 -08:00
eric
819f532624
email message needed the full urls
2013-02-27 17:27:32 -05:00
eric
d7f73c1247
make wishlists more efficient
2013-02-26 15:30:14 -05:00
eric
282f877890
wire up msg view to wishlist_message notification [ #36991391 ]
2013-02-26 12:43:54 -05:00
eric
89221fbe82
ajax submission and error handling
2013-02-25 18:32:22 -05:00
eric
9811012bf3
fix rare bugs
2013-02-25 18:31:37 -05:00
eric
596d19596c
UI work for managers to contact supporters [ #36991391 ]
2013-02-21 15:10:01 -05:00
Raymond Yee
1852c62e32
Merge pull request #128 from Gluejar/more_instructions_for_RHs
...
put PDF instructions, and both video and PDF screencasts, in context of ...
2013-02-19 09:04:10 -08:00
Raymond Yee
da3d542587
Merge pull request #120 from Gluejar/no_staff_in_ungluers_list
...
No staff in ungluers list
2013-02-19 08:38:27 -08:00
Andromeda Yelton
ab28b7d492
put PDF instructions, and both video and PDF screencasts, in context of campaign editing area
2013-02-18 16:22:20 -05:00
Andromeda Yelton
499b079049
didn't need those classes both places
2013-02-18 12:12:41 -05:00
Andromeda Yelton
f674278b02
mouseover shows exact percent of goal
2013-02-18 11:58:38 -05:00
eric
08967a008e
html nit
2013-02-09 19:21:04 -05:00
Andromeda Yelton
61b2859a02
testing all the edge cases and editing accordingly
2013-02-08 15:55:43 -05:00
eric
1713998c4c
add google site tools verification while we're at it
2013-02-08 12:40:45 -05:00
eric
02f10de83a
review of html title tag for all pages
2013-02-08 10:12:28 -05:00
Andromeda Yelton
918ce0f904
aligning book detail layout in pledge and work pages
2013-02-07 15:25:14 -05:00
Andromeda Yelton
a060cf0f51
improving gradient
2013-02-07 14:10:00 -05:00
Andromeda Yelton
cf58570c2e
moving informational and call-to-action elements of work page
2013-02-07 13:37:54 -05:00
Andromeda Yelton
46d373d9dd
reformat URL reference for consistency with the rest
2013-02-07 09:10:20 -05:00