Commit Graph

5150 Commits (7c0cdc0917cacaa82cc2ef9e587a4c30e7bb160e)

Author SHA1 Message Date
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
Raymond Yee 749420eb30 Merge pull request #502 from Gluejar/load_from_yaml
Load from yaml
2015-08-06 10:28:23 -07:00
Raymond Yee 899b9b6b1a Merge pull request #500 from Gluejar/gitenberg_models
Gitenberg models
2015-08-04 10:30:04 -07:00
eric 6184b32b4d missing relator case 2015-08-04 12:58:48 -04:00
eric 499b0cd881 bump the commit 2015-08-04 12:39:34 -04:00
eric 92e9b7cb3c allow only approved repos 2015-08-04 12:02:06 -04:00
eric 134aeec4de id in opds now works with content negotiation
by request from LeonardR
2015-08-03 18:39:26 -04:00
eric 5ea513a02f updated should be last ebook creation 2015-08-03 17:06:41 -04:00
eric abe61095aa add rights to ebook links 2015-08-03 16:58:25 -04:00
eric cc21ac2edb add publisher feed
but don't expose it
2015-08-03 16:58:02 -04:00
eric a469b025d3 add filter for ebooks
so only pdf ebooks are shown in pdf feeds, only CC-BY ebooks are shown
in  CC BY feeds
2015-08-03 16:22:40 -04:00
eric f79daf09db use gitenberg.metadata 2015-08-03 10:04:07 -04:00
eric c9ae756743 add url to loaded ids 2015-07-31 16:34:47 -04:00
eric 7932e047d7 basic api wiring 2015-07-30 00:34:05 -04:00
eric 098eddc327 work in progress 2015-07-29 23:01:43 -04:00
eric 5185410825 get tests to pass 2015-07-28 09:41:55 -04:00
eric 1462d9e04d tweaks 2015-07-28 01:29:55 -04:00
eric 44cd1eb19b add relation support to edition edit 2015-07-28 00:52:21 -04:00
eric 7c31bb115e fix authors.remove 2015-07-27 23:44:34 -04:00
eric e386dccb49 show non-author relations 2015-07-27 23:21:11 -04:00
eric 088bdff782 fix add_author 2015-07-27 23:20:30 -04:00
eric 50429e4f1b migrate model
add through relation to authors
add authority code to subjects
2015-07-27 16:22:04 -04:00
Raymond Yee 7b3360b235 Merge pull request #497 from Gluejar/catch_stk_timeouts
move mock ebook class to acq
2015-07-09 14:09:24 -07:00
Raymond Yee 8438348ac6 Merge pull request #499 from Gluejar/fix_newuser_redirect
add redirect for new users
2015-07-09 13:51:56 -07:00
Raymond Yee 21e6cc2e54 updates to versions of selenium used to run tests 2015-07-09 13:47:50 -07:00
eric f19a1551e4 add redirect for new users 2015-07-09 16:32:52 -04:00
Raymond Yee ab40e5ec7c Merge pull request #498 from Gluejar/django_1.4.21
upgrading to Django 1.4.21
2015-07-09 13:04:15 -07:00
Raymond Yee 8ba4e9446e upgrading to Django 1.4.21 should be simply a matter of changing the requirements file. *fingers crossed*
https://docs.djangoproject.com/en/1.8/releases/1.4.20/
https://www.djangoproject.com/weblog/2015/jul/08/security-releases/
2015-07-09 12:15:18 -07:00
eric 449f38fe7d move mock ebook class to acq 2015-07-09 15:08:16 -04:00
Raymond Yee e147b3fea6 Merge pull request #494 from Gluejar/catch_stk_timeouts
Catch send-to-kindle timeouts
2015-07-08 13:36:12 -07:00
Raymond Yee 9ffb96559b rewrote the mock ebook to make the logic behind it clearer 2015-07-08 13:31:35 -07:00
Raymond Yee b5be9f5431 Merge pull request #496 from Gluejar/sysadmin
latest updates in ongoing work to automate unglue.it setup
2015-07-06 15:19:59 -07:00
Raymond Yee 0fbb4f702c work in progress on parameterizing config_name 2015-07-03 11:06:55 -07:00