19266d35ee
remove social_auth_reset_password
2017-09-22 14:50:35 -04:00
29df43156b
Merge remote-tracking branch 'Gluejar/master'
2017-09-14 12:42:42 -04:00
5ba314c0ab
fix missing book-cover class
...
(made that change too quickly!
2017-09-14 11:42:27 -04:00
fc23d6bbab
fixed issue with no ebook on ebf
2017-09-06 18:02:40 -04:00
d891a61bcd
uniform edition cover images
2017-09-04 17:10:23 -04:00
5bbeb45053
improve merge_works
...
work_relations were not being updated
2017-09-04 16:10:24 -04:00
c49281b84c
incorrect usage
...
Not sure why the error (tag not loaded) didn't occur on my local
machine.
the purchased tag is executed on the work template, no need to execute
on work_action. It adds values into the context object.
2017-08-27 14:18:50 -04:00
99d619fc2e
update template map
2017-08-25 16:16:28 -04:00
607c63914c
move right column to separate file
2017-08-25 16:16:04 -04:00
a52fd4a013
suppress xx relation display
2017-08-25 14:52:36 -04:00
84da8bde94
Merge remote-tracking branch 'Gluejar/master'
...
# Conflicts:
# frontend/views/__init__.py
# questionnaire/admin.py
# questionnaire/urls.py
# questionnaire/utils.py
# questionnaire/views.py
2017-08-21 12:02:48 -04:00
591fd23853
add ebook rights
2017-08-16 16:20:43 -04:00
3993ffa04a
add id links, refactor
2017-08-16 15:46:19 -04:00
218aef87f7
link to edit form for new ebookfiles
2017-08-15 16:53:27 -04:00
256f566a8b
omit the make id checkbox
2017-08-15 16:52:15 -04:00
711f2880fa
add ebook activation on edition edit
2017-08-08 12:39:23 -04:00
8de43cfda8
set user on ebooks loaded from webpage
2017-08-08 12:38:54 -04:00
0ebbb21d47
add source to EbookFile
...
Want to be able to avoid downloading duplicate ebooks
2017-08-08 10:02:25 -04:00
f9d31b0f51
fix glue resolution
2017-08-07 21:46:21 -04:00
389e9a1749
'format' is a built-in
...
test_file was not doing anything because format parameter not passed.
Didn't raise error because 'format' is a built-in function
2017-08-07 16:13:22 -04:00
e8bd8725cc
handle edition ids better
...
also, allow contributor to request unglue.it id
2017-08-04 17:12:05 -04:00
d5980bfd5b
Merge branch 'master' into edit-editions
2017-08-03 16:15:14 -04:00
08702a7b08
scrapes the metadata
...
also moves id validation to core
2017-08-03 16:15:06 -04:00
758e307516
Merge branch 'master' into edit-editions
...
# Conflicts:
# frontend/tests.py
2017-07-29 20:47:28 -04:00
b59ed38344
Fix stripe tests again
2017-07-28 13:13:18 -04:00
05af45d13e
delint
2017-07-28 12:45:17 -04:00
f1dd40fe00
delint
2017-07-28 12:40:34 -04:00
a745223e3c
fix brittle tests
2017-07-28 12:26:26 -04:00
2adf3cc7cd
handle isbn and goog lookups
2017-07-27 15:13:04 -04:00
db97a98ae8
https
2017-07-27 10:33:13 -04:00
52127faec9
put id creation at start of new edition form
...
this reworks the identifier creation UI
2017-07-26 17:33:38 -04:00
d85a272576
reorg forms module
2017-07-25 09:28:14 -04:00
85c4c3601c
small refactor
2017-07-25 08:21:26 -04:00
5c46c70fb1
delint and fix
2017-07-25 08:14:05 -04:00
d3eaf43228
start views reorg
2017-07-25 07:29:23 -04:00
3f9f84218e
update admin style
2017-07-19 14:26:04 -04:00
4cc0e0fe4f
delete regluit.questionnaire
2017-06-20 11:08:14 -04:00
75887aa789
eliminate bad template errors
2017-06-12 12:05:49 -04:00
eae65d7467
updates from gluejar/reqluit
2017-06-08 17:35:48 -04:00
8d7b2f7417
add completion date column
2017-05-19 13:46:12 -04:00
d3874e1ad7
wire up answer summaries
2017-05-02 17:10:06 -04:00
d7917a24d1
add oapen to supported targets
2017-04-17 13:47:51 -04:00
097d9db9b6
fix exception with missing format
2017-04-17 13:47:40 -04:00
5756f171dc
Merge pull request #665 from Gluejar/donations
...
add donation box to homepage
2017-04-03 16:59:52 -07:00
e9e38fa104
don't show links to search engines
2017-03-04 23:00:19 -05:00
7294a5c679
update doi regexp and display
...
https://www.crossref.org/display-guidelines/
2017-02-22 11:21:24 -05:00
d5c7a016ee
3 more instances of checking truth of a method
2017-02-13 13:48:17 -05:00
417f9eac58
add donation box to homepage
2017-02-13 13:33:26 -05:00
beaedc3210
add OS announce
2017-02-01 14:20:25 -05:00
5eebeae378
frontend tests run on fixtures
2016-12-29 14:11:17 -05:00
7d749f068a
revive settings files
2016-12-20 14:55:53 -05:00
9d5fe5e678
change target of links to PG/DOAB
...
and add facet links to explore panel
2016-12-09 14:58:19 -05:00
405af3b2e7
Merge pull request #646 from Gluejar/id-facets
...
Id facets
2016-11-14 11:21:40 -08:00
59e92b8efc
add facets for doab and gtbg
2016-11-10 16:21:57 -05:00
ab57985b33
expose gutenberg and doab status on work page
...
also, refactor id properties on work
2016-11-10 16:21:21 -05:00
c393740999
not sure when this slipped in
2016-11-09 16:21:31 -05:00
d95f81030f
add sanitization code to edition form
2016-10-20 15:24:47 -04:00
e31163164a
add distinct.
...
Needed to test this with multiple landings configured.
2016-10-17 13:37:22 -04:00
724f6f112e
Merge pull request #639 from Gluejar/fix-upload-doi
...
fix two form bugs
2016-10-11 14:02:32 -07:00
41d8f53268
fix two form bugs
...
1. fix doi regexp
2. supress validation error when file is uploaded, not url
2016-10-05 18:02:03 -04:00
b0663d435b
Merge branch 'master' into questionnaire_export
2016-10-05 15:43:51 -04:00
0e7320d4e8
integrate exports into unglue.it surveys
2016-10-05 15:36:20 -04:00
e0e96da968
Merge branch 'master' into versions-relations-ednotes
2016-09-29 14:02:23 -07:00
5fc4d631ff
split version into label and iter
2016-09-23 14:53:58 -04:00
81524ac5f0
work.authors() returns list of all authors
2016-09-23 10:16:26 -07:00
c730d70ea1
copy html template to txt
2016-09-20 08:18:38 -04:00
a2cb58800c
Merge branch 'master' into versions-relations-ednotes
2016-09-12 09:27:08 -07:00
40971359a7
put production into maintenance
2016-09-08 18:28:33 -07:00
24dc3c578d
Merge branch 'master' into dj18
2016-09-07 09:59:19 -07:00
6a86ffae07
put just into MAINTENANCE_MODE
2016-09-07 09:37:54 -07:00
62f44bee19
Merge branch 'master' into dj18
2016-09-06 17:18:28 -07:00
708634b99a
put just in maintenance mode (to remind myself how to do so) before doing so for production
2016-09-03 14:51:07 -07:00
dcda9f8f89
add format setting javascript
2016-08-26 12:27:48 -04:00
d1951bab75
add file upload to ebook submission form
2016-08-26 10:28:23 -04:00
7ad0d7f494
implemented ebook versions
...
It turned out that ebookfile handling needed revamping with the
addition of ebook versions; so this change turned out to be rather big.
2016-08-24 15:41:29 -04:00
221efdec6c
make it easier to find and edit ebook editions
2016-08-16 17:17:24 -04:00
363c86fd94
implement EditionNote
2016-08-16 17:16:44 -04:00
8f71b24b1b
make adding editions easier
2016-08-16 11:04:37 -04:00
b3cefc2d3c
implement related works
2016-08-15 18:28:39 -04:00
95fd91e283
pylint the forms
2016-08-15 16:12:27 -04:00
f6bbc5a548
pylint the views
2016-08-15 15:22:32 -04:00
9b0c91a439
implement age_level
2016-08-15 13:47:00 -04:00
abedff089c
add direct support for doi
2016-08-08 16:27:12 -04:00
33a1482cc7
refactor libraryauth
...
try to keep all the user reg stuff in libraryauth, in prep for
splitting it off
2016-07-28 15:28:05 -04:00
006aeaf66f
reverse by path is deprecated
...
https://docs.djangoproject.com/en/1.9/releases/1.8/#s-id3
2016-07-27 14:01:22 -04:00
ac541ec1a0
patterns in urlpatterns are deprecated
...
https://docs.djangoproject.com/en/1.9/releases/1.8/#s-django-conf-urls-p
atterns
Also, moved edit_user to libraryauth module with the rest of our user
reg and auth.
2016-07-27 13:02:47 -04:00
c457b268ec
modernize some heavily used templates
2016-07-25 14:50:19 -04:00
cd9e2cf8ea
fix more tests
2016-07-25 11:32:24 -04:00
e6c3b226f9
REQUEST is deprecated
2016-07-25 11:32:04 -04:00
8f4ca12483
fixed premium editing as validation is triggered by data
2016-07-24 18:50:48 -04:00
09fe1a5d32
switch from deprecated get_model a app registry
2016-07-24 18:39:36 -04:00
f28b4b2e6b
remove stray "url from future"
2016-07-24 14:00:25 -04:00
cafd163f77
deprecate profile
2016-07-23 12:09:18 -04:00
b1e6dcec4f
update tests for explicit fixture loading
2016-07-23 12:08:28 -04:00
f3cb6c9edf
switch to contrib_comments
...
removed in 1.8
2016-07-21 16:05:57 -04:00
05af9db11c
model forms need at least exclude
2016-07-21 15:52:07 -04:00
c01459c059
fixed kw editing for non-staff, added tests
2016-07-14 12:25:18 -04:00
5eaf6f5c73
Merge pull request #608 from Gluejar/remove-nonprofit
...
Remove nonprofit
2016-07-12 09:42:18 -07:00
0c3c9fa818
fix bug in buy as a gift
...
A bugfix broke "buy as a gift"
https://github.com/Gluejar/regluit/commit/f7bfdfbbc4cec73e0608f3fef5c335
ce0113078c
2016-07-12 09:00:32 -04:00
a6c1371ba5
remove the "nonprofit" campaign functionality
2016-07-08 10:57:01 -04:00
ca08c5caef
add googlebooks virtual urls to disallow
...
after we added author links, robots started creating db entries by
following links in search page
2016-06-28 14:56:59 -04:00
6d3c5f2aca
also harden the view
2016-06-20 13:16:37 -04:00
bb9bd032b1
fix unencoded queries in urls
2016-06-20 13:08:23 -04:00
12f298ee54
html nits
2016-06-16 18:20:48 -04:00
aa8189cd97
add alt text
2016-06-16 17:58:11 -04:00
5d50e85fd8
Merge pull request #593 from Gluejar/more-survey
...
More survey improvements
2016-06-15 11:45:28 -10:00
bc5c7a383b
Merge pull request #590 from Gluejar/author-search
...
add link to author name [#25583953 ]
2016-06-15 09:17:26 -10:00
8c21a124b4
added to claim faq
2016-06-14 11:37:13 -04:00
2b091e28e7
redirect to next on survey completion
...
Also, tweak style on complete page.
2016-06-13 17:34:51 -04:00
3330677b47
display number of surveys completed
2016-06-13 14:32:29 -04:00
a189b0a8c2
add link to author name
2016-06-06 13:49:22 -04:00
9c59b701ed
Merge pull request #587 from Gluejar/fix-survey-runinfo
...
Improve survey app
2016-05-31 16:13:34 -07:00
4df440ae46
fix survey completion
2016-05-31 17:46:08 -04:00
f99b621c19
Merge pull request #585 from Gluejar/push
...
FTP Push seconds on the onix file is a good idea
2016-05-30 10:30:34 -04:00
a40160f191
quick display and creation of landings
2016-05-26 12:19:33 -04:00
959c5aa187
remove signin link
2016-05-25 11:53:29 -04:00
f3d30615bb
remove unused blocktrans
...
Must have been a django version change
2016-05-25 09:12:37 -04:00
bf220c5c6f
Merge branch 'master' into push
...
# Conflicts:
# settings/common.py
2016-05-20 16:44:13 -04:00
66c0d84029
add work.formats()
2016-05-16 16:43:03 -04:00
8f3efc95ad
update aldiko logo and add to iOS views
2016-05-12 11:02:57 -04:00
1a2da6c523
Add dsr and aui marc relators
...
"designer" and "author of introduction" are the additional roles we
could have used
2016-05-12 11:02:22 -04:00
c5ee01df57
its the future!
2016-05-11 10:41:50 -04:00
240564e75b
remove template workaround for testing
2016-05-11 10:36:20 -04:00
f662920c2a
Merge branch 'master' into push
2016-05-10 17:33:54 -04:00
28291d436e
Merge branch 'master' into isbn-in-search
2016-05-10 17:32:45 -04:00
795364a86e
Decimal is imported as D
2016-05-10 11:27:24 -07:00
af7d0e867c
add isbn querey
...
if query is a valid isbn, then search on the identifier table
2016-05-09 21:48:23 -04:00
50930ce2b1
send kindle from s3
...
add file archiving code, because we needed it for push distribution.
Also use archive for kindle. tweak send-to-kindle docs.
2016-05-09 18:32:38 -04:00
ba516cd08d
Merge branch 'master' into dj16
2016-05-04 13:52:25 -07:00
574854ec5a
Merge pull request #565 from Gluejar/add-questionnaire
...
add the questionnaire module
2016-04-29 09:57:00 -07:00
730c46c02a
Merge branch 'master' into dj16
2016-04-27 12:03:41 -04:00
cf64d43811
add the questionnaire module
2016-04-26 14:38:32 -04:00
3c795dfb58
add a clarifying comment and restore raise Http404 for the case for ebfs.count() is 0
2016-04-26 11:24:46 -07:00
c67f676a24
try to make looking for the at most one SUCCESSFUL buy-to-unglue campaign for the work a bit clearer
2016-04-26 10:54:55 -07:00
20102ffc12
remove assumption that successful campaign is last
2016-04-25 14:56:17 -04:00
c5886e5584
allow thanks campaign after success
2016-04-23 17:55:01 -04:00
616e8b3c9d
Wordpress is magically HTTPS
2016-04-12 14:32:22 -04:00
ef62d59dd0
bugfix unrelated to 1.6
2016-04-09 13:26:05 -04:00
3949947277
unsafe value in session
2016-04-09 13:25:31 -04:00
bca17837a0
add fixtures in testcases
2016-04-09 13:21:12 -04:00
a4e9855b35
revert to older, patched Notification
2016-04-08 18:45:50 -04:00
7a952f09cf
patch form exclude syntax
2016-04-07 20:39:23 -04:00
356207bc5d
patch django.conf.urls.defaults
2016-04-07 20:38:53 -04:00
562be5f12d
patch django-notification
2016-04-07 20:37:54 -04:00
d951cca966
Merge branch 'master' into django15
...
# Conflicts:
# api/models.py
# api/onix.py
# api/opds.py
# api/tests.py
# api/urls.py
# api/views.py
# bisac/__init__.py
# core/bookloader.py
# core/facets.py
#
core/migrations/0072_auto__add_relator__add_relation__add_field_subject_
authority.py
# core/models.py
# core/tests.py
# fabfile.py
# frontend/forms.py
# frontend/templates/new_edition.html
# frontend/templates/notification/rights_holder_claim/notice.html
# frontend/templates/privacy.html
# frontend/views.py
# requirements_versioned.pip
# settings/common.py
# test/raw/master/metadata.yaml
2016-04-07 14:26:45 -04:00
26520d92e6
Merge pull request #555 from Gluejar/fix-mobi-making
...
Fix mobi making
2016-03-30 17:26:06 -07:00
a72ac07dcf
add function to generate mobi from the active epub
2016-03-29 13:06:23 -04:00
c902d6503c
can add asks to non-ebf ebooks
...
(and can start a thanks campaign with non-ebf ebooks
2016-03-28 17:53:33 -04:00
dfb7422857
some SEO
2016-03-28 09:54:57 -04:00
a8ab510c61
set edition in initial
2016-03-25 23:37:32 -04:00
60bc236ab4
init mimetypes
2016-03-25 14:13:39 -04:00
bac02db88a
Merge pull request #540 from Gluejar/missing-work-title
...
fixed work title in templates
2015-12-19 15:32:17 -05:00
c662da6a32
Merge pull request #538 from Gluejar/fix-merge-ui
...
Fix merge ui
2015-12-19 15:04:09 -05:00
91d783d6e4
one more
2015-12-18 12:56:14 -05:00
a52f7a9ec5
fixed work title in templates
...
at some point we changed work.__unicode__ causing this issue
2015-12-18 12:53:12 -05:00
5f07c4d87f
fix edit permissions
...
we were letting rightsholders create editions but not edit them, and
the display of the link didn't match the edit permission. now
rightsholders can edit any edition for any work not in a campaign
2015-12-17 10:29:35 -05:00
deb6fcc322
use local version of ui-lightness css uniformly
...
this is not fixing a bug, just making the invocation uniform accross
the site.
2015-12-14 11:52:41 -05:00
9086cd77ec
I little bug I recently noticed
2015-12-08 11:02:26 -05:00
a9d7608128
update last changed
2015-11-25 15:46:42 -05:00
1a21da11c1
update news link
2015-11-18 15:32:58 -05:00
67b6b6e954
errata for new edition editing
2015-11-18 10:04:01 -05:00
57f0d57c12
Merge pull request #530 from Gluejar/fix-new-subject
...
set the default
2015-11-17 14:23:49 -08:00
5544aeb70c
Merge pull request #531 from Gluejar/pubdate-range
...
Pubdate range
2015-11-17 13:56:59 -08:00
5eb74149c1
Update faq.html
...
'a a' -> 'a'
2015-11-17 08:16:05 -08:00
3387dfa118
change gluejar to Free Ebook Foundation
2015-11-16 15:07:21 -05:00
7b7d7cf174
Merge branch 'master' into pubdate-range
2015-11-16 11:06:21 -05:00
462ce137f0
set the default
2015-11-13 16:49:01 -05:00
457fc67045
use https for eric's blog
2015-10-27 17:08:19 -04:00
a13e04a5b7
forgot this
2015-10-05 19:29:07 -04:00
1ccdc144ba
display publication range
...
needs a migration
2015-10-05 19:17:16 -04:00
e7c2cf1b3a
add rich text editor
2015-09-21 16:54:53 -04:00
cf9e6f9104
fix add-edition
2015-09-21 16:42:46 -04:00
6f4a27d409
fix for non staff user
2015-09-21 16:19:31 -04:00
893d0c3c62
split edition edition from ebook submission
2015-09-21 16:07:41 -04:00
e20b58b656
fix when new edition
2015-09-21 15:08:51 -04:00
1e4177766b
Enable subject editing on editions
2015-09-21 15:01:45 -04:00
b5bae66f08
bisac adding now works
2015-09-21 13:01:27 -04:00
d4c2257511
Merge pull request #520 from Gluejar/onix-feed
...
Implement ONIX 3.0 feed
2015-08-28 21:57:18 -04:00
2b9793e2d6
tests, links and documentation
2015-08-27 15:23:52 -04:00
5f7b2997e1
Merge pull request #517 from Gluejar/booxtream-to-https
...
Booxtream to https
2015-08-26 14:04:06 -04:00
809ee36093
Merge pull request #516 from Gluejar/rejigger-home
...
include user faves on landing page
2015-08-25 19:38:59 -04:00
fb28d5b34f
unused import
2015-08-25 13:53:30 -04:00
ff39129674
include user faves on landing page
...
and stop redirecting / to supporter page
2015-08-24 10:27:39 -04:00
ea4e0c4c3f
tweak upload instructions
2015-08-22 12:04:40 -04:00
c34ffdd883
implement sorel-thumbnail
...
uses thumbnail for all non-google covers
2015-08-21 17:54:39 -04:00
86ef74662b
add author role selector
...
Previously, to change an author role, you had to delete and add the
author.
2015-08-21 13:47:04 -04:00
c6eff142ae
Merge pull request #512 from Gluejar/feedback-by-webpage
...
replace email support links with form [finish #86803178 ]
2015-08-19 08:01:12 -07:00
3d923407e4
replace email support links with form
2015-08-18 11:03:49 -04:00
148c2b1021
add notes about meta referrer
2015-08-18 09:53:51 -04:00
d252199dec
Merge branch 'master' into publisher-opds
2015-08-06 12:57:43 -07:00
06c23db9cd
that was an easy fix
2015-08-06 14:49:41 -04:00
11cf5b2869
Merge branch 'master' into publisher-opds
...
Conflicts:
api/urls.py
2015-08-06 13:39:16 -04:00
cc21ac2edb
add publisher feed
...
but don't expose it
2015-08-03 16:58:02 -04:00
5185410825
get tests to pass
2015-07-28 09:41:55 -04:00
44cd1eb19b
add relation support to edition edit
2015-07-28 00:52:21 -04:00
7c31bb115e
fix authors.remove
2015-07-27 23:44:34 -04:00
e386dccb49
show non-author relations
2015-07-27 23:21:11 -04:00
7b3360b235
Merge pull request #497 from Gluejar/catch_stk_timeouts
...
move mock ebook class to acq
2015-07-09 14:09:24 -07:00
f19a1551e4
add redirect for new users
2015-07-09 16:32:52 -04:00
449f38fe7d
move mock ebook class to acq
2015-07-09 15:08:16 -04:00
e147b3fea6
Merge pull request #494 from Gluejar/catch_stk_timeouts
...
Catch send-to-kindle timeouts
2015-07-08 13:36:12 -07:00
9ffb96559b
rewrote the mock ebook to make the logic behind it clearer
2015-07-08 13:31:35 -07:00
685229ae4c
Merge pull request #495 from Gluejar/fix_subjects_template
...
forgot about admin urls
2015-07-03 09:50:53 -07:00
741763e8b6
handle connection timeout
2015-07-01 22:07:04 -04:00
df2706993d
mock ebook for stk
2015-07-01 22:06:33 -04:00
13093c9c4b
forgot about admin urls
...
when updating url tag syntax
2015-07-01 20:57:25 -04:00
153a582cf0
Merge pull request #484 from Gluejar/add_yahoo
...
Add yahoo sign-in
2015-06-17 16:39:47 -07:00
3b575d10f6
changed default python social auth exception handling to catch the exception and send backend/error message to error page.
...
I've decided to display the backend but not the error message.
2015-06-17 15:39:27 -07:00
f1c74fe7da
made search easier
...
when no local results, automatically invoke google books search
2015-06-07 18:55:49 -04:00
e6eaa24440
eliminate referrer leakage
2015-06-04 15:15:59 -04:00
90df82954e
Merge pull request #491 from Gluejar/handle_bad_ebook_links
...
handle the bad link error (Se test run locally -- so at the very least, this PR should not be destabilizing...will deploy and then test on some links.)
2015-06-03 07:24:03 -07:00
6ec36e001d
adding a colon to error message
...
"Well, this is awkward our ebook link is bad" to "Well, this is awkward: our ebook link is bad"
2015-06-03 07:02:49 -07:00
499b67d3e1
handle the bad link error
2015-06-02 23:45:30 -04:00
15f6599331
reorder sections
2015-05-11 15:46:17 -04:00
afbe8ced90
edits
2015-05-11 11:35:44 -04:00
dda48c1161
opinionated rewrite
2015-05-08 13:22:25 -04:00
4272c8ddb2
update welcome message
2015-05-06 16:14:13 -04:00
07cfe361b2
add yahoo signin
2015-05-06 16:13:55 -04:00
266378b7ed
fix dotted url names
2015-04-28 14:13:18 -04:00
877eac1af2
stray file?
2015-04-27 23:24:19 -04:00
29108128a5
global change url syntax
2015-04-27 23:24:02 -04:00
fe6d880957
Merge pull request #477 from Gluejar/view_as_plain
...
View as plain
2015-04-17 13:57:47 -07:00
f676d116aa
Merge pull request #476 from Gluejar/purchase_button
...
fix exception when no radio
2015-04-17 13:36:39 -07:00
46574801f7
I think now we have a Facebook profile link that works for both the global Facebook user ids and app scoped user ids.
2015-04-17 11:15:07 -07:00
43ff601def
I was in a hurry
2015-04-17 13:00:26 -04:00
bc16323652
fix profile link
2015-04-17 12:37:44 -04:00
f7bfdfbbc4
fix exeption when no radio
...
The exception we've seen is caused by clicking purchase for b2u without
picking a radio button; before gifting there was always a button
checked.
2015-04-15 18:31:46 -04:00
5644d0ea37
add "view_as parameter"
2015-04-11 08:25:41 -04:00
e87294d442
twitter and facebook settings
2015-04-09 11:44:48 -04:00
db457a948f
fixed user menu, bootstrapized learn more
2015-04-09 09:21:59 -04:00
9e24dfaf7d
change all signin buttons to bootstrap buttons
2015-04-08 23:32:36 -04:00
a8cab6c0ae
get google oauth2 working
2015-04-07 22:55:30 -04:00
27af1780ab
month summary was including previous year
2015-03-31 13:51:22 -04:00
78c2bb2dfc
add free count
2015-03-31 13:50:39 -04:00
85d057eb7d
Merge pull request #469 from Gluejar/improve_redemption
...
add case for correct user already has redeemed
2015-03-19 10:41:31 -07:00
8c7d99c8d7
Merge pull request #468 from Gluejar/subject_mapping
...
add keyword mapping
2015-03-19 10:37:05 -07:00
afb6885572
added comment line with example for subject/onto_subject
2015-03-19 10:34:26 -07:00
9d2b343c74
Merge branch 'google_books_button' of github.com:Gluejar/regluit into google_books_button
2015-03-18 11:36:49 -07:00
8ac6d03723
off by one error
2015-03-18 14:34:58 -04:00
eb034013eb
Merge branch 'master' into google_books_button
2015-03-18 11:20:28 -07:00
e76bb39069
add case for correct user already has redeemed
2015-03-17 22:11:55 -04:00
519cad0083
add sanity check
...
usually you don't want to add a broad category to a small one
2015-03-12 12:25:03 -04:00
576eb6d872
add keyword mapping
2015-03-12 11:58:49 -04:00
3bdec13270
display ebook errors for first ebook
2015-03-10 14:19:05 -04:00
c3896b70d4
allow ebook creation without filesize
2015-03-10 14:18:34 -04:00
b0550999e1
incorporate changes from kindle safe title changes.
...
Merge branch 'master' into kindle_file_size
Conflicts:
frontend/views.py
2015-03-09 10:56:20 -07:00
c9fd007654
Merge pull request #461 from Gluejar/warn_kindle_address
...
flag kindle email addressed that don't contain "kindle" in them
2015-03-09 10:14:12 -07:00
387c8d43e2
Merge pull request #460 from Gluejar/fix_kindle_bugs
...
provide a title that's kindle-safe
2015-03-06 15:06:21 -08:00
8fd3e88622
don't need ungluer list for search
...
javascript was trying to download user avatars even when they're not in
the results
2015-03-06 17:35:16 -05:00
351b9df768
add link that triggers the Google Books search
2015-03-06 17:28:21 -05:00
eric
Raymond Yee