Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(api-v1): Change API v1 file uploads to work like API v2 #1233

Merged
merged 110 commits into from
Jun 29, 2020
Merged
Changes from 1 commit
Commits
Show all changes
110 commits
Select commit Hold shift + click to select a range
2e9cbd1
refactor (api-v1): Don't have Knora and Sipi share a filesystem (ongo…
Feb 28, 2019
00bdf43
feature (api-v1): Make bulk import with v2-style file uploads.
Mar 1, 2019
2694c04
test (api-v1): Fix integration test.
Mar 1, 2019
cbca42e
fix (sipi): Remove debugging output.
Mar 1, 2019
b2b6b07
Merge branch 'develop' into wip/535-sipi
Mar 4, 2019
232291a
Merge branch 'develop' into wip/535-sipi
Mar 4, 2019
7d480cf
Merge branch 'develop' into wip/535-sipi
Mar 5, 2019
4f5fed9
feature (api-v1): Change API v1 to use the same Sipi scripts as API v2.
Mar 5, 2019
a072e38
feature (sipi): Support cookie authentication in upload.lua.
Mar 5, 2019
663c0dd
feature (sipi): Remove obsolete routes from Sipi configs.
Mar 5, 2019
bd83b65
refactor (salsah1): Use Sipi /upload route.
Mar 6, 2019
62b6226
Merge branch 'develop' into wip/535-sipi
Mar 20, 2019
f09cfdf
Merge branch 'develop' into wip/535-sipi
Mar 25, 2019
191ae50
Merge branch 'develop' into wip/535-sipi
Mar 25, 2019
810ba55
Merge branch 'develop' into wip/535-sipi
Mar 26, 2019
69313b6
Merge branch 'develop' into wip/535-sipi
Mar 26, 2019
241a226
Merge branch 'develop' into wip/535-sipi
Mar 27, 2019
16cdf2b
Merge branch 'develop' into wip/535-sipi
Mar 28, 2019
c4beaad
fix(sipi): Fix compile error.
Mar 28, 2019
24deb6a
Merge branch 'develop' into wip/535-sipi
Mar 28, 2019
3e02d46
Merge branch 'develop' into wip/535-sipi
Apr 1, 2019
fc70c27
Merge branch 'develop' into wip/535-sipi
Apr 2, 2019
71ed7c1
Merge branch 'develop' into wip/535-sipi
Apr 8, 2019
f5a6ebf
Merge branch 'develop' into wip/535-sipi
Apr 11, 2019
e8902a6
Merge branch 'develop' into wip/535-sipi
Apr 11, 2019
9881151
Merge branch 'develop' into wip/535-sipi
Apr 15, 2019
a08d610
Merge branch 'develop' into wip/535-sipi
Apr 15, 2019
3c60db7
Merge branch 'develop' into wip/535-sipi
Apr 18, 2019
85b3929
Merge branch 'develop' into wip/535-sipi
May 23, 2019
1b936c6
Merge branch 'develop' into wip/535-sipi
May 27, 2019
807fc66
Merge branch 'develop' into wip/535-sipi
May 29, 2019
df591b2
Merge branch 'develop' into wip/535-sipi
Jun 6, 2019
58152e2
Merge branch 'develop' into wip/535-sipi
Jun 6, 2019
0b51310
Merge branch 'develop' into wip/535-sipi
Jun 11, 2019
e74ecb4
Merge branch 'develop' into wip/535-sipi
Jun 14, 2019
b4427f8
Merge branch 'develop' into wip/535-sipi
Jun 14, 2019
e46d27a
Merge branch 'develop' into wip/535-sipi
Jun 14, 2019
16994af
Merge branch 'develop' into wip/535-sipi
Jun 20, 2019
26f2fbd
Merge branch 'develop' into wip/535-sipi
Jun 24, 2019
894e7e1
test(sipi): Fix tests.
Jun 24, 2019
d3c31bd
Merge branch 'develop' into wip/535-sipi
Jun 24, 2019
1992045
Merge branch 'develop' into wip/535-sipi
Jul 2, 2019
ad74cb9
Merge branch 'develop' into wip/535-sipi
Jul 3, 2019
12f9dd5
Merge branch 'develop' into wip/535-sipi
Jul 9, 2019
9121fe0
Merge branch 'develop' into wip/535-sipi
Jul 9, 2019
cb20c2d
Merge branch 'develop' into wip/535-sipi
Jul 19, 2019
34f4632
Merge branch 'develop' into wip/535-sipi
Jul 19, 2019
5526eb0
Merge branch 'develop' into wip/535-sipi
Jul 19, 2019
071ec00
Merge branch 'develop' into wip/535-sipi
Aug 13, 2019
547f74f
Merge branch 'develop' into wip/535-sipi
Aug 13, 2019
eee30f6
Merge branch 'develop' into wip/535-sipi
Aug 19, 2019
c7d1001
Merge branch 'develop' into wip/535-sipi
Aug 26, 2019
bd876e4
Merge branch 'develop' into wip/535-sipi
Aug 27, 2019
9598897
Merge branch 'develop' into wip/535-sipi
Aug 29, 2019
157b6e7
Merge branch 'develop' into wip/535-sipi
Aug 30, 2019
12ca8a5
Merge branch 'develop' into wip/535-sipi
Aug 30, 2019
adb2467
Merge branch 'develop' into wip/535-sipi
Aug 30, 2019
144b7ec
Merge branch 'develop' into wip/535-sipi
Aug 30, 2019
a63b4c1
Merge branch 'develop' into wip/535-sipi
Sep 9, 2019
6da7d76
Merge branch 'develop' into wip/535-sipi
Sep 10, 2019
085a7bc
Merge branch 'develop' into wip/535-sipi
Sep 12, 2019
a694364
Merge branch 'develop' into wip/535-sipi
Sep 24, 2019
d2a044a
Merge branch 'develop' into wip/535-sipi
Sep 26, 2019
065dea1
Merge branch 'develop' into wip/535-sipi
Oct 8, 2019
4e64506
Merge branch 'develop' into wip/535-sipi
Oct 18, 2019
fe087ef
Merge branch 'develop' into wip/535-sipi
Oct 21, 2019
6602a35
Merge branch 'develop' into wip/535-sipi
Oct 22, 2019
d11775e
Merge branch 'develop' into wip/535-sipi
Oct 23, 2019
417233c
Merge branch 'develop' into wip/535-sipi
Nov 4, 2019
440d817
Merge branch 'develop' into wip/535-sipi
Nov 5, 2019
0a0ca9f
Merge branch 'develop' into wip/535-sipi
Nov 8, 2019
fb1e4f5
Merge branch 'develop' into wip/535-sipi
Nov 14, 2019
f2ef95c
Merge branch 'develop' into wip/535-sipi
Nov 15, 2019
7454281
Merge branch 'develop' into wip/535-sipi
Nov 15, 2019
82d6cdf
Merge branch 'develop' into wip/535-sipi
Nov 19, 2019
d04f13c
Merge branch 'develop' into wip/535-sipi
Nov 19, 2019
94af706
Merge branch 'develop' into wip/535-sipi
Nov 28, 2019
6f33295
fix(api-v1): Fix compile errors.
Nov 28, 2019
1c99630
fix(settings): Remove obsolete settings.
Nov 28, 2019
58134fb
fix(api-v1): Accept image/jpx MIME type.
Nov 28, 2019
3e391f7
Merge branch 'develop' into wip/535-sipi
Nov 28, 2019
7260876
fix(settings): Fix typo.
Nov 28, 2019
e36c1a6
Merge branch 'develop' into wip/535-sipi
Dec 2, 2019
bc038d7
Merge branch 'develop' into wip/535-sipi
Dec 3, 2019
5ebb02c
Merge branch 'develop' into wip/535-sipi
Dec 10, 2019
6d824fe
Merge branch 'develop' into wip/535-sipi
Dec 17, 2019
baf7218
Merge branch 'develop' into wip/535-sipi
Dec 17, 2019
7b186e2
Merge branch 'develop' into wip/535-sipi
Dec 19, 2019
e5f84f6
Merge branch 'develop' into wip/535-sipi
Feb 4, 2020
2ef7ec9
Merge branch 'develop' into wip/535-sipi
Feb 5, 2020
126f640
Merge branch 'develop' into wip/535-sipi
Feb 17, 2020
28ab300
test(api-v1): Disable test.
Feb 18, 2020
7dfaa1e
Merge branch 'develop' into wip/535-sipi
Apr 3, 2020
889762f
Merge branch 'develop' into wip/535-sipi
Apr 17, 2020
946281a
triggering github-ci
subotic Apr 17, 2020
8b31606
ci: add debugging output
subotic Apr 18, 2020
eb9d5b2
build: bump sbt version
subotic Apr 20, 2020
7fdc5ff
ci: add debugging output
subotic Apr 20, 2020
319ee8f
ci: add debugging output
subotic Apr 20, 2020
b88a982
ci: add debugging output
subotic Apr 20, 2020
0541ee1
ci: add debugging output
subotic Apr 20, 2020
ac3f02e
Merge branch 'develop' into wip/535-sipi
subotic Apr 21, 2020
e2ae012
Merge branch 'develop' into wip/535-sipi
Apr 29, 2020
de9222b
Merge branch 'develop' into wip/535-sipi
May 13, 2020
c0f1638
Merge branch 'develop' into wip/535-sipi
May 13, 2020
049e2c4
Merge branch 'develop' into wip/535-sipi
Jun 24, 2020
5fcf0c7
build: bump sipi version
subotic Jun 25, 2020
d208857
build: bump sipi version
subotic Jun 25, 2020
bd9d97a
Merge branch 'develop' into wip/535-sipi
Jun 29, 2020
dbc9f74
Merge branch 'develop' into wip/535-sipi
Jun 29, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix(api-v1): Accept image/jpx MIME type.
Benjamin Geer committed Nov 28, 2019
commit 58134fb683358dbe0c1e8b70cdfbec967000eab8
Original file line number Diff line number Diff line change
@@ -106,6 +106,7 @@ class ValueUtilV1(private val settings: SettingsImpl) {
"application/octet-stream" -> "BINARY-UNKNOWN",
"image/jpeg" -> "JPEG",
"image/jp2" -> "JPEG2000",
"image/jpx" -> "JPEG2000",
"application/pdf" -> "PDF",
"application/postscript" -> "POSTSCRIPT",
"application/vnd.ms-powerpoint" -> "PPT",