eshellman
|
b5cc6c7059
|
Merge pull request #519 from Gluejar/sysadmin
update to ansible files to reflect need for libjpeg
|
2015-08-27 16:53:06 -04:00 |
|
eshellman
|
358d4a84db
|
Merge pull request #518 from Gluejar/django-1_4_22
update to latest Django 1.4.22
|
2015-08-27 16:51:50 -04:00 |
Raymond Yee
|
b00ee3f4c2
|
Merge branch 'master' into sysadmin
|
2015-08-26 16:17:22 -04:00 |
|
Raymond Yee
|
7a75f9776e
|
update to latest Django 1.4.22
|
2015-08-26 14:28:28 -04:00 |
|
Raymond Yee
|
5f7b2997e1
|
Merge pull request #517 from Gluejar/booxtream-to-https
Booxtream to https
|
2015-08-26 14:04:06 -04:00 |
|
Raymond Yee
|
c8af2e4194
|
add libjpg dependency
|
2015-08-25 21:05:11 -04:00 |
|
Raymond Yee
|
6a22d2d98c
|
Merge branch 'master' into sysadmin
|
2015-08-25 20:13:34 -04:00 |
|
Raymond Yee
|
809ee36093
|
Merge pull request #516 from Gluejar/rejigger-home
include user faves on landing page
|
2015-08-25 19:38:59 -04:00 |
|
Raymond Yee
|
384f0e7306
|
update test/campaigntest.py Se test to work with new home page
|
2015-08-25 19:20:14 -04:00 |
|
eric
|
fb28d5b34f
|
unused import
|
2015-08-25 13:53:30 -04:00 |
|
eric
|
f1b29bcf46
|
There are no references to settings.BASE_URL
|
2015-08-25 11:07:11 -04:00 |
|
eric
|
7e963785f7
|
switch to https endpoint
|
2015-08-25 11:04:02 -04:00 |
|
Raymond Yee
|
40cdd1b141
|
Merge pull request #515 from Gluejar/recover-edition
fix occasional bug
|
2015-08-24 20:50:14 -07:00 |
|
Raymond Yee
|
2e4e4b31ee
|
Merge pull request #514 from Gluejar/auto-thumbnail-covers
Auto thumbnail covers [deliver #100783868]
|
2015-08-24 20:00:44 -07:00 |
|
eric
|
ff39129674
|
include user faves on landing page
and stop redirecting / to supporter page
|
2015-08-24 10:27:39 -04:00 |
|
eric
|
1833318c2d
|
fix occasional bug
|
2015-08-22 14:29:35 -04:00 |
|
eric
|
ea4e0c4c3f
|
tweak upload instructions
|
2015-08-22 12:04:40 -04:00 |
|
eric
|
16cc217f2b
|
test ridiculously long
|
2015-08-21 18:31:52 -04:00 |
|
eric
|
fa440d7935
|
wrong code for gutenberg id
|
2015-08-21 18:13:50 -04:00 |
|
eric
|
6bba8b0ef6
|
reduce load on converter
|
2015-08-21 18:09:35 -04:00 |
|
eric
|
c34ffdd883
|
implement sorel-thumbnail
uses thumbnail for all non-google covers
|
2015-08-21 17:54:39 -04:00 |
|
Raymond Yee
|
8d80be5248
|
Merge pull request #513 from Gluejar/edit-author-roles
add author role selector [finish #101640322]
|
2015-08-21 11:24:39 -07:00 |
|
eric
|
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 |
|
Raymond Yee
|
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 |
|
Raymond Yee
|
afe82f2309
|
Merge pull request #511 from Gluejar/httpreferrer-in-privacy
add notes about meta referrer [fix #99776230]
|
2015-08-19 07:49:18 -07:00 |
|
Raymond Yee
|
2610d56587
|
Merge pull request #510 from Gluejar/fix-CC-opds
the pre-facet feeds were broken
|
2015-08-18 17:49:04 -07:00 |
|
Raymond Yee
|
b9f0d92d99
|
Merge pull request #509 from Gluejar/yaml-version-string
Yaml version string
|
2015-08-18 17:32:07 -07:00 |
|
eric
|
4244a5fb98
|
fix tests
|
2015-08-18 14:34:52 -04:00 |
|
eric
|
3d923407e4
|
replace email support links with form
|
2015-08-18 11:03:49 -04:00 |
|
eric
|
148c2b1021
|
add notes about meta referrer
|
2015-08-18 09:53:51 -04:00 |
|
eric
|
be5b619ff2
|
the pre-facet feeds were broken
Fixed them and added tests
|
2015-08-18 09:14:19 -04:00 |
|
eric
|
779ba45d97
|
don't add v to version string
don't load ebook if version string starts with 0.0.
add test with local version
|
2015-08-18 06:57:14 -04:00 |
|
Raymond Yee
|
7c0cdc0917
|
Merge pull request #508 from Gluejar/fix-subject-tags
update version of gitenberg.metadata in light of https://github.com/gitenberg-dev/metadata/pull/20
|
2015-08-10 08:42:24 -07:00 |
|
Raymond Yee
|
4ca705b766
|
update version of gitenberg.metadata in light of [added TypedSubject class and representer by eshellman · Pull Request #20 · gitenberg-dev/metadata](https://github.com/gitenberg-dev/metadata/pull/20)
|
2015-08-10 07:51:35 -07:00 |
|
Raymond Yee
|
2bee66c6f5
|
Merge pull request #507 from Gluejar/fix-rights-loader
fix rights lookup
|
2015-08-07 08:02:35 -07:00 |
|
eric
|
42c66c29b6
|
fix rights lookup
also sync cc.py in core with cc.py in gitenberg metadata. Will DRY
later.
|
2015-08-07 01:21:15 -04:00 |
|
Raymond Yee
|
6eed0eaf4d
|
Merge pull request #501 from Gluejar/publisher-opds
Publisher opds
|
2015-08-06 14:17:30 -07:00 |
|
Raymond Yee
|
aa4f13f47d
|
conflict in api/urls.py
|
2015-08-06 13:15:12 -07:00 |
|
Raymond Yee
|
d252199dec
|
Merge branch 'master' into publisher-opds
|
2015-08-06 12:57:43 -07:00 |
|
Raymond Yee
|
bb7995a0b2
|
Merge pull request #506 from Gluejar/load_from_yaml
Load from yaml (updated requirements)
|
2015-08-06 12:29:04 -07:00 |
|
Raymond Yee
|
767e82f7cc
|
Merge pull request #504 from Gluejar/fix-author-edit
that was an easy fix
|
2015-08-06 12:27:30 -07:00 |
|
eric
|
46fb89450c
|
Merge branch 'master' into load_from_yaml
Conflicts:
api/urls.py
|
2015-08-06 15:19:12 -04:00 |
|
eric
|
299e49506b
|
updated requirements
|
2015-08-06 15:16:06 -04:00 |
|
Raymond Yee
|
01bc2f6323
|
Merge pull request #505 from Gluejar/pip_requirements_jsonld
Pip requirements for rdflib --> need newer version
|
2015-08-06 12:08:32 -07:00 |
|
Raymond Yee
|
9ccfb870f1
|
Merge branch 'master' of github.com:Gluejar/regluit into pip_requirements_jsonld
|
2015-08-06 12:07:38 -07:00 |
|
Raymond Yee
|
af0942d1f6
|
new version of rdflib
|
2015-08-06 12:06:22 -07:00 |
|
Raymond Yee
|
2d13428cf9
|
Merge pull request #503 from Gluejar/pip_requirements_jsonld
add rdflib-jsonld==0.3
|
2015-08-06 11:50:37 -07:00 |
|
eric
|
06c23db9cd
|
that was an easy fix
|
2015-08-06 14:49:41 -04:00 |
|
Raymond Yee
|
74ec17a398
|
add rdflib-jsonld==0.3
|
2015-08-06 11:49:28 -07:00 |
|
eric
|
11cf5b2869
|
Merge branch 'master' into publisher-opds
Conflicts:
api/urls.py
|
2015-08-06 13:39:16 -04:00 |