upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-05-19 08:25:56 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 14
39576 commits 951 branches 1208 tags 8.3 GiB
Commit graph

39576 commits

This branch
This branch
All branches
Author SHA1 Message Date
Bjoern Schiessle
f7a2b96507
Add recovery key on public upload 
In order to decide if a recovery key needs to be added we always
need to check the files owner settings and not the settings of
the currently logged in user.

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-07-20 11:43:39 +02:00
Lukas Reschke
cd6afb6957 Merge pull request #5796 from nextcloud/backport-allow-to-theme-emails 
[stable12] Backport allow to theme emails
 2017-07-20 10:20:30 +02:00
Nextcloud bot
9cbdca60d2
[tx-robot] updated from transifex 2017-07-20 00:08:13 +00:00
Joas Schilling
c6f57fe22d
Allow to overwrite the email template again 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-07-19 17:59:12 +02:00
Joas Schilling
336ce139ae Merge pull request #5777 from nextcloud/app-menu-ellipsis-stable12 
[stable 12] Add ellipsis for app titles in the app menu popover
 2017-07-19 16:21:30 +02:00
Joas Schilling
fef3c61378 Merge pull request #5784 from nextcloud/backport-5745-12 
[stable12] Fix emitting of legacy hook post_unshare
 2017-07-19 15:06:16 +02:00
Morris Jobke
3e4685b851 Merge pull request #5782 from nextcloud/backport-5781-stable12 
[stable12] Allow overwriting of IOS theming values
 2017-07-19 12:37:29 +02:00
Pauli Järvinen
22b29943ed Fix emitting of legacy hook post_unshare 
- When a file was unshared, the legacy hook pre_unshare fired twice and the hook post_unshare did not fire at all. This was obviously a copy-paste error.

Signed-off-by: Pauli Järvinen <pauli.jarvinen@gmail.com>
 2017-07-19 11:42:23 +02:00
Morris Jobke
ff9c5072f0 Add Android and iOS URLs to theming app 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-07-19 10:57:38 +02:00
Roeland Jago Douma
235f4d614a Allow overwriting of IOS theming values 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-07-19 10:57:25 +02:00
Nextcloud bot
fad8b275f1
[tx-robot] updated from transifex 2017-07-19 00:08:32 +00:00
Morris Jobke
e00d5ab0be Merge pull request #5765 from nextcloud/update-3rdparty-12 
Update 3rdparty for "Fix infinite propfinds reporting files as direct…
 2017-07-18 23:13:32 +02:00
Roeland Jago Douma
3a9bc85976 Merge pull request #5771 from nextcloud/path-repair-steps-loop-12 
[12] Fix invalid path repair step not getting all invalid entries
 2017-07-18 22:23:22 +02:00
Morris Jobke
bcff249f2a Merge pull request #5762 from nextcloud/files-checker-12 
[stable12] Add test to check if new files are added to the root of the repository
 2017-07-18 21:12:53 +02:00
Marin Treselj
33637c89f7
Add ellipsis for app titles in the app menu popover 
Backport of #5733

Signed-off-by: Marin Treselj <marin@pixelipo.com>
 2017-07-18 20:57:20 +02:00
Morris Jobke
01500f34b9 Add test to check if new files are added to the root of the repository 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-07-18 20:32:26 +02:00
Robin Appelman
c17b07667e
Fix invalid path repair step not getting all invalid entries 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-07-18 14:03:41 +02:00
Joas Schilling
6506508f2a
Update 3rdparty for "Fix infinite propfinds reporting files as directories" 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-07-18 10:07:50 +02:00
Nextcloud bot
041e327a6c
[tx-robot] updated from transifex 2017-07-18 00:08:12 +00:00
Lukas Reschke
515d83236b Merge pull request #5728 from nextcloud/bump-stable12-version 
12.0.1RC1
 2017-07-17 08:16:22 +02:00
Nextcloud bot
3fefa01709
[tx-robot] updated from transifex 2017-07-17 00:08:12 +00:00
Lukas Reschke
d928468524 12.0.1RC1 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-07-16 11:13:42 +02:00
Nextcloud bot
0463ef7e3b
[tx-robot] updated from transifex 2017-07-15 00:09:06 +00:00
Morris Jobke
81d785b680 Merge pull request #5730 from nextcloud/stable12-fix-drone 
[stable12] fix drone for 0.7
 2017-07-14 23:34:12 +02:00
Morris Jobke
d61fc0531f Temporarily disable acceptance and object storage tests 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-07-14 21:49:20 +02:00
Morris Jobke
239ff34f3d Fix drone 
Fix service container host name
check current folder
fix redis for integration test
Fix more hostnames

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-07-14 13:02:16 +02:00
blizzz
b9d7c48acf Merge pull request #5711 from nextcloud/null-user-exist-12 
[12] null users dont exist
 2017-07-14 12:38:27 +02:00
Nextcloud bot
281e5eb8bc
[tx-robot] updated from transifex 2017-07-14 00:08:47 +00:00
Morris Jobke
9a07f78480 Merge pull request #5710 from nextcloud/nested-permissions-mask-12 
[12] Fix scan permissions with nested permissions masks
 2017-07-13 23:42:15 +02:00
Morris Jobke
90972044b1 Merge pull request #5655 from nextcloud/moveFromCache-from-shared-12 
[12] fix moving folders out of a cache jail
 2017-07-13 16:35:57 +02:00
Robin Appelman
ce45f87699
null users dont exist 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-07-13 15:54:16 +02:00
Morris Jobke
61bac5637f Merge pull request #5697 from nextcloud/stable12-4984 
Write cert bundle to tmp file first
 2017-07-13 15:08:37 +02:00
Robin Appelman
5804dfc078
Fix scan permissions with nested permissions masks 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-07-13 14:37:09 +02:00
Robin Appelman
069df4c8cb
chunk getting invalid paths and reuse queries 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-07-13 13:08:24 +02:00
Robin Appelman
95e17a8245
use a generator instead of fetching all rows at once 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-07-13 13:08:24 +02:00
Robin Appelman
64d0a0ffc9
adjust to moved repair step 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-07-13 13:08:23 +02:00
Morris Jobke
d422875ae4
Run repair step only once 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-07-13 13:08:23 +02:00
Robin Appelman
92b14fa8c0
Add repair step for invalid paths 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-07-13 13:08:23 +02:00
Robin Appelman
996269cfdd
fix moving folders out of a cache jail 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-07-13 13:08:23 +02:00
Morris Jobke
701a865db7 Merge pull request #5692 from nextcloud/upload-hidden-filelist-12 
[12] properly block file upload to non-active filelist
 2017-07-13 11:47:46 +02:00
Morris Jobke
7da78af4d4 Fix autoloader 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-07-13 11:47:35 +02:00
Nextcloud bot
a9b38c025f
[tx-robot] updated from transifex 2017-07-13 00:08:42 +00:00
Roeland Jago Douma
fe7c907e8c
Write cert bundle to tmp file first 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-07-12 20:21:27 +02:00
Robin Appelman
9e675dd8b1
fix test 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-07-12 12:20:14 +02:00
Robin Appelman
d05f67b2f3
properly block file upload to non-active filelist 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-07-12 12:20:10 +02:00
Roeland Jago Douma
38ee24d56b Merge pull request #5687 from nextcloud/jail-propagator-12 
[12] Fix propagating changes within jail wrapper
 2017-07-12 11:50:10 +02:00
Roeland Jago Douma
405d3ccbd7 Merge pull request #5463 from nextcloud/shared-cache-during-init-12 
[12] dont die if we try to access the shared cache while setting up the shared storage
 2017-07-12 11:18:49 +02:00
Morris Jobke
ac7997901b Merge pull request #5686 from nextcloud/backport-5520 
hint should not be clickable
 2017-07-12 10:44:31 +02:00
Nextcloud bot
05b03c173e
[tx-robot] updated from transifex 2017-07-12 00:08:54 +00:00
Morris Jobke
48351b4778 Merge pull request #5484 from nextcloud/fix-if-circles-is-deleted 
Check if Circles is still here
 2017-07-11 23:42:30 +02:00