9c59b701ed
Merge pull request #587 from Gluejar/fix-survey-runinfo
...
Improve survey app
2016-05-31 16:13:34 -07:00
4e2e2b1683
fix lost values on prev link
...
Maybe this app was converted from a non-django app, because the code to
get the runid was not django-ish
2016-05-24 18:52:18 -04:00
bf220c5c6f
Merge branch 'master' into push
...
# Conflicts:
# settings/common.py
2016-05-20 16:44:13 -04:00
3e61822111
management command to push books
2016-05-20 16:34:25 -04:00
a466a251a0
add distro app
2016-05-16 16:50:09 -04:00
897e038e5e
blow away survey app
...
...and alter the migration history
2016-05-11 10:01:03 -04:00
ba516cd08d
Merge branch 'master' into dj16
2016-05-04 13:52:25 -07:00
ddb53fc5e9
try removing DefaultStorageFinder -- will this break the questionnaire?
2016-04-29 12:37:26 -07:00
cf64d43811
add the questionnaire module
2016-04-26 14:38:32 -04:00
c07f279be8
Merge pull request #559 from Gluejar/dj16ry
...
some changes I'm considering for dj16
2016-04-12 14:44:31 -04:00
2c8d7fd287
add SOUTH_MIGRATION_MODULES = {
...
'djcelery': 'djcelery.south_migrations',
}
2016-04-12 09:35:39 -07:00
e4a2ce084e
add ALLOWED_HOSTS
2016-04-11 22:08:03 -04:00
3140b05b62
postpose TZ cleanup
2016-04-09 13:27:04 -04:00
14829c327a
misc fixes for 1.6
2016-04-08 18:12:10 -04:00
6aa11efdd2
patch email_change
2016-04-07 20:35:59 -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
bf1ba2890c
Merge pull request #553 from Gluejar/mime-types
...
init mimetypes
2016-03-30 11:14:11 -07:00
7180661fe3
generate mobi on ask
2016-03-28 14:30:05 -04:00
60bc236ab4
init mimetypes
2016-03-25 14:13:39 -04:00
cf93e975f3
allows us to create nonces
2016-03-24 14:43:05 -04:00
abe04a02c7
* Modified core.bookloader.load_from_yaml to go from assuming that there is an epub to enumerating
...
ebooks from corresponding release specified in yaml_url
* add GitHubTests.test_ebooks_in_github_release
* modified bookloader.load_from_yaml to allow for mock loading of epub in core.tests.BookLoaderTests.test_add_by_local_yaml
2016-03-04 12:09:30 -08:00
5bda0c99fd
upgrade and config ckedit
2015-10-08 16:24:55 -04:00
85284f7fca
load bisac headings into mptt tree table
...
Requires django-mptt
table migration
2015-09-09 22:23:51 -04:00
c34ffdd883
implement sorel-thumbnail
...
uses thumbnail for all non-google covers
2015-08-21 17:54:39 -04: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
7715551671
fix auth pipeline classes
2015-04-15 10:50:36 -04:00
97579bda71
re-establish un length limit
2015-04-09 12:41:00 -04:00
e87294d442
twitter and facebook settings
2015-04-09 11:44:48 -04:00
a8cab6c0ae
get google oauth2 working
2015-04-07 22:55:30 -04:00
ea5adba871
add notifications for unredeemed gifts
2015-01-23 13:11:19 -05:00
ad2017e054
update press page
2015-01-02 00:33:32 -05:00
fafd37a973
Merge branch 'master' into marc_package
...
Conflicts:
core/marc.py
static/css/campaign2.css
2014-10-30 12:38:53 -04:00
78ddf22c18
Merge branch 'master' into stub-marc
2014-10-22 02:04:00 +00:00
a391826e5c
increase recharge_window from 7 to 14 days to allow people more time
2014-10-19 16:30:59 -07:00
29baf69d3c
record spitting now works
2014-10-17 22:48:51 -04:00
fbe96bcfc7
basic stub records
2014-10-14 10:08:08 -04:00
73c616092d
campaign.add_ask_to_ebfs for pdfs
2014-08-28 15:29:41 -04:00
314847459b
remove readmill, add dropbox
2014-05-20 12:19:34 -04:00
de6b8555d1
move CC constants into a module
2014-05-08 10:21:50 -04:00
188d34ea51
added test for b2u ungluify
...
(also tests now invoke booxtream in test mode)
2013-11-15 11:25:41 -05:00
0840a1fd71
implement holds. Also fix borrow view that didn't specify work.
2013-11-08 12:13:34 -05:00
ab473f5411
libraries, phase 1.
...
admin can create a library connected to a user
other users can "join" the library
2013-10-02 12:02:08 -04:00
9b5a254f1d
Adapt marc record machinery to B2U titles
2013-09-23 12:39:47 -04:00
8543a9ac2f
change pyepub to regluit.pyepub
2013-09-20 17:59:40 -07:00
78a7d69513
Add pyepub to installed modules
2013-09-20 17:51:58 -07:00
55d84deaf9
not sure why this problem didn't surface before...
2013-08-30 14:17:45 -04:00
4e161bebe6
explicit import of regluit.core.parameters
...
move to using the openly available github hosted version of Eric's Open Access Ebooks for core.EbookFileTests.test_ebookfile test
Should we delete the static/test epub?
2013-08-28 17:13:35 -07:00
e5a162061d
only epub files to be uploaded for now
2013-08-26 23:54:19 -04:00
10b975b839
initial commit
2013-08-23 17:14:48 -04:00
Raymond Yee
eric
Raymond Yee