wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
49512 commits 157 branches 562 tags 714 MiB
Commit graph

49512 commits

This branch
This branch
All branches
Author SHA1 Message Date
Roeland Jago Douma
5786c6c058
Merge pull request #16566 from nextcloud/backport/16556/stable16 
[stable16] log email shares in admin_audit log
 2019-07-27 10:37:53 +02:00
Roeland Jago Douma
05788a814e
Merge pull request #16567 from nextcloud/backport/16163/stable16 
[stable16] Change send to sent
 2019-07-27 10:37:20 +02:00
Nextcloud bot
d638060520
[tx-robot] updated from transifex 2019-07-27 02:14:46 +00:00
Frederic Werner
7c225bd706
Change send to sent 
Signed-off-by: Frederic Werner <frederic-github@werner-net.work>
 2019-07-26 16:21:37 +02:00
Sascha Wiswedel
94db7053d2 log email shares in admin_audit log 
Signed-off-by: Sascha Wiswedel <sascha.wiswedel@nextcloud.com>
 2019-07-26 14:15:45 +00:00
Roeland Jago Douma
167a8d72cf Do not log locked files 
This is the code doing its job. There is no need to spam the log file
with this.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-07-26 13:46:02 +00:00
Arthur Schiwon
a9ccac2f20 treat sensitive config keys by pattern 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2019-07-26 13:21:22 +00:00
Arthur Schiwon
84a849ec8a supresses disclosing the userid for LDAP users in the welcome mail 
The userid is not relevant here, and by default cannot be used to login
with. Typically, there is a common type of login names in organizations
(LDAP username or email most often) that does not need to be disclosed.

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2019-07-26 13:16:33 +00:00
Roeland Jago Douma
159ff6dd97
Merge pull request #16543 from nextcloud/backport/16532/stable16 
[stable16] Fix max contrast retrieval to limit minimum color for relative time
 2019-07-26 08:08:00 +02:00
Nextcloud bot
00379ebffa
[tx-robot] updated from transifex 2019-07-26 02:14:49 +00:00
Roeland Jago Douma
540168fc43
Merge pull request #16541 from nextcloud/backport/15794/stable16 
[stable16] Lock SCSS so we only run 1 job at a time
 2019-07-25 19:40:41 +02:00
Morris Jobke
6ee98f3567 Trigger fallback code to get max contrast value and use integer there 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2019-07-25 15:08:05 +00:00
Morris Jobke
861daee4d8 Fix max contrast retrieval to limit minimum color for relative time 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2019-07-25 15:08:05 +00:00
Roeland Jago Douma
3f5ce65879 Lock SCSS so we only run 1 job at a time 
This is bit hacky but a start to lock the SCSS compiler properly
Retry during 10s then give up
Properly get error message
Do not clear locks and properly debug scss caching

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-07-25 13:44:06 +00:00
Roeland Jago Douma
c08d2cbda7
Merge pull request #16536 from nextcloud/backport/16503/stable16 
[stable16] allow to provide supported calendar component set internally as a string
 2019-07-25 15:44:01 +02:00
Georg Ehrke
19e5cb37a6 allow to provide supported calendar component set internally as a string 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2019-07-25 11:36:46 +00:00
Nextcloud bot
eeefef4843
[tx-robot] updated from transifex 2019-07-25 02:14:48 +00:00
Morris Jobke
67c8dc001d
Merge pull request #16527 from nextcloud/backport/15637/stable16 
[stable16] Allow hidden smb shares
 2019-07-24 15:14:57 +02:00
Morris Jobke
c9bf543cd4
Merge pull request #16524 from nextcloud/backport/16523/stable16 
[stable16] Nested recursion breaking max nested level for parent comment calculation
 2019-07-24 15:14:29 +02:00
Daniel Kesselberg
f1031e1e24 Fix wrong indentation 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2019-07-24 10:44:20 +00:00
Daniel Kesselberg
62826ae018 Fix invalid recursion 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2019-07-24 10:44:20 +00:00
Daniel Kesselberg
9072d82cd6 Allow hidden smb shares 
A hidden smb share ends with $. This patch changes the placeholder
detection to allow shares with $ at the end.

Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2019-07-24 10:44:19 +00:00
Joas Schilling
c7322c7efd PHPStorm code cleanup 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2019-07-24 09:51:23 +00:00
Joas Schilling
27a6f8020b Get the topmost parent for the parent instead of doing endless recursion 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2019-07-24 09:51:22 +00:00
Nextcloud bot
9e62b2f25a
[tx-robot] updated from transifex 2019-07-24 02:15:44 +00:00
Nextcloud bot
227701b6ee
[tx-robot] updated from transifex 2019-07-23 02:15:51 +00:00
Morris Jobke
93c5176f1e
Merge pull request #16500 from nextcloud/backport/16495/stable16 
[stable16] Pass $configargs to openssl_pkey_export
 2019-07-22 16:03:29 +02:00
Daniel Kesselberg
abd714d685
Pass $configargs to openssl_pkey_export 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2019-07-22 14:37:10 +02:00
Nextcloud bot
55e70858b1
[tx-robot] updated from transifex 2019-07-22 02:16:08 +00:00
Nextcloud bot
70d3fd8a76
[tx-robot] updated from transifex 2019-07-21 02:15:18 +00:00
Nextcloud bot
69e5591229
[tx-robot] updated from transifex 2019-07-20 02:14:40 +00:00
Nextcloud bot
291103a495
[tx-robot] updated from transifex 2019-07-19 02:15:04 +00:00
Roeland Jago Douma
158ca6f03c
Merge pull request #16444 from nextcloud/backport/16440/stable16 
[stable16] Fix File#putContents(string) on ObjectStorage
 2019-07-18 08:08:54 +02:00
Nextcloud bot
a6bf6a61e8
[tx-robot] updated from transifex 2019-07-18 02:15:01 +00:00
Marcel Klehr
21822512dc Fix File#putContents(string) on ObjectStorage 
Signed-off-by: Marcel Klehr <mklehr@gmx.net>
 2019-07-17 20:39:24 +00:00
Morris Jobke
7e954ebca0
Merge pull request #16437 from nextcloud/backport/16151/stable16 
[stable16] Update operationprogressbar.js
 2019-07-17 17:33:42 +02:00
James Lao
ee2c5d1e16 Update operationprogressbar.js 
To fix issue #16137

Signed-off-by: james.lao@gmail.com <james.lao@gmail.com>
 2019-07-17 10:48:50 +00:00
Roeland Jago Douma
eaf4147f71
Merge pull request #16432 from nextcloud/backport/16424/stable16 
[stable16] Do not keep searching for recent
 2019-07-17 09:20:40 +02:00
Roeland Jago Douma
8e6ac9d678 Do not keep searching for recent 
If userA has a lot of recent files. But only shares 1 file with userB
(that has no files at all). We could keep searching until we run out of
recent files for userA.

Now assume the inactive userB has 20 incomming shares like that from
different users. getRecent then basically keeps consuming huge amounts
of resources and with each iteration the load on the DB increases
(because of the offset).

This makes sure we do not get more than 3 times the limit we search for
or more than 5 queries.

This means we might miss some recent entries but we should fix that
separatly. This is just to make sure the load on the DB stays sane.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-07-17 05:47:57 +00:00
Nextcloud bot
26971af51d
[tx-robot] updated from transifex 2019-07-17 02:15:40 +00:00
Morris Jobke
c440b64d26
Merge pull request #16425 from nextcloud/backport/16423/stable16 
[stable16] Only prevent disabling encrytion via the API
 2019-07-16 21:09:34 +02:00
Joas Schilling
69ed33b4d6 Only prevent disabling encrytion via the API 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2019-07-16 17:43:52 +00:00
Morris Jobke
ef25d464a4
Merge pull request #16414 from nextcloud/backport/15606/stable16 
[stable16] Add catch for RuntimeException
 2019-07-16 13:34:08 +02:00
Morris Jobke
f7a6f4527e Log RuntimeException in CleanupCardDAVPhotoCache 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2019-07-16 06:06:01 +00:00
Daniel Kesselberg
c208ea49d4 Add catch for RuntimeException 
getDirectoryListing can throw a NotFoundException or a RuntimeException.
The repair step should be skipped if the cache directory is missing so
a catch for both exceptions is required.

Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2019-07-16 06:06:01 +00:00
Nextcloud bot
988df2d2e9
[tx-robot] updated from transifex 2019-07-16 02:14:56 +00:00
Morris Jobke
e945e3bf6f
Merge pull request #16405 from nextcloud/backport/16400/stable16 
[stable16] addsubtag should push to array
 2019-07-15 10:19:17 +02:00
Maxence Lange
89f3df067f addsubtag should push to array 
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
 2019-07-15 06:45:58 +00:00
Nextcloud bot
ae67ece59c
[tx-robot] updated from transifex 2019-07-15 02:14:38 +00:00
Nextcloud bot
659d684a7e
[tx-robot] updated from transifex 2019-07-14 02:15:14 +00:00