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

8639 commits

Author SHA1 Message Date
Morris Jobke
a0496b2a78
Merge pull request #9875 from wiyh12nf89x/Issue#9864_WebDAV_timeout_fix_maxDelay 
Fix #9864: Decrease $maxDelay in Throttler.php
 2018-06-15 07:34:28 +02:00
Mark Berezovsky
ad66c6bf08 Fix #9864: Decrease $maxDelay in Throttler.php 
Signed-off-by: Mark Berezovsky <xpnf@yandex.ru>
 2018-06-15 04:58:08 +03:00
Daniel Calviño Sánchez
00c3a7eb4c Fix HTTP client given options being overriden by default options 
According to the array_merge documentation, "If the input arrays have
the same string keys, then the later value for that key will overwrite
the previous one." Thus, the default options must be the first parameter
passed to array_merge.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2018-06-14 21:36:04 +02:00
Julius Härtl
ceee91d9d4
Add info message if an exception occurs during the svg to png conversion 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-06-14 17:36:02 +02:00
Robin Appelman
3047ef31bd
Add count to function builder 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-06-14 14:32:22 +02:00
Roeland Jago Douma
8c47a632e0
Allow updating the token on session regeneration 
Sometimes when we force a session regeneration we want to update the
current token for this session.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-06-14 08:09:36 +02:00
Roeland Jago Douma
699049be1b
Merge pull request #9855 from nextcloud/feature/noid/cleanup-old-updater-backup-dirs 
Background job to clean up old backups of the updater
 2018-06-13 22:16:24 +02:00
John Molakvoæ (skjnldsv)
16ec9d9670
Removed old route, fix tests and fix var type 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-06-13 18:46:05 +02:00
John Molakvoæ (skjnldsv)
156da29cea
Avatar imagick bump 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-06-13 18:46:05 +02:00
John Molakvoæ (skjnldsv)
4432cfd445
Embedded font 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-06-13 18:46:05 +02:00
John Molakvoæ (skjnldsv)
ed4309ce41
Unify colour algorithm output 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-06-13 18:46:04 +02:00
John Molakvoæ (skjnldsv)
eea6f74ca4
Controller tests fixes 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-06-13 18:46:04 +02:00
John Molakvoæ (skjnldsv)
c1766b2abc
Use base image size 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-06-13 18:46:04 +02:00
John Molakvoæ (skjnldsv)
adf3856d35
Return Svg avatars 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-06-13 18:46:04 +02:00
John Molakvoæ (skjnldsv)
8e3382ceda
Fix avatar generator centering 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-06-13 18:46:04 +02:00
Morris Jobke
dc4c158ea7
Background job to clean up old backups of the updater 
* a one-time job gets scheduled after each update via a repair job
* the job remove all directories inside data/updater-INSTANCEID/backups except the 3 most recent ones (determined by mtime of the folder)

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-06-13 17:43:29 +02:00
Morris Jobke
9c4aecb539
Merge all setup checks into one controller 
* renamed hasMissingIndexes to missingIndexes

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-06-13 15:25:08 +02:00
Morris Jobke
cd87a40eb3
Merge pull request #9836 from nextcloud/feature/noid/merge-tips-and-tricks-into-setup-checks 
Merge tips & tricks section into setup checks
 2018-06-13 13:18:40 +02:00
Morris Jobke
4a0b7aaf6c
Merge tips & tricks section into setup checks 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-06-13 12:05:38 +02:00
Morris Jobke
624d191ef6
Fix wrong hint about missing indexes 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-06-13 11:56:43 +02:00
Robin Appelman
47fd3499a3
Fix listing s3 objects when using google cloud aws compatibility 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-06-11 17:10:57 +02:00
Morris Jobke
0c2f016b67
Merge pull request #9802 from nextcloud/bugfix/noid/token_check_expire_better 
Make the token expiration also work for autocasting 0
 2018-06-09 11:25:58 +02:00
Roeland Jago Douma
480864b3e3
Make the token expiration also work for autocasting 0 
Some bad databases don't respect the default null apprently.
Now even if they cast it to 0 it should work just fine.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-06-08 16:20:43 +02:00
Mario Danic
47769d2640 New regex to match mentions 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2018-06-08 10:21:19 +02:00
Mario Danic
dc7beda308 Remove unsupported modifier 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2018-06-08 00:59:31 +02:00
Mario Danic
6bf8fca574 Fix mentions regex 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2018-06-08 00:35:51 +02:00
Roeland Jago Douma
49145a78e9
Make sure initial files can be properly created 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-06-07 12:07:37 +02:00
Morris Jobke
b49f8e43bd
Merge pull request #9565 from nextcloud/feature/noid/app-settings 
Migrate apps management to Vue.js
 2018-06-06 18:05:04 +02:00
Morris Jobke
393d9aae74
Add a hint that some indexes are not added yet 
* gives the admin a chance to discover the missing indexes and improve the performance of the instance without digging through the manual
* nicely integrated in the setup checks where this kind of hints belong to
* also adds an option to integrate this from an app based on events
* fix style of setting warnings

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-06-06 16:55:01 +02:00
Morris Jobke
f13c2b20b6
Merge pull request #9692 from nextcloud/bugfix/noid/logsecret_fix_file_put 
Make sure the log doesn't try to read from PUT if it can't
 2018-06-06 16:01:24 +02:00
Julius Härtl
f30c14a6a2
Keep AppConfig for now 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-06-06 11:49:40 +02:00
Julius Härtl
facce73c7f
Remove unused import 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-06-06 11:40:09 +02:00
Julius Härtl
29f1c9b7a2
Remove unneeded class 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-06-06 11:40:09 +02:00
Julius Härtl
b4a7be20c8
Properly clear cache 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-06-06 11:40:09 +02:00
Julius Härtl
1a034ce699
Implement update functionality 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-06-06 11:40:09 +02:00
Julius Härtl
cd60e5b634
Move logic to app management mixin 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-06-06 11:40:09 +02:00
Julius Härtl
23462275ba
Add AppStore Manager 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-06-06 11:40:09 +02:00
Julius Härtl
4a5826cddb
Generate PNG version of the theming app logo for mails 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-06-05 16:47:38 +02:00
Morris Jobke
bc008f8d5f
Merge pull request #9483 from nextcloud/azure-blob 
add azure object storage backend
 2018-06-04 16:54:21 +02:00
Robin Appelman
ac26175a17
add azure unit tests with azurite 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-06-04 16:18:03 +02:00
Morris Jobke
8c3ec5f589
Merge pull request #9725 from nextcloud/fix/contacts-menu-local-null-check 
Fix local users check in contacts menu
 2018-06-04 14:58:23 +02:00
Robin Appelman
60b7cbc0f0
add azure object storage backend 
Signed-off-by: Robin Appelman <robin@icewind.nl>
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-06-04 10:57:52 +02:00
Morris Jobke
367b1be15c
Merge pull request #9425 from nextcloud/db-reconnect-timeout 
Check connection status and attempt to reconnect each each minute
 2018-06-04 10:40:12 +02:00
Christoph Wurst
9f8617a439
Fix local users check in contacts menu 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2018-06-04 08:45:04 +02:00
Morris Jobke
5aca062100
Remove not needed change 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-05-31 17:23:36 +02:00
Robin Appelman
b40629ac8c
Add human readable description to migration steps 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-05-30 21:28:05 +02:00
Roeland Jago Douma
a52d206684
Make sure the log doesn't try to read from PUT if it can't 
If a PUT request comes in that is not JSON or from encoded. Then we can
only read it (exactly) once. If that is the case we must assume no
shared secret is set.

If we don't then we either are the first to read it, thus causing the
real read of the data to fail.

Or we are later and then it throws an exception (also failing the
request).

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-05-30 20:18:19 +02:00
Roeland Jago Douma
14acded171
Make sure the file is readable before attempting to create a preview 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-05-30 11:34:02 +02:00
Morris Jobke
1924fed83e
Merge pull request #9589 from nextcloud/bugfix/noid/allow-empty-route-navigation 
Allow empty route for navigation entries
 2018-05-29 16:26:32 +02:00
Morris Jobke
9ddff6ff35
Merge pull request #9617 from nextcloud/users-sort-case-fix 
Ignore case when sorting users
 2018-05-28 15:52:37 +02:00
Morris Jobke
0947ddb33e
Merge pull request #9268 from nextcloud/bugfix/6711 
Do not load calendar/addressbook plugins if not needed
 2018-05-28 13:52:12 +02:00
Roeland Jago Douma
26c1e33d11
Move repairstep to a custom command 
People that have issues can run it manually

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-05-28 13:26:55 +02:00
Morris Jobke
188b96d521
Merge pull request #9584 from nextcloud/file-cache-gc-isdir 
remove unneeded is_dir from file cache gc
 2018-05-28 11:36:19 +02:00
John Molakvoæ (skjnldsv)
0bfe3da664
Ignore case when sorting users 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-05-26 12:01:13 +02:00
Morris Jobke
a27e2bfcfd
Merge pull request #9585 from nextcloud/feature/noid/rename-syncclients 
Rename sync clients section to mobile & desktop
 2018-05-26 11:18:47 +02:00
John Molakvoæ (skjnldsv)
7b57c1a905
Tabs fix 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-05-25 14:46:11 +02:00
John Molakvoæ (skjnldsv)
c55cf79453
Added total count for subadmins 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-05-24 17:52:15 +02:00
John Molakvoæ (skjnldsv)
10c135ca34
Added disabled count per groups 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-05-24 17:52:15 +02:00
Julius Härtl
354c6e95d5
Allow empty route for navigation entries 
Navigation entries might be handled by javascript, as the about section
from https://github.com/nextcloud/firstrunwizard/pull/64 so we don't
need a route for that.

Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-05-24 16:28:05 +02:00
Julius Härtl
e1af2f4766
Rename sync clients section to mobile & desktop 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-05-24 15:06:28 +02:00
Robin Appelman
07e5b30b90
remove unneeded is_dir from file cache gc 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-05-24 14:24:10 +02:00
Roeland Jago Douma
84482eb25a
Merge pull request #9435 from nextcloud/bugfix/noid/fix_force_language_html_attr 
make sure force language is reflected in html lang attribute
 2018-05-23 23:45:24 +02:00
Roeland Jago Douma
4286e17777
Always set the request language to the force language 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-05-23 21:19:46 +02:00
Morris Jobke
6b6d522969
Merge pull request #9395 from nextcloud/scanner-error-lock-cleanup 
cleanup locks in scanner on error
 2018-05-23 20:05:01 +02:00
Morris Jobke
a2c518ee5a
Merge pull request #8824 from nextcloud/settings-vue 
Vue migration: settings
 2018-05-23 00:32:46 +02:00
Georg Ehrke
2a21471c74
make sure force language is reflected in html lang attribute 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2018-05-22 19:30:25 +02:00
Blaok
21b9ad3978
feat: allow files:scan --shallow 
Signed-off-by: Yuze Chi <i@blaok.me>
 2018-05-18 14:50:32 -07:00
Roeland Jago Douma
03a6f8e14e
Merge pull request #9490 from marco44/faster_large_filehelper_32bits 
Make LargeFileHelper.php faster by avoiding execs as much as possible
 2018-05-18 21:09:17 +02:00
Roeland Jago Douma
6b7cf46727
Certain tokens can expire 
However due to the nature of what we store in the token (encrypted
passwords etc). We can't just delete the tokens because that would make
the oauth refresh useless.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-05-17 16:10:19 +02:00
marco44
32fd0919c1 Make LargeFileHelper.php faster by avoiding execs as much as possible 
Signed-off-by: Marc Cousin <cousinmarc@gmail.com>
 2018-05-17 14:28:32 +02:00
Roeland Jago Douma
aba255997a
Allow the rotation of tokens 
This for example will allow rotating the apptoken for oauth

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-05-16 19:27:19 +02:00
Morris Jobke
0011bfb64b
Merge pull request #9475 from nextcloud/bug/9469/delete_preview_on_version_restore 
Delete the previews when a version is restored
 2018-05-16 11:37:12 +02:00
John Molakvoæ (skjnldsv)
72a76060bf
Fixed settings menu entry and group deletion 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-05-16 09:50:22 +02:00
John Molakvoæ (skjnldsv)
6ada8254c9
Added language support in users list 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-05-16 09:50:21 +02:00
Roeland Jago Douma
4ea2daf04d
Refix scope 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-05-15 11:41:27 +02:00
Roeland Jago Douma
466297829e
Fix tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-05-15 10:56:40 +02:00
Roeland Jago Douma
47388e1cfe
Make the Token Auth code strict 
In preparation for #9441

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-05-15 10:32:30 +02:00
Roeland Jago Douma
497a4facdf
Merge pull request #9444 from nextcloud/techdep/noid/appframework_mapper_to_qb 
Add a QueryBuilder based Mapper
 2018-05-14 21:12:12 +02:00
Roeland Jago Douma
39bb9c06d1
Delete the previews when a version is restored 
Fixes #9469

When a version of a file is restored the previews are no longer valid.
Thus we should remove them so they are regenerated.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-05-14 19:58:19 +02:00
Roeland Jago Douma
047cf5de07
Move to join 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-05-14 13:30:22 +02:00
Roeland Jago Douma
3e07c4f73a
Kill the dete preview watcher 
This code had the potential to time out. If a huge folder with pictures
for example was deleted then this could easily grow the number of files
to clean with a factor 5 (or more).

Now the previews just get cleaned up in the background. Which is good
enough for the 99% case

As a bonus this now also keeps the previews when in the trashbin so you
don't have a spiking server load when a user opens the trashbin view.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-05-14 13:30:06 +02:00
Roeland Jago Douma
253f962241
Add the job 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-05-14 13:25:55 +02:00
Roeland Jago Douma
3bfa031f38
Add backgroundcleanup job 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-05-14 13:25:55 +02:00
Roeland Jago Douma
575dc29c27
Make Appdata static 
* Add fileid for simpleroot folders (only internal)

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-05-14 13:25:54 +02:00
Roeland Jago Douma
610c66520b
Move over TokenMapper 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-05-10 19:47:43 +02:00
blizzz
72dc01460e
Merge pull request #9390 from nextcloud/bugfix/noid/no-body-for-no-content 
Do not send a body for "No content", "Not modified" and others
 2018-05-09 23:41:56 +02:00
Robin Appelman
335619f6a4
Check connection status and attempt to reconnect each each minute 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-05-08 19:25:58 +02:00
Roeland Jago Douma
c37bc4fdf9
Expose isCLI to DI 
This allows apps/backgroundjobs to find out if they are run from the CLI
or not. Some apps/backgroundjobs might do more if they are not at risk
of timing out.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-05-08 13:32:37 +02:00
Morris Jobke
7639f680a2
Merge pull request #9397 from nextcloud/log-fileinfo-not-found 
Debug log file not found when getting fileinfo
 2018-05-07 16:43:38 +02:00
Morris Jobke
7f5567e758
Merge pull request #9388 from nextcloud/log-lock-state-on-conflict 
Log lock state on conflict
 2018-05-07 16:42:26 +02:00
Morris Jobke
d161d4473e
Merge pull request #9029 from nextcloud/settings-restructure 
Restructure server settings
 2018-05-07 12:29:53 +02:00
Morris Jobke
5484260569
Merge pull request #9372 from nextcloud/bugfix/4577 
Do not allow folder creation with quota of 0
 2018-05-07 10:11:44 +02:00
Morris Jobke
0da6f6b356
Merge pull request #9371 from nextcloud/bugfix/7444 
Cache is not part of the quota
 2018-05-07 10:11:04 +02:00
Robin Appelman
e3de7ec867
Debug log file not found when getting fileinfo 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-05-04 18:48:12 +02:00
Robin Appelman
63caf331e5
cleanup locks in scanner on error 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-05-04 18:05:46 +02:00
Morris Jobke
fb296342b9
Merge pull request #9387 from nextcloud/getcachentry-lock 
remove unneeded locks in getCacheEntry
 2018-05-04 14:57:09 +02:00
Joas Schilling
b4bacf46f3
Do not send a body for "No content", "Not modified" and others 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-05-04 13:46:13 +02:00
Robin Appelman
94c15efad0
always log locking errors 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-05-04 13:30:43 +02:00
Robin Appelman
25565dd7d8
Log more info about locking conflicts for memcache locking backends 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-05-04 13:30:18 +02:00
Robin Appelman
734aec1522
remove unneeded locks in getCacheEntry 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-05-04 12:51:41 +02:00