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
8ff9bfc52f
filesize under Amazon SES 10MB limit
2013-07-05 08:43:02 -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
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
221a4bbfd2
Merge pull request #186 from Gluejar/fix_worklist_ordering
...
remove conflicting "order by"
2013-06-27 13:22:21 -07: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
98ba975eec
remove conflicting "order by"
2013-06-27 12:00:47 -04:00
51c86867a0
don't pop a param that isn't there
2013-06-27 10:31:01 -04:00
f2f02237a8
fix KeyError at source, not in test
2013-06-26 14:36:04 -04:00
14051e2f21
pop kindle email from session after use
2013-06-26 09:46:56 -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
f79c456f53
I don't like putting None in a dict, especially when it bloats the code
2013-06-25 01:35:09 -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
5d1f6fa224
quick fix for readmill
2013-06-20 14:34:44 -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
8e00242c35
Merge branch 'simpler_download' of github.com:Gluejar/regluit into simpler_download
2013-06-12 14:05:46 -04:00
0819c77312
rewiring to remove buttons
2013-06-12 14:05:30 -04:00
a5af94be7a
add user agent inspection
2013-06-10 12:58:19 -04:00
e21b002b6a
Merge branch 'master' into simpler_download
2013-06-10 11:59:19 -04:00
704fdc5b60
Merge branch 'simpler_download' of github.com:Gluejar/regluit into simpler_download
2013-06-10 11:58:03 -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
1a6107d025
this is how you log an exception
2013-06-10 11:12:54 -04:00
778983efb5
see if this fixes the formatting error
2013-06-10 11:08:48 -04:00
ff8f063b7f
provide backlink
2013-06-10 09:57:18 -04:00
8eb45252b6
correctly log exception
2013-06-10 09:57:12 -04:00
2fb93dbbef
login or account creation after kindle sending now adds kindle email to profile
2013-06-10 09:29:18 -04:00
e71ccfcfa5
add kindle email to user profile after login or account creation
2013-06-07 11:22:54 -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
6dbdc243e3
prevent overflow of books onto second line
2013-06-05 15:06:07 -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
f4ffd5da6f
Merge branch 'master' into simpler_download
2013-06-04 10:48:49 -04:00
8a859e6757
provide feedback, protect against file-too-big error
2013-06-04 10:22:11 -04:00
0273a907da
skeleton of error handling
2013-06-03 17:18:42 -04:00
dd72b0d997
add the downoad_count to form exclude
2013-06-03 16:23:21 -04:00
ad69580b2d
PEP 8, PEP 328. I feel better now.
2013-06-03 12:31:39 -04:00
4354d3abee
now kindle sending usually works
2013-06-03 11:17:25 -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
830e1248c3
probably more efficient
2013-05-17 11:30:22 -04:00
2ecf4d94e4
work lists with active campaigns should highlight them
2013-05-16 11:43:25 -04: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
1788705bd7
fix bad links from stupid robots [ #49219467 ]
2013-05-03 14:48:36 -04:00
6b7fb7fd00
fix ebook url in reverse method
2013-04-26 17:49:57 -04: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
e7cea6c8f4
clarifying
2013-04-24 14:30:39 -04: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
fb77f5a372
fixed ebook admin to allow setting of counts, etc
2013-04-20 10:34:44 -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
70cf09403d
Merge pull request #163 from Gluejar/press_updater
...
missing </div>
2013-04-09 12:10:27 -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
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
1ee2d5c634
add a special response for failed social auths
2013-04-09 00:05:31 -04:00
74c8d52176
Restored mistakenly deleted import: 6cf42b1a67 (L0L43)
2013-04-08 13:51:08 -07: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
6cf42b1a67
resolve conflict
2013-04-05 13:10:03 -04:00
fabc7e6802
merge from master again except views
2013-04-05 13:07:13 -04:00
a3ca1d3867
press coverage should be ordered by date
2013-04-04 11:40:44 -04:00
a7adca844e
submitterator needs to allow us to submit past press coverage
2013-04-04 11:40:03 -04:00
04aa440cd2
including untracked files is fun and useful
2013-04-04 11:34:54 -04:00
57f7c81ec0
adds press item submission functionality
2013-04-04 11:09:18 -04:00
db0a967963
new press template and view
2013-04-04 10:15:29 -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
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
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
d19b9e7d8e
fix error when search has no q
2013-03-29 21:11:01 -04: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
520beedfc7
made it faster
2013-03-28 11:38:40 -04:00
9661c97bf3
whoops ordering queryset on wrong thing
2013-03-28 11:12:55 -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
1fcd0e54ed
fixed bug that broke return path to pledge
2013-03-21 10:14:23 -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
25937e1016
fix stupid bug on page2+ of search result
2013-03-19 16:43:23 -04: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
a22e5e95e5
fix bad welcome page and login
2013-03-19 10:33:57 -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
db0eec3b6c
Merge branch 'master' into work_page_CTAs
2013-03-13 11:30:28 -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
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
581944c3f9
fix bug on cancel pledge
2013-03-12 23:11:59 -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
7cbbf31268
clean up templates
2013-03-12 21:25:39 -04:00
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
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
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
fae6c8f3a9
reverting to earlir add-wishlist functionality
2013-03-12 14:48:20 -04:00
cc2623e196
login form now remembers the username you picked [ #23965785 ]
2013-03-12 14:26:40 -04:00
5dd70006c9
conditional to correct add-to-wishlist on slideshow [ #32295071 ]
2013-03-12 10:35:27 -04:00
cb55922036
Doublecheck the merge
2013-03-11 22:46:26 -04:00
57ebbc087e
merge master into work_page_CTAs
2013-03-11 22:39:48 -04:00
c724786c97
remove redundant with clauses
2013-03-11 16:23:52 -04:00
88c2edb58d
refactor
2013-03-11 16:09:40 -04:00
4e8f1b2fdc
reshuffle back of bookpanel to allow front bottom buttons to be clicked
2013-03-11 15:38:04 -04:00
55b30f494e
schema.org metadata!
2013-03-09 20:25:47 -05:00
d3077c988b
links should not point to http from https
2013-03-09 13:29:03 -05:00
303c53c82e
While I'm looking at this, make the cvc input a password [ #41678953 ]
2013-03-08 18:50:35 -05:00
e757eae0a3
one line js fix
2013-03-08 18:33:10 -05:00
a2329de3b1
merge master into improve_registration
2013-03-08 17:14:22 -05:00
7ef408115e
fix one template
2013-03-08 16:46:33 -05:00
800d0ffdeb
cleanup of css and js imports, also mapping
2013-03-08 14:16:24 -05:00
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
339d4653ab
migrate and clean urls
2013-03-07 21:53:32 -05:00
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
3ccad0770b
refactor work list templates
2013-03-06 21:54:48 -05:00
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
9e65349336
turns out pubdate messes up distinct, MySQL doesn't support DISTINCT ON
2013-03-06 14:15:07 -05:00
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
760cbe70cf
publisher name can now have a "/" in it. (changed URLs)
2013-03-06 12:45:27 -05:00
8759dad546
Merge pull request #133 from Gluejar/list_by_a_publisher
...
basic by-publisher list [#45617641 ]
2013-03-06 08:37:18 -08:00
d82959c42f
small typo
2013-03-05 19:10:22 -08:00
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
4cd83d69d4
added logging so we know what happens when messages fail to send
2013-03-04 23:35:43 -05:00
2153a6c589
added hover to message icon, moved css and js to files
2013-03-04 23:25:22 -05:00
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
14a6803b9f
mailchimp integration [finish #37732465 ]
...
need to pip install postmonkey
2013-03-04 17:01:33 -05:00
989fff8926
Added unglue.it search at top of search page [finish #37199475 ]
2013-03-01 12:07:15 -05:00
a53c99e295
decided that supporter_message signal belonged in core
2013-03-01 09:46:52 -05:00
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
7fef0a65f0
refining account_* notices
2013-02-27 15:18:32 -08:00
819f532624
email message needed the full urls
2013-02-27 17:27:32 -05:00
d7f73c1247
make wishlists more efficient
2013-02-26 15:30:14 -05:00
282f877890
wire up msg view to wishlist_message notification [ #36991391 ]
2013-02-26 12:43:54 -05:00
89221fbe82
ajax submission and error handling
2013-02-25 18:32:22 -05:00
9811012bf3
fix rare bugs
2013-02-25 18:31:37 -05:00
596d19596c
UI work for managers to contact supporters [ #36991391 ]
2013-02-21 15:10:01 -05:00
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
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
ab28b7d492
put PDF instructions, and both video and PDF screencasts, in context of campaign editing area
2013-02-18 16:22:20 -05:00
499b079049
didn't need those classes both places
2013-02-18 12:12:41 -05:00
f674278b02
mouseover shows exact percent of goal
2013-02-18 11:58:38 -05:00
08967a008e
html nit
2013-02-09 19:21:04 -05:00
61b2859a02
testing all the edge cases and editing accordingly
2013-02-08 15:55:43 -05:00
1713998c4c
add google site tools verification while we're at it
2013-02-08 12:40:45 -05:00
02f10de83a
review of html title tag for all pages
2013-02-08 10:12:28 -05:00
918ce0f904
aligning book detail layout in pledge and work pages
2013-02-07 15:25:14 -05:00
a060cf0f51
improving gradient
2013-02-07 14:10:00 -05:00
cf58570c2e
moving informational and call-to-action elements of work page
2013-02-07 13:37:54 -05:00
46d373d9dd
reformat URL reference for consistency with the rest
2013-02-07 09:10:20 -05:00
cf8b862738
handle undefined facets
2013-02-06 18:14:56 -05:00
c761d5819d
first pass at moving big button
2013-02-06 16:26:07 -05:00
243f7fe08c
looks weird when there are 0 ungluers
2013-02-06 15:05:05 -05:00
d2c6730d47
Merge pull request #117 from Gluejar/unglued_tabs_hijax
...
Unglued tabs hijax
2013-02-06 08:49:49 -08:00
baa39878ab
Merge pull request #119 from Gluejar/better_remove_language
...
addresses [#29777727 ]
2013-02-06 08:33:26 -08:00
7b15a80f79
Merge branch 'smashwords_link' of github.com:Gluejar/regluit into smashwords_link
2013-02-06 11:25:17 -05:00
12e2c9fcea
now faq subsection is expanded on smashwords page too
2013-02-06 11:24:05 -05:00
aa535ca38c
asking RHs to set price to zero
2013-02-06 11:23:16 -05:00
f998b1f93b
addresses [ #29777727 ]
2013-02-06 11:15:49 -05:00
852eec9a72
add that back in to highlight tabs properly
2013-02-06 09:57:27 -05:00
30dcab3d88
adding smashwords link to FAQ menu and improving URL hygiene
2013-02-06 09:09:20 -05:00
cd40fe99ef
making it faster
2013-02-04 13:32:21 -05:00
1afdd5e21f
bugfixing
2013-02-04 12:09:38 -05:00
8c07df1fb1
making load of books ajaxy to spare reload of rest of page
2013-02-04 11:28:58 -05:00
1c1f1faf72
first pass at separating unglued list into 3 tabs
2013-02-04 10:09:08 -05:00
fbe5774fa2
should have been removed, whoops
2013-02-01 13:28:14 -05:00
7a357edca1
updating
2013-02-01 10:05:05 -05:00
45c166155b
Merge branch 'libraries' of github.com:Gluejar/regluit into libraries
2013-01-26 17:36:40 -08:00
ae67b55de3
addressing feedback
2013-01-26 17:35:52 -08:00
028e16866c
resolve conflicts for merge master into libraries
2013-01-24 17:08:40 -05:00
efa847a5e1
fix html
2013-01-24 16:55:05 -05:00
e0973a5ccb
Merge pull request #110 from Gluejar/sharing_text
...
Sharing text
2013-01-24 13:26:12 -08:00
b9192c13d7
discoverabilty ftw
2013-01-21 12:24:18 -05:00
b895b86d21
libraries page has content
2013-01-21 12:02:35 -05:00
fc76059999
we weren't using that with statement
2013-01-21 12:02:23 -05:00
0b4578f65c
emailshare now accommodates shares not from a campaign or pledge page
2013-01-21 12:00:01 -05:00
95ae064e81
also need some content
2013-01-21 10:33:25 -05:00
68642169b0
need to add some context
2013-01-21 10:33:08 -05:00
2cc187145b
first draft of a what-libraries-can-do page
2013-01-21 09:09:26 -05:00
b5b2697c0b
everything's better with a clearing div
2013-01-17 16:18:41 -05:00
a322baa195
addressing pull request feedback
2013-01-17 15:46:31 -05:00
b3ef759221
Merge pull request #112 from Gluejar/pledge_links_to_work
...
Pledge links to work
2013-01-17 12:46:29 -08:00
c073529b58
Merge pull request #111 from Gluejar/proper_cc_text
...
Proper cc text
2013-01-17 12:44:57 -08:00
b7aabf1ca4
now the pledge page links back to the work
2013-01-17 15:37:03 -05:00
e00b43870c
it would be great if the embed thing actually worked
2013-01-16 13:08:21 -05:00
5fb880c9da
sharing options on download page
2013-01-16 12:50:20 -05:00
68b1fd9bf7
add sharing options to front matter
2013-01-16 12:10:36 -05:00
1887599595
more status-sensitive email share text
2013-01-16 11:23:28 -05:00
a27e319e5a
more status-sensitive twitter share text
2013-01-16 11:13:23 -05:00
db8977ca16
Merge pull request #107 from Gluejar/book_panel_nits
...
Book panel nits
2013-01-10 06:36:56 -08:00
a3c0848b79
making text more consistent with that suggested by official license chooser
2013-01-09 15:02:48 -05:00
9b2928bd0a
moar tutorials
2013-01-09 13:07:03 -05:00
3d1da688a5
unnecessary logic
2013-01-09 11:38:33 -05:00
e5f3eeacb5
try to correct logic for pledigng in list view
2013-01-04 19:21:34 -05:00
50808f3a89
users who have already pledged should not be offered Pledge CTA
2013-01-04 16:38:15 -05:00
fa7e0b20de
addressing feedback
2013-01-04 15:12:35 -05:00
23d48e6183
Merge branch 'master' into rh_help
2013-01-04 14:39:13 -05:00
aeabfa1fde
img measurements are already px
2013-01-04 13:34:50 -05:00
caafdcf38a
some lists looked wrong with new documentation list styling
2013-01-03 16:33:29 -05:00
38b436f647
action on booklist for active campaigns on wishlist should be pledge, not un-wishlist
2013-01-03 16:33:07 -05:00
8ec5f7e2a2
one more tutorial while I'm at it
2013-01-03 13:58:17 -05:00
a4de9a0040
adding some tutorials
2013-01-03 13:46:32 -05:00
924300267b
more pointers to contextually appropriate actions for RHs
2013-01-03 13:18:26 -05:00
5b1f3380b6
finish moving wish list "withs"
2013-01-02 20:46:02 -05:00
6e4f8fe3d7
configure wish list inside book_panel so it doesn't get omitted again
2013-01-02 20:26:20 -05:00
c2bc4f6b68
tidying visibly wrong things
2013-01-02 16:10:32 -05:00
8d321d46dc
final incorporation of all stray CSS changes
2013-01-02 15:55:10 -05:00
0a86448d98
addressing CSS comments and also fixing some invalid html
...
Conflicts:
frontend/templates/unglued_list.html
static/css/book_panel.css
static/css/lists.css
static/less/lists.less
2013-01-02 15:51:21 -05:00
4ac487a7c9
unwinding useful changes from discarded two-tab model
2013-01-02 15:48:49 -05:00
26b2f0c00f
Merge branch 'master' into list_tab_vertical_centering
2013-01-02 15:36:10 -05:00
cc4f748e36
update all list pages to have two-line tab content
2013-01-02 15:35:42 -05:00
a6186e3bc6
Merge pull request #90 from Gluejar/prettier_acks
...
prettifying acks page, make it easier to read
2013-01-02 10:54:24 -08:00
77c007c4ba
Revert "Revert "Merge branch 'prettier_acks' of https://github.com/Gluejar/regluit into prettier_acks""
...
This reverts commit c13cca20ea
2013-01-02 13:53:00 -05:00
c13cca20ea
Revert "Merge branch 'prettier_acks' of https://github.com/Gluejar/regluit into prettier_acks"
...
This reverts commit 949425c6cae305a1ee74
2013-01-02 13:37:01 -05:00
949425c6ca
Merge branch 'prettier_acks' of https://github.com/Gluejar/regluit into prettier_acks
2013-01-02 13:34:47 -05:00
0eebc7c28a
adjusting spacing around headers and clarifying dedication/dedicator relationship
2013-01-02 12:25:27 -05:00
e305a1ee74
Merge branch 'master' into prettier_acks
2013-01-02 10:53:05 -05:00
53a62c3764
Merge pull request #101 from Gluejar/successful_works_in_inglued_tab
...
Successful works in unglued tab; offset on "read it now" to be fixed.
2013-01-02 07:28:14 -08:00
b29032b1c8
Merge pull request #102 from Gluejar/default_unglued_tab
...
fix [#41795521 ]
2012-12-31 12:41:16 -08:00
c22403356c
Merge pull request #99 from Gluejar/correct_ungluing_date
...
add success_date property to campaign so we can accurately report it whe...
2012-12-31 12:28:47 -08:00
40cff261ba
fix [ #41795521 ]
2012-12-31 15:20:03 -05:00
4c1b64c154
update successful books in unglued tab on other tabbed pages
2012-12-31 14:57:01 -05:00
c8cb5937e8
need to apply correct styles for new status handling too
2012-12-31 13:58:42 -05:00
bf6cfb7cb2
Merge branch 'master' into successful_works_in_inglued_tab
2012-12-31 13:47:17 -05:00
92163d62e6
better querysets for work page tabs
2012-12-31 13:46:23 -05:00
7fd78d9349
Update frontend/templates/base.html
2012-12-31 13:07:18 -05:00
a19a060351
Merge pull request #100 from Gluejar/missing_parenthesis
...
it was missing a parenthesis
2012-12-31 08:54:56 -08:00
609c09c74d
it was missing a parenthesis
2012-12-31 11:12:55 -05:00
47c44b20d5
add success_date property to campaign so we can accurately report it when it differs from campaign deadline
2012-12-31 11:00:45 -05:00
7a0e2bfbd8
addressing ul, li, dt, dd comments
2012-12-19 10:22:11 -05:00
4a307a1e00
addressing CSS comments and also fixing some invalid html
2012-12-17 14:23:23 -05:00
ab2d3d51b6
Merge branch 'master' into unglued_books_tab
2012-12-14 10:46:11 -05:00
73266f07eb
line up icons better and more clearly indicate status of books with successful campaigns
2012-12-14 10:45:16 -05:00
7c88279603
Merge branch 'master' of github.com:Gluejar/regluit
2012-12-14 10:03:57 -05:00
b001aefeeb
separating unglued and PD works on ready-to-read page
2012-12-13 15:25:01 -05:00
136614b8ff
Merge pull request #96 from Gluejar/merge_works_management
...
staff only UI for merging works [finish #39297681 ]
2012-12-13 12:09:43 -08:00
ec4e1a7bb3
Merge branch 'master' of github.com:Gluejar/regluit
2012-12-13 09:55:14 -05:00
575d34d968
Update frontend/templates/base.html
2012-12-13 09:51:36 -05:00
fec7f33d9e
staff only UI for merging works [finish #39297681 ]
...
staff-only link in rights tab of every work!
2012-12-12 22:35:35 -05:00
7501c3fdae
prettifying
2012-12-11 13:17:33 -05:00
d73c1157b8
whoops lost some context in merge
2012-12-11 10:53:12 -05:00
bfbb74c0a2
providing next steps
2012-12-11 10:37:38 -05:00
1304a73790
Merge branch 'master' of github.com:Gluejar/regluit
...
Conflicts:
frontend/templates/metrics.html
frontend/views.py
2012-12-11 10:31:58 -05:00
43c9087d2b
Rewrite filter to include Transactions that are active or complete rather than filter out ones not to count.
2012-12-10 13:01:50 -08:00
33665abd37
Merge branch 'master' into pledges_on_info_page
2012-12-10 12:26:30 -08:00
61bb121a51
[ #37736995 ] the old error message for a CC error was potentially confusing -- I think this should be better -- see images in
...
https://www.evernote.com/shard/s1/sh/b59d4cfa-81a2-42bc-a315-24996fb01e83/2cfa234f2a15042ff0bb198514771dcb
2012-12-10 11:18:46 -08:00
c1c3b3d1ad
[ #40818125 ] minimum target to $500
2012-12-06 21:05:15 -05:00
23708e15ba
exclude uncollectable pledges
2012-12-06 15:31:32 -05:00
7decd15333
Revert "wanted to be able to track prospective revenue from info page"
...
This reverts commit 150ed860c9
2012-12-06 12:37:48 -05:00
150ed860c9
wanted to be able to track prospective revenue from info page
2012-12-06 11:42:02 -05:00
fd7c10863e
Merge pull request #91 from Gluejar/fix_lightbox
...
Fix lightbox. works for me.
2012-12-04 13:37:40 -08:00
f22312d735
Update frontend/templates/base.html
...
network of killers now live
2012-12-04 13:47:19 -05:00
88b4446bf0
force reload of hijax.js
2012-11-30 12:28:29 -05:00
0993d393d2
Merge pull request #88 from Gluejar/smashwords
...
Smashwords. Looks good for the first pass.
2012-11-29 10:58:15 -08:00
202c10b0fb
latest coverage
2012-11-29 12:04:05 -05:00
4fe73e110c
make sure to include new file location
2012-11-29 12:00:34 -05:00
0aef30015b
addressing comments
2012-11-29 11:20:13 -05:00
c4ac00e8ef
first pass at smashwords page
2012-11-29 10:54:07 -05:00
4d923aba5b
Merge branch 'master' into charge_failed
2012-11-27 12:19:21 -08:00
1cd50d716f
display submit buttons as loading gifs for transactions that might take a while
2012-11-27 13:32:25 -05:00
41f3da3d31
Merge branch 'master' of github.com:Gluejar/regluit into charge_failed
2012-11-26 14:36:40 -08:00
8692d26540
friendlifying
2012-11-26 14:23:04 -05:00
1976bb14d3
Update frontend/templates/notification/pledge_charged/short.txt
2012-11-26 13:45:12 -05:00
0b9827424f
Merge pull request #84 from Gluejar/pledge_sidebar
...
Pledge sidebar
2012-11-26 08:21:02 -08:00
6ab521faa1
Merge branch 'master' into charge_failed
2012-11-23 09:20:58 -08:00
28eca2999c
put checks for notices in proper context
2012-11-21 16:42:04 -08:00
db1fdc321e
Merge pull request #79 from Gluejar/ending_soon_notification
...
Ending soon notification
2012-11-21 14:05:26 -08:00
54a8a31c8c
Merge branch 'master' into pledge_sidebar
2012-11-21 17:00:33 -05:00
ea212bd167
Merge pull request #82 from Gluejar/empty_stripe_token
...
Empty stripe token reports error
2012-11-21 13:37:48 -08:00
ecea475419
a few modifications to pledge_failed notice
2012-11-21 11:40:19 -08:00
cbac6f1e3c
First round of edits to get pledge_charged and pledge_failed notices to be parallel. tests passing
2012-11-21 09:21:01 -08:00
ce6e7f865d
tests pass on this commit
2012-11-20 13:56:14 -08:00
0a0b74e449
Revert "Revert "make the html validate""
...
This reverts commit a215471abb
2012-11-20 15:53:24 -05:00
3ccb10a9aa
Merge branch 'pledge_sidebar' of github.com:Gluejar/regluit into pledge_sidebar
...
Conflicts:
frontend/templates/base.html
2012-11-20 15:51:37 -05:00
466f7b9689
ok, so this results in the same dom tree, though the css matching is off
2012-11-20 15:48:41 -05:00
a215471abb
Revert "make the html validate"
...
This reverts commit f5e3cc1670
2012-11-20 15:40:32 -05:00
f5e3cc1670
make the html validate
2012-11-20 15:28:45 -05:00
02b17ea81f
Merge branch 'master' into charge_failed
2012-11-20 12:08:36 -08:00
7fcd0ba3af
change css filenames so that we can force user refresh
2012-11-20 14:26:06 -05:00
9f43c9a43c
this one too
2012-11-20 13:41:00 -05:00
ba3c0d3871
& not &
2012-11-20 13:40:25 -05:00
c034e10b30
Putting in some code to record a PaymentResponse to track errors in stripelib.Execute
2012-11-20 09:28:10 -08:00
029cd9740d
that line looks better outside the form
2012-11-20 10:10:30 -05:00
810580779e
fixing nits
2012-11-20 10:06:40 -05:00
a2abb92038
makes pledge action clearer by describing in more contexts and using Pledge rather than Support
2012-11-20 09:56:04 -05:00
81e27e234e
decided that phrasing was confusing
2012-11-20 09:09:03 -05:00
8b3287d85d
Merge branch 'master' into charge_failed
2012-11-19 10:28:18 -08:00
Andromeda Yelton
Raymond Yee
eric
