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

8590 commits

Author SHA1 Message Date
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
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
Morris Jobke
2780bb0b2b
Merge pull request #9364 from nextcloud/log-invalid-storage 
Log mount and storage issues in getFileInfo
 2018-05-04 12:01:33 +02:00
Morris Jobke
3f2a5c9335
Merge pull request #9290 from nextcloud/streams-0.6.1 
Use better way to determine stream type in stream wrapper
 2018-05-03 17:15:02 +02:00
Morris Jobke
fb9cb6d4c6
Merge pull request #9373 from nextcloud/bugfix/8929/actual_fetch_version 
Get correct version of an app
 2018-05-03 16:45:18 +02:00
Roeland Jago Douma
0ff83f7230
Do not allow folder creation with quota of 0 
Fixes #4577

Users with a quota of 0 are a special case. Since they can't (ever)
create files on their own storage. Therefor it makes no real that they
can create folders (and possible share those etc).

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-05-03 11:31:23 +02:00
Julius Härtl
9bfc108b79
Cleanup and fix tests 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-05-03 08:58:24 +02:00
Julius Härtl
8b0c6c6df1
Do not hide additional settings if there are only legacy forms 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-05-03 08:58:24 +02:00
Julius Härtl
9a6b2d28fa
Move additional settings to main server settings 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-05-03 08:58:23 +02:00
Julius Härtl
d30109c316
Make mail settings form width equal 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-05-03 08:58:23 +02:00
Julius Härtl
f2f5371d89
Add overview settings section 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-05-03 08:58:22 +02:00
Roeland Jago Douma
f7b518fdbf
Get correct version of an app 
Related to #8929

We should get the version of the app. Not of the appfolder. Else there
is no way to properly compare the versions.

Now note that installing in 1 go will still fail. But at least on the
next page load the new version will be properly detected.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-05-03 08:22:03 +02:00
Roeland Jago Douma
f2d05120b4
Cache is not part of the quota 
Fixes #7444

Since the quota is calculated on the files. We should allow apps etc to
store temp stuff in the <user>/cache

Else users can't upload avatars for example.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-05-02 21:46:28 +02:00
Roland Tapken
6270a01cab
Issue #9318: catch exceptions in SCSSCacher::resetCache() 
Signed-off-by: Roland Tapken <roland@bitarbeiter.net>
 2018-05-02 21:23:13 +02:00
Morris Jobke
2aa108000c
Merge pull request #9293 from nextcloud/feature/9166/custom-auditlogfile 
option for a seperate audit log file
 2018-05-02 16:16:28 +02:00
Robin Appelman
d71783fb93
Log mount and storage issues in getFileInfo 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-05-02 15:11:59 +02:00
Roeland Jago Douma
dfe6d65410
Merge pull request #9310 from nextcloud/bugfix/noid/allow-to-inject-collaboration-search-result 
Allow to inject ISearchResult
 2018-05-02 09:45:25 +02:00
Roeland Jago Douma
db96b0bb0b
Make it possible to make external storages read only 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-05-01 15:18:56 +02:00
Robin Appelman
57ba18f47f
Use better way to determine stream type in encryption stream wrapper 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-05-01 15:06:21 +02:00
Morris Jobke
7306d30708
Merge pull request #9321 from nextcloud/bugfix/noid/return_root_folder_when_at_root 
Actually return the root folder when traversing up the tree
 2018-04-27 13:59:29 +02:00
Arthur Schiwon
aff5fe68b3
use SystemConfig, less dependencies, and not publicly needed 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2018-04-26 23:54:11 +02:00
Roeland Jago Douma
a0e038f912
generateTokenFromCache is only valid for V3 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-04-26 20:51:05 +02:00
Roeland Jago Douma
7318882357
json_decode an associative array for the swift cached token 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-04-26 20:47:47 +02:00
Roeland Jago Douma
235e3480e6
Actually return the root folder when traversing up the tree 
If you now keep calling $node->getParent() you will at some point get
the RootFolder back. This is a nice termination check and will prevent
endless loops if an exit condition is slightly off.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-04-26 20:04:19 +02:00
Joas Schilling
f5b143e318
Allow to inject ISearchResult 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-04-26 12:19:15 +02:00
Arthur Schiwon
b841a477c6
log to $datadir/audit.log by default and add rotation 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2018-04-26 12:10:53 +02:00
Arthur Schiwon
5751788282
add missing php doc and type hints 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2018-04-26 12:10:53 +02:00
Arthur Schiwon
a21a5bc4ec
improve Syslog a little 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2018-04-26 12:10:53 +02:00
Arthur Schiwon
0e6a317516
revert Log's dependency to SystemConfig to work during Installation 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2018-04-26 12:10:53 +02:00
Arthur Schiwon
69592408c4
move IFileBased to public namespace, logreader needs it 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2018-04-26 12:10:52 +02:00
Arthur Schiwon
cfc3ab0119
offer API to create own File log. admin_audit makes use of it 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2018-04-26 12:10:52 +02:00
Arthur Schiwon
5fbf184134
destaticfy Log classes 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2018-04-26 12:00:06 +02:00
Arthur Schiwon
38a90130ce
move log constants to ILogger 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2018-04-26 10:45:52 +02:00
Morris Jobke
b3a0dec8d5
Merge pull request #8540 from nextcloud/theming-advanced 
Add option for header logo and favicon in theming app
 2018-04-25 08:47:14 +02:00
Roeland Jago Douma
81f71cb1f9
Numeric only uids are no fun 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-04-24 14:23:50 +02:00
Roeland Jago Douma
074a0e0665
Cast retrieved DB fields to string 
Fixes #9279

If a pure numerical user is in the DB the value might be casted to a int
when returned. Cast it all to a string so we don't break the strict
typing.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-04-24 12:48:52 +02:00
Roeland Jago Douma
1ceb081c9b
Merge pull request #9280 from nextcloud/bugfix/noid/swift-v3-scope 
Swift v3 requires setting a scope
 2018-04-24 09:49:27 +02:00
Roeland Jago Douma
ba71918ad2
Swift v3 requires setting a scope 
Unscoped auth is not guaranteed to return a catalog. So require the
scope to be set properly.

See https://developer.openstack.org/api-ref/identity/v3/index.html#password-authentication-with-unscoped-authorization

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-04-23 19:34:09 +02:00
Daniel Calviño Sánchez
9b150001ff
Merge pull request #9272 from nextcloud/bugfix/noid/save-a-query-help-saving-the-world 
Only query last comment info, when there is one
 2018-04-23 16:43:09 +02:00
Joas Schilling
05a6b71a61
Merge pull request #9271 from nextcloud/fix-undefined-variable 
Fix undefined variable - found by Phan
 2018-04-23 15:51:15 +02:00
Roeland Jago Douma
961b27eeb0
Convert group Database backend 
This now uses the new interfaces

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-04-23 14:39:30 +02:00
Morris Jobke
4fd697e733
Remove a check for an unused variable 
Left over from a refactoring

https://github.com/nextcloud/server/pull/1940

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-04-23 11:53:48 +02:00
Joas Schilling
446efa4625
Only query last comment info, when there is one 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-04-23 11:50:30 +02:00
Morris Jobke
431ccb6386
Fix undefined variable - found by phan 
Added in https://github.com/nextcloud/server/pull/8314/files#diff-a55c10804586cd797b7f3f16556c1457R157

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-04-23 11:34:41 +02:00
Morris Jobke
67dcff7a1f
Fix undefined variable - found by Phan 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-04-23 11:30:22 +02:00
Roeland Jago Douma
0ed6f9c2da
Merge pull request #9129 from nextcloud/feature/noid/proper-comments-offset 
Add proper comment offset support
 2018-04-22 20:47:30 +02:00
Roeland Jago Douma
9f4e928c0f
Merge pull request #9225 from nextcloud/bugfix/9157/ipv6-database-host 
Allow IPv6 database hosts
 2018-04-22 20:43:29 +02:00
Julius Härtl
272b392cac
Move to more generic image handling and add extra images 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-04-19 20:14:38 +02:00
Joas Schilling
5157349b69
Fix docs 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-04-19 17:10:03 +02:00
Joas Schilling
78ee3abb78
Move regex to a function and add tests 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-04-19 12:49:36 +02:00
Roeland Jago Douma
a0028a2a5f
Allow to skip retrieving from cache in the DiscoveryService 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-04-18 19:18:34 +02:00