summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #17935 from nextcloud/feature/noid/public-auth-for-circlesRoeland Jago Douma2019-12-112-4/+9
|\ | | | | adding share type circles
| * using IShare::Maxence Lange2019-12-052-7/+8
| | | | | | Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
| * adding share type circlesMaxence Lange2019-12-052-2/+6
| | | | | | Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
* | Merge pull request #18350 from nextcloud/enhancement/typed-group-events-IIRoeland Jago Douma2019-12-1111-2/+552
|\ \ | | | | | | Add typed events for all group hooks and legacy events
| * | Add typed events for all group hooks and legacy eventsChristoph Wurst2019-12-1111-2/+552
| | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | Merge pull request #18348 from nextcloud/enhancement/typed-user-events-IIChristoph Wurst2019-12-1116-8/+903
|\ \ \ | | | | | | | | Add typed events for all user hooks and legacy events
| * | | Add typed events for all user hooks and legacy eventsChristoph Wurst2019-12-1116-8/+903
| |/ / | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | Merge pull request #18341 from ↵Christoph Wurst2019-12-111-0/+4
|\ \ \ | | | | | | | | | | | | | | | | kbucheli/handle_ipv6_address_with_explicit_interface handle IPv6 addresses with an explict incoming interface at the end
| * | | handle IPv6 addresses with an explict incoming interface at the end (e.g ↵Konrad Bucheli2019-12-101-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | fe80::ae2d:d1e7:fe1e:9a8d%enp2s0) Signed-off-by: Konrad Bucheli <konrad.bucheli@gmx.ch> Signed-off-by: Konrad Bucheli <kb@open.ch>
* | | | Merge pull request #18349 from ↵Christoph Wurst2019-12-115-1/+13
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | nextcloud/techdebt/deprecate-hooks-emitter-symfony-dispatcher Deprecate hooks, emitter and Symfony dispatcher mechanisms
| * | | | Deprecate hooks, emitter and Symfony dispatcher mechanismsChristoph Wurst2019-12-115-1/+13
| | |/ / | |/| | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | Merge pull request #18224 from nextcloud/bugfix/noid/direct-editing-pathRoeland Jago Douma2019-12-117-14/+96
|\ \ \ \ | | | | | | | | | | Use file path for direct editing
| * | | | Use file path for direct editingJulius Härtl2019-12-058-15/+97
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | | Merge pull request #18342 from nextcloud/enh/filesearch/offsetRoeland Jago Douma2019-12-111-1/+3
|\ \ \ \ \ | |_|/ / / |/| | | | Add offset for home limited searches
| * | | | Add offset for home limited searchesRoeland Jago Douma2019-12-101-1/+3
| | |/ / | |/| | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | Merge pull request #18334 from nextcloud/enh/always_enable_viewerRoeland Jago Douma2019-12-114-2/+14
|\ \ \ \ | | | | | | | | | | Viewer should be always enabled
| * | | | Fix testsJohn Molakvoæ (skjnldsv)2019-12-102-2/+8
| | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | Viewer should be always enabledRoeland Jago Douma2019-12-102-0/+6
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | [tx-robot] updated from transifexNextcloud bot2019-12-1110-0/+100
| |/ / / |/| | |
* | | | Merge pull request #18338 from ↵Christoph Wurst2019-12-103-3/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | nextcloud/fix/nextcloud-vue-collections-transpilation Transpile the nextcloud-vue-collection package
| * | | | Transpile the nextcloud-vue-collection packageChristoph Wurst2019-12-103-3/+3
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It should support the same browsers as this component, but there seems to be a regression [1] that breaks the transpilation. Hence including the package here for the Babel transformation. [1] https://github.com/juliushaertl/nextcloud-vue-collections/issues/302 Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | Merge pull request #18293 from ↵Roeland Jago Douma2019-12-105-18/+242
|\ \ \ \ | |/ / / |/| | | | | | | | | | | nextcloud/feature/transfer-ownership-autocompletion Add autocompletion to the ownership transfer UI
| * | | Add autocompletion to the ownership transfer UIChristoph Wurst2019-12-105-18/+242
| | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | Merge pull request #18312 from nextcloud/fix/18249/do_not_disable_auth_appsRoeland Jago Douma2019-12-101-2/+3
|\ \ \ \ | | | | | | | | | | Do not disable authentication apps
| * | | | Do not disable authentication appsRoeland Jago Douma2019-12-101-2/+3
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For #18249 If an app encounters an error during loading of app.php the app is normally disabled. However. We should make sure that this doesn't happen for authentication apps (looking at your user_saml). Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | Merge pull request #18253 from nextcloud/bugfix/noid/broken-oracle-installRoeland Jago Douma2019-12-106-24/+27
|\ \ \ \ | |/ / / |/| | | Pick a shorter name for the transfer ownership table
| * | | Pick a shorter name for the transfer ownership tableJoas Schilling2019-12-106-24/+27
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | Merge pull request #18297 from nextcloud/enh/notification_dismissRoeland Jago Douma2019-12-105-0/+67
|\ \ \ \ | | | | | | | | | | Add interface for notification handler for dimissed events
| * | | | Add interface for notification handler for dimissed eventsRoeland Jago Douma2019-12-105-0/+67
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | Merge pull request #18314 from nextcloud/fixFileIdSearchRoeland Jago Douma2019-12-101-0/+2
|\ \ \ \ \ | | | | | | | | | | | | Fix ambigious fileID on search
| * | | | | fix https://github.com/nextcloud/server/issues/18313tobiasKaminsky2019-12-101-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
* | | | | | Fix external sharing loading script (#18251)John Molakvoæ2019-12-103-68/+65
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix external sharing loading script
| * | | | | | revert protectedJohn Molakvoæ2019-12-061-1/+1
| | | | | | |
| * | | | | | Fix external sharing loading scriptJohn Molakvoæ (skjnldsv)2019-12-063-69/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | | | | | Merge pull request #18301 from ↵Roeland Jago Douma2019-12-101-2/+4
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | nextcloud/bugfix/noid/fix_array_access_on_non_array Verify that is an array before accessing it
| * | | | | | Verify that is an array before accessing itGeorg Ehrke2019-12-091-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
* | | | | | | Merge pull request #17260 from ↵Roeland Jago Douma2019-12-107-18/+31
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/feature/noid/filepicker-allow-multiple-buttons Allow to have mutliple buttons on the filepicker
| * | | | | | | Allow to have mutliple buttons on the filepickerJoas Schilling2019-12-097-18/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | | | | [tx-robot] updated from transifexNextcloud bot2019-12-1018-22/+134
| | | | | | | |
* | | | | | | | Merge pull request #18299 from nextcloud/bugfix/noid/filecache_bigint_mountsRoeland Jago Douma2019-12-092-0/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Convert various columns in oc_mounts to bigint
| * | | | | | | | Convert various columns in oc_mounts to bigintGeorg Ehrke2019-12-092-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
* | | | | | | | | Merge pull request #18184 from nextcloud/bugfix/noid/is-trusted-domainRoeland Jago Douma2019-12-093-4/+21
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | | Move overwritehost check to isTrustedDomain
| * | | | | | | | Move overwritehost check to isTrustedDomainJulius Härtl2019-12-073-4/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | | | | | | Merge pull request #18300 from nextcloud/bug/18295/recovery-initializationRoeland Jago Douma2019-12-093-6/+0
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix Argument 3 passed to OCA\Encryption\Recovery::__construct() must …
| * | | | | | | | | Fix Argument 3 passed to OCA\Encryption\Recovery::__construct() must be an ↵Daniel Kesselberg2019-12-093-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | instance of OCA\Encryption\KeyManager Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
* | | | | | | | | | Merge pull request #18256 from nextcloud/files-aditional-scripts-new-eventsRoeland Jago Douma2019-12-094-5/+9
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Use non-depricated events for loading additional scripts in files app
| * | | | | | | | | | use OCP\EventDispatcher\GenericEvent in more placesRobin Appelman2019-12-093-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | | | | | | | use OCP\EventDispatcher\GenericEvent for loading additional scripts in the ↵Robin Appelman2019-12-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | files app Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | | | | | | | Merge pull request #18231 from nextcloud/fix/shared_version_restoreRoeland Jago Douma2019-12-093-15/+64
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix restoring shared versions
| * | | | | | | | | | | update testsRobin Appelman2019-12-051-4/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>