Commit Graph

143 Commits

Author SHA1 Message Date
Alex Unger
dfc1918d23 Merge pull request #53 from owncloud/update-phoenix
Update phoenix to 0.6.0
2020-03-16 17:33:47 +01:00
Michael Barz
e8b9629460 Update phoenix to 0.6.0 2020-03-16 17:19:18 +01:00
Jörn Friedrich Dreyer
bfb333474a Automated changelog update [skip ci] 2020-03-03 09:11:19 +00:00
Jörn Friedrich Dreyer
c60334180f Merge pull request #48 from butonic/update-to-phoenix-0.5.0
Update to phoenix v0.5.0
2020-03-03 10:07:34 +01:00
Jörn Friedrich Dreyer
5a49176ed8 Update to phoenix v0.5.0
Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de>
2020-03-03 09:53:37 +01:00
Jörn Friedrich Dreyer
783d767f2a Automated changelog update [skip ci] 2020-03-03 08:51:53 +00:00
Jörn Friedrich Dreyer
9598bd2192 Merge pull request #49 from owncloud/fix-docs
Centralized docs, fix changelog
2020-03-03 09:46:58 +01:00
Michael Barz
14302264da Centralized docs, fix changelog 2020-03-02 23:47:16 +01:00
Alex Unger
d09f49e17d Automated changelog update [skip ci] 2020-03-02 14:59:37 +00:00
Alex Unger
fe56e23969 Merge pull request #45 from owncloud/fix/config-reading
Override default values from config file
2020-03-02 15:54:50 +01:00
A.Unger
f22536e997 add changelog file 2020-03-02 12:22:16 +01:00
A.Unger
6a247ebe0e override default config values when config file is present 2020-03-02 12:13:54 +01:00
A.Unger
d5f893d495 run tidy 2020-03-02 12:13:20 +01:00
Jörn Friedrich Dreyer
06f50c42c2 Update flagset.go (#42) 2020-02-13 21:44:18 +01:00
Jörn Friedrich Dreyer
5825be3637 Merge pull request #41 from owncloud/set-konnect-defaults
Set ocis-konnect defaults
2020-02-13 21:26:43 +01:00
Ilja Neumann
575ed20626 Set ocis-konnect defaults 2020-02-13 21:17:30 +01:00
Alex Unger
19a21306fb Merge pull request #40 from butonic/update-ocis-pkg
update ocis-pkg to v2.0.1
2020-02-10 12:32:21 +01:00
Jörn Friedrich Dreyer
cbd696c538 update ocis-pkg to v2.0.1 and micro/cli to v2
Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de>
2020-02-10 12:25:06 +01:00
Jörn Friedrich Dreyer
4eabdad540 Revert "update ocis-pkg to v2.0.1 and micro/cli to v2"
This reverts commit 83c820e6a7.
2020-02-10 12:22:42 +01:00
Jörn Friedrich Dreyer
83c820e6a7 update ocis-pkg to v2.0.1 and micro/cli to v2
Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de>
2020-02-10 12:17:03 +01:00
Michael Barz
74eb5392dc Config for update-docs probot 2020-01-28 15:18:21 +01:00
Thomas Müller
b04999d1a6 Merge pull request #36 from owncloud/bugfix/add-logging-if-server-not-started
In case the http server cannot be started the error is logged
2020-01-28 14:01:33 +01:00
Thomas Müller
5390ca28ef In case the http server cannot be started the error is logged 2020-01-28 11:40:12 +01:00
Thomas Boerger
3661ce2158 Merge pull request #35 from owncloud/fix/command-parsing-hack
Update to urfave cli v2
2020-01-27 09:11:02 +01:00
A.Unger
5c0a0263a7 update docs 2020-01-27 09:07:42 +01:00
A.Unger
1b73f3e7be rename flag to singular 2020-01-27 09:06:32 +01:00
A.Unger
8fc3593a75 Update micro alongside micro to v2, remove cli flags parsing monkeypatch for web-config-apps 2020-01-27 08:58:58 +01:00
Alex Unger
f1cb4d3701 fix: remove flagset options (#34)
fix: remove flagset options
2020-01-22 16:32:54 +01:00
David Christofas
0fabe3b0c4 fix: remove flagset options
Flagsets are not necessary for initializing the web server/service.
Passing them will cause micro to call the flagset function again which
then overrides the given value with the default value.

Fixes #33
2020-01-22 16:14:07 +01:00
Alex Unger
bebce0e7bb files must be loaded before draw io (#31)
files must be loaded before draw io
2020-01-17 15:46:48 +01:00
Jörn Friedrich Dreyer
8a9fc2f33c files must be loaded before draw io
related: https://github.com/owncloud/phoenix/issues/2891
2020-01-17 14:46:33 +01:00
Jörn Friedrich Dreyer
bab3638b2a Merge pull request #29 from butonic/change-default-port-for-oidc-to-reva
change default port for oidc to reva idp
2020-01-17 10:18:07 +01:00
Jörn Friedrich Dreyer
85fc6ee2ec Merge branch 'master' into change-default-port-for-oidc-to-reva 2020-01-17 10:10:44 +01:00
Jörn Friedrich Dreyer
c8997d82d3 Merge pull request #30 from owncloud/butonic-patch-1
add default apps
2020-01-17 09:47:15 +01:00
Jörn Friedrich Dreyer
0ad66e074d add default apps
files,pdf-viewer,markdown-editor,media-viewer work
draw-io seems broken
2020-01-17 09:33:16 +01:00
Jörn Friedrich Dreyer
de59eb3111 change default port for oidc to reva idp
Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de>
2020-01-16 22:45:53 +01:00
Jörn Friedrich Dreyer
8ce2f00867 Merge pull request #28 from owncloud/feature/apps-as-cli-flag
Flag web-config-apps as string instead of string slice
2020-01-16 16:19:03 +01:00
A.Unger
761e114666 use ocis-pkg@master until a new release is out 2020-01-15 15:58:56 +01:00
A.Unger
534c8a715a move string flag parsing functionality over to ocis-pkg 2020-01-15 14:21:56 +01:00
A.Unger
e3e2e4127d added utils to flagset 2020-01-15 11:24:26 +01:00
A.Unger
a628356fe8 update usage for web-config-apps flag 2020-01-15 11:10:45 +01:00
A.Unger
34ad7697e6 update docs 2020-01-15 11:08:13 +01:00
A.Unger
4aa049ec5e remove unused variable 2020-01-15 11:05:18 +01:00
A.Unger
aa74f44b08 StringSlice flag to String, rename EnvVar to PHOENIX_WEB_CONFIG_APPS 2020-01-15 10:47:21 +01:00
Jörn Friedrich Dreyer
8b3ea40824 Merge pull request #27 from owncloud/feature/build-with-phoenix-v0.2.7-alpha1
Update to v0.2.7-alpha1
2020-01-14 16:28:28 +01:00
Thomas Müller
1b82c81dcf Update to v0.2.7-alpha1 2020-01-14 16:00:12 +01:00
Jörn Friedrich Dreyer
21e730fd76 Merge pull request #25 from butonic/fix-external-apps-config
Fix external_apps config
2020-01-13 09:04:57 +01:00
Jörn Friedrich Dreyer
ec66aaf029 Fix external_apps config
Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de>
2020-01-11 21:15:03 +01:00
Thomas Müller
819c7bec7b Merge pull request #23 from owncloud/feature/22
Fixes #22 - update to phoenix 0.2.6
2020-01-09 16:27:33 +01:00
Alex Unger
76bed6e6b9 Dynamically render config.json (#24)
Dynamically render config.json
2020-01-09 16:02:08 +01:00