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

8954 commits

Author SHA1 Message Date
Joas Schilling
f5c63d7a6e
Disable Oracle enforcement for now until the following issues are solved: 
* Only apps should be checked which say they support oracle
* Only check newly added items, to allow forward migration from an existing database structure

Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-08-06 17:34:40 +02:00
Roeland Jago Douma
01bbd28530
Do not log to error loglevel when converting the error 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-08-06 16:31:30 +02:00
Thomas Citharel
03f1fef160 Ignore deactivated users in collaborators user search plugin 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2018-08-06 09:55:24 +02:00
Roeland Jago Douma
01298cfa72
Merge pull request #10480 from nextcloud/bugfix/10420/settings 
Settings design polishing
 2018-08-02 20:23:21 +02:00
Joas Schilling
483ad01a09
There is no update available if the app didnt have a version (aka was not installed) 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-08-02 14:27:16 +02:00
Roeland Jago Douma
fae7e516b5
Merge pull request #10481 from nextcloud/feature/noid/make-info-available-if-the-avatar-was-uploaded 
Make the info available if the avatar was uploaded or generated
 2018-08-01 22:54:38 +02:00
Julius Härtl
6ce474518c
Append cache bump parameter to scss files URL 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-08-01 12:42:49 +02:00
Joas Schilling
decd196162
Make the info available if the avatar was uploaded or generated 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-08-01 10:56:22 +02:00
Julius Härtl
03971d3695
Move encryption settings to security 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-08-01 09:41:09 +02:00
Bjoern Schiessle
a9e22c5f1c
make file cache updates more robust 
only update the encrypted version after the write operation is finished and the stream is closed

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-31 12:24:38 +02:00
blizzz
c39bc1638b
Merge pull request #10444 from nextcloud/feature/noid/allow-to-filter-unread-count-by-verb 
Allow to filter the unread count by verb
 2018-07-31 12:05:52 +02:00
Christoph Wurst
fc149bab3c
Fix duplicate inserts in the 2fa provider registry DAO 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2018-07-31 06:43:44 +02:00
Roeland Jago Douma
1f610b4d1f
Merge pull request #10451 from nextcloud/fix/9693/move_logcondition_up 
Fetch logcondition earlier
 2018-07-30 22:07:06 +02:00
Roeland Jago Douma
8cdd134e7e
Fetch logcondition earlier 
Fixes #9693

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-07-30 14:57:19 +02:00
Joas Schilling
66945f9574
Allow to filter the unread count by verb 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-07-30 09:41:51 +02:00
Joas Schilling
ef5074adaa
Fix primary key handling on postgres 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-07-27 14:45:22 +02:00
Joas Schilling
008c8dde1a
Ignore custom prefixes which are longer 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-07-27 14:45:22 +02:00
Joas Schilling
5e0bfe5c16
Ignore automatic generated sequences 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-07-27 14:45:21 +02:00
Joas Schilling
960961148e
Fix calculation of default name 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-07-27 14:45:21 +02:00
Joas Schilling
8a45cb1d20
Prevent too long identifier names 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-07-27 14:45:21 +02:00
Julius Härtl
8aa0f0485d
Fix regex for icon urls 
Use the version from the url rather than hardcoding v=1.
Also allow uppercase chars in the url, so that uppercase
hex color values will also be included

Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-07-26 22:08:48 +02:00
Roeland Jago Douma
ece41318b8
Check if the favorite tag exists 
If the tag does not exist there is no need to do 💥 and log an
exception on error level

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-07-26 15:33:26 +02:00
Morris Jobke
61397ee091
Merge pull request #9222 from nextcloud/feature/noid/search-for-files-by-comments 
Allow to search files by comments
 2018-07-25 20:30:00 +02:00
Joas Schilling
ac2314e3d0 Add pagination support 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-07-25 18:53:45 +02:00
Joas Schilling
8c7969e730 Allow to search by comments 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-07-25 18:53:44 +02:00
Morris Jobke
8255faada4
Merge pull request #10377 from nextcloud/sccs-cache-iscached 
cache isCached state for scss resources
 2018-07-25 17:33:01 +02:00
Morris Jobke
7eb74186ef
Merge pull request #8380 from nextcloud/bugfix/noid/reenable-disabled-apps 
Re-enable apps that got automatically disabled while updating
 2018-07-25 11:37:10 +02:00
Robin Appelman
6686ca9b2a
cache isCached state for scss resources 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-07-24 17:30:39 +02:00
Morris Jobke
9b9d729acf
Merge pull request #10238 from nextcloud/add-support-for-sending-the-password-for-a-share-by-nextcloud-talk 
Add support for sending the password for a share by Nextcloud Talk
 2018-07-24 17:06:56 +02:00
Morris Jobke
7da815bb04
Merge pull request #10298 from nextcloud/bugfix/talk-714/only-migrate-the-schema-when-moving-database 
Only create the schema when moving between databases
 2018-07-24 16:14:05 +02:00
Morris Jobke
0280245fdd
Merge pull request #10375 from nextcloud/background-scan-root 
Do scan the root storage in background scan
 2018-07-24 15:20:49 +02:00
Robin Appelman
5e940366c2
Do scan the root storage in background scan 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-07-24 14:15:27 +02:00
Daniel Calviño Sánchez
d582a66bea Honour "sendPasswordByTalk" property in mail shares 
When a password was set for a mail share an e-mail was sent to the
recipient with the password. Now the e-mail is no longer sent if the
password is meant to be sent by Talk.

However, before the e-mail was not sent when the share was updated but
the password was not changed. Now an e-mail is sent in that case too if
switching from a password sent by Talk to a password sent by mail.

On the other hand, when switching from a password sent by mail to a
password sent by Talk it is mandatory to change the password; otherwise
the recipient would already have access to the share without having to
call the sharer to verify her identity.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2018-07-24 13:56:29 +02:00
Daniel Calviño Sánchez
88600f4ecf Add "sendPasswordByTalk" property to shares 
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2018-07-24 13:56:28 +02:00
John Molakvoæ (skjnldsv)
6bcfe8d628
Uppercase 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-07-24 12:15:14 +02:00
John Molakvoæ (skjnldsv)
85a481d2b6
Fix regex of iconsCacher 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-07-24 12:15:14 +02:00
Roeland Jago Douma
b41d0d32e2
Merge pull request #10218 from nextcloud/share-comments 
allow to add a personal note to a share
 2018-07-24 09:12:03 +02:00
Roeland Jago Douma
f25d34b293
Merge pull request #10355 from nextcloud/bugfix/noid/make-sure-error-log-always-receives-a-string 
Make sure error_log() always receives a string
 2018-07-23 21:17:38 +02:00
Joas Schilling
b788f0a456
Make sure error_log() always receives a string 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-07-23 16:30:38 +02:00
John Molakvoæ (skjnldsv)
da0bdd1391 Design structure fixes 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-07-21 16:09:13 +02:00
John Molakvoæ (skjnldsv)
58debbe42c
Tests fixes and design bump 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-07-21 15:02:21 +02:00
Bjoern Schiessle
eab4d96c4c
some small template fixes 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-21 15:02:19 +02:00
Bjoern Schiessle
94c7052482
allow 'note' to be null 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-21 15:02:19 +02:00
Bjoern Schiessle
2250dbec21
add a nice looking button as direct link to the sharre 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-21 15:02:19 +02:00
Bjoern Schiessle
b56ccef564
add direct link to the file for user/group shares 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-21 15:02:18 +02:00
Bjoern Schiessle
a29261175d
fix mail templates 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-21 15:02:18 +02:00
Bjoern Schiessle
73b88deeb8
add note to share object when reading it from the db 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-21 15:02:18 +02:00
Bjoern Schiessle
c116d116fa
improve mail template and escape html code 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-21 15:02:18 +02:00
Bjoern Schiessle
a93f2a648b
allow to add a personal note to a share 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-21 15:02:18 +02:00
Morris Jobke
4536635e2a
Merge pull request #10229 from nextcloud/feature/noid/allow-notifiers-to-know-if-we-prepare-push-notifications 
Allow notifiers to know if we prepare push notifications
 2018-07-20 11:53:12 +02:00
Morris Jobke
e0d9c43c95
Merge pull request #8188 from arnowelzel/master 
Avoid error messages for restricted opcache API
 2018-07-20 11:48:44 +02:00
Joas Schilling
6b440cc365
Merge pull request #10296 from nextcloud/bug/noid/dont_fail_on_unkown_user 
Don't fail contacts menu on unkown user
 2018-07-20 03:08:32 +02:00
Morris Jobke
4751f1e7f7
Merge pull request #9984 from nextcloud/inverted-svg-api 
Svg color api
 2018-07-19 23:54:29 +02:00
John Molakvoæ (skjnldsv)
37a4d2bbbc
Php code bump 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-07-19 22:46:32 +02:00
Morris Jobke
8032e362ec
Merge pull request #10291 from nextcloud/bugfix/10052/fix-lotus-notes 
EMailTemplate: Fix button background in Lotus Notes
 2018-07-19 19:47:22 +02:00
Joas Schilling
891de38080
Only create the schema when moving between databases 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-07-19 15:32:36 +02:00
Julius Härtl
7a4c23a720
Use index for format string parameters 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-07-19 11:43:15 +02:00
Roeland Jago Douma
16bfbb78ca
Don't fail contacts menu on unkown user 
If for some reason the system addressbook holds a user that is no longer
accessible from the usermanager (so it got somehow out of sync) we
should not fail hard but rather just ignore the entry.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-07-19 11:39:28 +02:00
Julius Härtl
9159ed3d76
Fix icon url regex 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-07-19 08:16:59 +02:00
Julius Härtl
6ed8c19ab9
Use proper URL prefix for icons 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-07-19 08:16:59 +02:00
John Molakvoæ (skjnldsv)
14bc9ffda4
Fixed tests 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-07-19 08:16:59 +02:00
John Molakvoæ (skjnldsv)
a24cad1a1c
Fix accessibility invert 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-07-19 08:16:58 +02:00
John Molakvoæ (skjnldsv)
9e5885963c
Fixed icons detection and caching 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-07-19 08:16:58 +02:00
John Molakvoæ (skjnldsv)
8977c71f88
Mixin scss icon api 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-07-19 08:16:58 +02:00
John Molakvoæ (skjnldsv)
29ff7efe9a
Svg icon api sass function and upgrade of all styles 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-07-19 08:16:57 +02:00
John Molakvoæ (skjnldsv)
84e90e26c0
Svg color api 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-07-19 08:16:30 +02:00
Julius Härtl
185cb494c0
EMailTemplate: Move background color of buttons to the table to fix rendering in lotus notes 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-07-19 07:49:48 +02:00
Robin Appelman
99c00972a0
make exception serializer a bit more robust 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-07-18 16:56:34 +02:00
Morris Jobke
a7adc4cb3c
Merge pull request #10260 from nextcloud/bugfix/7974/improved-sql-for-fetching-quota 
Use the path_hash instead of the path to query the filecache
 2018-07-17 13:04:18 +02:00
Morris Jobke
a155f80485
Merge pull request #10230 from nextcloud/feature/shareoverview 
Feature/shares overview
 2018-07-17 12:53:45 +02:00
Morris Jobke
19c49c8473
Use the path_hash instead of the path to query the filecache 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-07-16 16:10:34 +02:00
Morris Jobke
82021b2b1b
Merge pull request #5280 from nextcloud/shared-with-display-name 
sharedWithDisplayName & sharedWithAvatar
 2018-07-13 17:29:57 +02:00
Morris Jobke
14314584ba
Merge pull request #10110 from nextcloud/feature/100500/whats-new-info-users 
Display What's New info to users
 2018-07-13 17:25:51 +02:00
Morris Jobke
1801e4e03f
Merge pull request #10168 from nextcloud/bugfix/10163/allow-utf8mb4-on-maria-10.3-or-later 
MySQL 8.0+ and MariaDB 10.3+ are large prefix and barracuda by default
 2018-07-13 16:23:36 +02:00
Morris Jobke
7a5768e259
Merge pull request #10198 from tml1024/master 
No need to convert to PDF with LibreOffice, just convert to PNG
 2018-07-13 16:21:36 +02:00
Morris Jobke
c7f8085cc2
Merge pull request #10226 from nextcloud/enable-scss-for-guest-pages 
Enable SCSS for guest pages
 2018-07-13 16:09:42 +02:00
Joas Schilling
79b540ecc3
Add return types and fully qualified function calls 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-07-13 13:27:52 +02:00
Joas Schilling
28d8d15a98
Allow notifiers to know whether we are preparing push notifications 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-07-13 13:27:51 +02:00
John Molakvoæ (skjnldsv)
6f45607f57
Upgraded navigation submenu management and api + created sharing submenu 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-07-13 09:33:57 +02:00
Daniel Calviño Sánchez
8c004fdc64 Enable SCSS for guest pages 
SCSS is disabled for several types of pages, as the SCSS compiler uses
the cache system, which is not available for example when Nextcloud is
not installed yet. However, in regular guest pages the cache system is
available, so SCSS is now enabled for them too.

To keep the same behaviour for guest pages the guest style is
automatically added for them, as before this commit it was automatically
added due to SCSS not being used.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2018-07-13 01:55:12 +02:00
Bjoern Schiessle
c668c5b997
fix selection of share provider 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-12 19:42:36 +02:00
Joas Schilling
50ee4e1397
Correctly init empty arrays 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-07-12 10:41:19 +02:00
Tor Lillqvist
37c8ed4b5c No need to convert to PDF with LibreOffice, just convert to PNG 
Exporting all pages of a document to a PDF is a waste of time. All we
need is a thumbnail of the first page anyway. Plus, reading that PDF
(even just the first page of it) into imagick is presumably much
slower than reading a simple PNG.

Signed-off-by: Tor Lillqvist <tml@collabora.com>
 2018-07-12 11:40:41 +03:00
Morris Jobke
3036b1d03d
Merge pull request #9895 from nextcloud/fed-group-shares 
implement federated group sharing
 2018-07-11 21:44:48 +02:00
Morris Jobke
cc9073c251
Merge pull request #10179 from nextcloud/mount-filter 
Add the option to filter mounts for a user
 2018-07-11 16:29:09 +02:00
Morris Jobke
a11d198a06
Sanitize parameters in createSessionToken() while logging 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-07-11 14:26:57 +02:00
Julius Härtl
6da2b7c4f6
Separate fopen into read and write methods 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-07-11 12:08:37 +02:00
Julius Härtl
f1469e34aa
Add fopen method to ISimpleFile 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-07-11 10:29:03 +02:00
Bjoern Schiessle
2abc705632
start to get fed group shares into the share dialog 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-11 10:11:47 +02:00
Bjoern Schiessle
4c00c80a83
translate nextcloud share types to OCM share types 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-11 10:11:45 +02:00
Bjoern Schiessle
8bc0de3469
log error messgage 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-11 10:11:44 +02:00
Bjoern Schiessle
b23032e4c5
implement federated group shares 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-11 10:11:44 +02:00
Roeland Jago Douma
0fe115a536
Add repair step 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-07-10 21:27:35 +02:00
Robin Appelman
3ad6084891
Add the option to filter mounts for a user 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-07-10 16:49:26 +02:00
Joas Schilling
011fe9e0f9
MySQL 8.0+ and MariaDB 10.3+ are large prefix and barracuda by default 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-07-09 15:37:22 +02:00
Morris Jobke
79801ad263
Suppress potential SQL injection warning as they are false positives 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-07-09 14:55:47 +02:00
Morris Jobke
8a64433ec9
Add repair job for pending cron jobs 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-07-09 14:53:37 +02:00
Morris Jobke
8b1084adfe
Only wait for cron if fix for endless wait is included 
* see https://github.com/nextcloud/server/issues/9992

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-07-09 14:53:37 +02:00
Morris Jobke
a1a29d14c8
Unlock failed cron jobs and set a high "last_checked" value to avoid continous re-check 
* fixes issue where cronjobs of a not-loaded app are marked as "still running" because there is a "reserved_at" value stored
* fixed #9992

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-07-09 14:51:02 +02:00
Morris Jobke
103c8c373a
Merge pull request #10120 from nextcloud/allow-to-disable-encryption 
allow to disable encryption
 2018-07-09 13:39:57 +02:00
Joas Schilling
5541d3dd84
Add visio mimetypes 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-07-06 15:16:21 +02:00
Morris Jobke
422c805e26
Merge pull request #10116 from nextcloud/lock-negative 
prevent lock values from going negative with memcache backend
 2018-07-06 14:50:18 +02:00
Joas Schilling
3ade347b0d
Merge pull request #9791 from nextcloud/3rdparty/noid/bump_swiftmailer 
Upgrade to swiftmailer-6
 2018-07-06 10:39:09 +02:00
Bjoern Schiessle
5d0fa12e12
allow to disable encryption 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-05 17:24:44 +02:00
Robin Appelman
3d5acbb1d0
prevent lock values from going negative with memcache backend 
This can be caused by the code releasing more locks then it acquires,
once the lock value becomes negative it's likely that it will never be able
to change into an exclusive lock again.

Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-07-05 14:39:10 +02:00
Arthur Schiwon
772bbd99be
Backend work to provide NC whats New info to users 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2018-07-05 14:33:08 +02:00
John Molakvoæ (skjnldsv)
6a0552224d
getDeletedSharedWith method 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-07-05 12:43:57 +02:00
Roeland Jago Douma
d805959e81
Add API to undelete delete group shares 
When a group share is deleted we keep track of this in the DB.
Right now it is only possible for a recipient to get back the share by
asking the sharer to delete it and to share it again. This doesn't
scale.

This endpoint makes it possible to get back the share.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-07-05 12:43:56 +02:00
Roeland Jago Douma
be7db1573d
Swift to \Swift_Mailer as abstraction 
* \Swift_Mailer handles starting the transport etc properly
* Fixed tests

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-07-04 08:28:33 +02:00
Roeland Jago Douma
e6e6b5648a
Make swift 6 compatible 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-07-04 08:28:33 +02:00
Roeland Jago Douma
0dd4a3e0cf
Kill php mail from settings 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-07-04 08:28:33 +02:00
Morris Jobke
7025f16017
Merge pull request #9345 from nextcloud/federation20 
Federation 2.0
 2018-07-03 23:13:47 +02:00
Morris Jobke
10b8a4a8b1
Revert "Fix undeclared method warning in phan" 
This reverts commit f3093b2401.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-07-03 17:46:11 +02:00
Morris Jobke
aa64584d67
Merge pull request #10080 from nextcloud/bugfix/noid/fix-phan-warning 
Fix undeclared method warning in phan
 2018-07-02 17:40:39 +02:00
Morris Jobke
48b7499fa4
Merge pull request #10079 from nextcloud/search-double-slash 
fix double slash in search result path when the result is in a submount
 2018-07-02 15:49:27 +02:00
Morris Jobke
f3093b2401
Fix undeclared method warning in phan 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-07-02 15:38:49 +02:00
Robin Appelman
922c851494
fix double slash in search result path when the result is in a submount 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-07-02 14:17:38 +02:00
Bjoern Schiessle
7ff74ae8ed
cache results from ocm end-point discovery 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-02 12:43:43 +02:00
Bjoern Schiessle
411bae5163
fix return type from send share 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-02 12:43:43 +02:00
Bjoern Schiessle
cdf8abb060
look for correct OCM permissions 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-02 11:29:31 +02:00
Bjoern Schiessle
e251b34a8c
cleanup variable naming, it is actually a resource type 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-02 11:29:31 +02:00
Bjoern Schiessle
84fc188dfc
some minor fixes and clode cleanup 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-02 11:29:29 +02:00
Bjoern Schiessle
fab4e561f4
send reshare over OCM API 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-02 11:29:28 +02:00
Bjoern Schiessle
c572e84ad9
detect correctly if a share was send successful 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-02 11:29:28 +02:00
Bjoern Schiessle
bbce8c3ea1
adjust to latest api version 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-02 11:29:28 +02:00
Bjoern Schiessle
af178ef19a
check API Version 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-02 11:29:27 +02:00
Bjoern Schiessle
db428ea547
send accept share notification (WIP) 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-02 11:29:27 +02:00
Bjoern Schiessle
a3948e8a12
use new API to send a federated share if possible 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-02 11:29:27 +02:00
Bjoern Schiessle
6208f250e8
check if cloud federation api is ready 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-02 11:29:27 +02:00
Bjoern Schiessle
5cfe20675d
start implementing federated sharing 2.0 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-02 11:29:27 +02:00
Michael Weimann
03a5856541 Disables the maintenance warning for the maintenance command itself. 
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
 2018-07-01 20:54:19 +02:00
blizzz
2f8ebe2b35
Merge pull request #10048 from nextcloud/feature/9760/systemd-logger 
Systemd Logger
 2018-06-30 00:57:30 +02:00
Morris Jobke
e4c3c481a2
Merge pull request #10038 from nextcloud/files-scan-home-only 
Add option to only scan the home storage
 2018-06-29 15:23:15 +02:00
Morris Jobke
69e92ea71a
Merge pull request #10053 from nextcloud/feature/7378/password-security-move 
Move password change to security settings
 2018-06-29 14:53:09 +02:00
Julius Härtl
ff2c819ed3
Move social buttons to the personal settings 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-06-29 14:12:05 +02:00
Julius Härtl
97c13debdc
Remove unneeded param from personal settings 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-06-29 13:35:07 +02:00
Julius Härtl
3f77b0fc8b
Move user password form to security settings 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-06-29 13:35:07 +02:00
Morris Jobke
478b95cc20
Try to not run into the white page of death and still log something in the web server error log 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-06-29 11:22:05 +02:00
Morris Jobke
326f07e756
Merge pull request #8854 from nextcloud/drop-old-sharing-code 
Get rid of shareItem
 2018-06-29 10:40:32 +02:00
Johannes Ernst
72340b2230
Added Systemd.log documentation to config.sample.php 
Changed name of default system (not systemd) logger from ownCloud to Nextcloud, to be consistent
Fixed license per https://github.com/nextcloud/server/pull/9760#discussion_r195026784
Pulled upstream updates

Signed-off-by: Johannes Ernst <jernst@indiecomputing.com>
 2018-06-29 10:37:46 +02:00
Johannes Ernst
0a65e62f29
Added a logger for systemd/journald 
Added a unit test

Signed-off-by: Johannes Ernst <jernst@indiecomputing.com>
 2018-06-29 10:37:45 +02:00
Morris Jobke
17a9024fac
Improved wording 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-06-29 10:33:12 +02:00
Arthur Schiwon
25d9c3e529
adjust backend and gui to update and changelog server 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2018-06-29 09:11:04 +02:00
Arthur Schiwon
1e0761c6b8
adjust tests 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2018-06-29 09:08:33 +02:00
Arthur Schiwon
bafb6b3c29
display whats new info in admin settings 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2018-06-29 09:08:33 +02:00
Morris Jobke
61842f66ee
Merge pull request #5623 from nextcloud/locale-setting 
Add user locale/region setting
 2018-06-29 08:03:43 +02:00
Morris Jobke
89b6ee1a45
Merge pull request #9773 from nextcloud/feature/noid/resource_booking 
resource booking
 2018-06-29 06:51:49 +02:00
Georg Ehrke
4c1e581f47
docblock version fixes 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2018-06-28 17:37:16 +02:00
Robin Appelman
b9e685236f
Add option to only scan the home storage 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-06-28 16:09:25 +02:00
Roeland Jago Douma
388ea2234f
Merge pull request #10036 from nextcloud/feature/9221/show-path-in-log 
Log path of file that failed to be parsed
 2018-06-28 11:36:24 +02:00
Morris Jobke
d4692d1fbe
Log path of file that failed to be parsed 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-06-28 11:09:50 +02:00
Georg Ehrke
8c73b13ac8
move locales file to /resources/ 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2018-06-27 21:52:19 +02:00
Georg Ehrke
b17d256761
fix use of findLocale 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2018-06-27 21:52:19 +02:00
Georg Ehrke
9157086c23
properly handle force_locale setting 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2018-06-27 21:52:19 +02:00
Georg Ehrke
b3921c65a6
cache available locales to minimize fs access 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2018-06-27 21:52:19 +02:00
Georg Ehrke
51a35c23f6
fix camelCase for localesForLanguage 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2018-06-27 21:52:18 +02:00
Julius Härtl
f3949cf1a8
Add groupware settings section 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-06-27 19:16:21 +02:00
Thomas Citharel
bf6bfad76b
OC.getLocale() now returns Locale and no longer Language 
Added OC.getLanguage() to get Language
<html lang=''> still gets language, though according to IETF BCP47 locale should be good.

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2018-06-27 13:19:40 +02:00
Thomas Citharel
abab7eb7f0
handle config.php values 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2018-06-27 13:19:23 +02:00
Thomas Citharel
4a9f8623b5
Fix review & tests 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2018-06-27 13:19:21 +02:00
Thomas Citharel
ea380b2918
Allow apps to specify locale for localisation 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2018-06-27 13:17:26 +02:00
Thomas Citharel
d8921ccd85
Allow user to choose locale 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2018-06-27 13:15:19 +02:00
Morris Jobke
b0a296e2e1
Do not use HTTP code OC_Response constants anymore 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-06-26 16:14:15 +02:00
Morris Jobke
79d9841bce
Replace hardcoded status headers with calls to http_response_code() 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-06-26 16:14:15 +02:00
Robin Appelman
605ba57086
Fix groupExists when a backend provides group details 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-06-26 15:00:08 +02:00
Morris Jobke
43f7ea5852
Merge pull request #10002 from nextcloud/docs/noid/phpdoc-putContent-resource 
Add resource type phpDoc for putContent methods
 2018-06-26 13:59:21 +02:00
Julius Härtl
73cf71a20f
Add resource type phpDoc for putContent methods 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-06-26 13:58:58 +02:00
Morris Jobke
1399f6bece
Server exception error pages by default with a 500 status code 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-06-26 11:44:24 +02:00
Morris Jobke
8c155cd51c
Server error/hint pages with a 500 error code to avoid it being seen instead of the actual resource 
* found while reviewing #7205
* allow to specify a special status code

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-06-26 11:44:24 +02:00
Eric Masseran
a34f70ce0a
Change status code when config is write protected 
Add hint msg, you can make config file read only

If the config.php is not writable, print an error message: #6893
 - set config writable
 - or set option to keep it read only

Signed-off-by: Eric Masseran <rico.masseran@gmail.com>
 2018-06-26 09:36:17 +02:00
Joas Schilling
4b49f810b7
Re-enable apps that got automatically disabled while updating 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-06-26 09:15:52 +02:00
Morris Jobke
9444a3fad1
Merge pull request #9632 from nextcloud/enhancement/stateful-2fa-providers 
Stateful 2fa providers
 2018-06-25 15:49:58 +02:00
Robin Appelman
587d7cc7d2
Merge pull request #9526 from Blaok/files-scan-shallow 
allow shallow (non-recursive) scan when scanning file storage
 2018-06-25 13:01:22 +02:00
Christoph Wurst
7be465febe
Make new classes strict and fix license header 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2018-06-25 07:38:52 +02:00
Georg Ehrke
8f061f5407
periodically query calendar resource / room backends for updated resource / room information 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2018-06-25 04:59:01 +02:00
Georg Ehrke
9aca92c441
hook up calendar resource managers/backends with server container 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2018-06-25 04:58:08 +02:00
Georg Ehrke
c83629674e
update resource booking interfaces and add managers 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2018-06-25 04:58:08 +02:00
Roeland Jago Douma
082646f7e5
Merge pull request #9955 from nextcloud/bug/noid/onedrive_propfind 
Request a valid property for DAV opendir
 2018-06-22 15:02:20 +02:00
Roeland Jago Douma
ed29984501
Merge pull request #9868 from nextcloud/user-backend-table 
make table name configurable for db user backend
 2018-06-21 19:23:23 +02:00
Roeland Jago Douma
54c4d95a11
Request a valid property for DAV opendir 
Apperently Sabre and Onedrive are not friends when requesting a single
404 property. I need to dig deeper on why this is. Anyways requesting a
valid property makes it work like a charm.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-06-21 19:01:27 +02:00
Roeland Jago Douma
8ebc3d90a0
Merge pull request #9518 from nextcloud/feature/5986/public_share_controller_middleware 
Public share middleware & controller
 2018-06-21 10:09:20 +02:00
John Molakvoæ (skjnldsv)
71ce8f3107
Split css variables and fix url variables 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-06-20 19:17:06 +02:00
Morris Jobke
50df29ded0
Merge pull request #9900 from nextcloud/feature/noid/wait-for-cron-to-finish 
Wait for cron to finish before running upgrade command
 2018-06-20 14:14:07 +02:00
Roeland Jago Douma
e7338173e8
Add PublicShareMiddlewareTest 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-06-20 08:53:37 +02:00
Roeland Jago Douma
20e514690c
Don't allow public share pages if link sharing is disabled 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-06-20 08:53:37 +02:00
Roeland Jago Douma
366981fba6
Move public preview endpoint over 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-06-20 08:53:37 +02:00
Roeland Jago Douma
f36ef8ca80
Add the new PublicShareController and PublicShareMiddleware 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-06-20 08:53:35 +02:00
Christoph Wurst
13d93f5b25
Make 2FA providers stateful 
This adds persistence to the Nextcloud server 2FA logic so that the server
knows which 2FA providers are enabled for a specific user at any time, even
when the provider is not available.

The `IStatefulProvider` interface was added as tagging interface for providers
that are compatible with this new API.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2018-06-20 08:30:26 +02:00
John Molakvoæ (skjnldsv)
21441fad9b
Added new search standard 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-06-19 23:53:20 +02:00
John Molakvoæ (skjnldsv)
e5f08620d4
Better design for core search, fixes and style to scss 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-06-19 23:53:19 +02:00
Robin Appelman
8a1cbbd90e
Don't pretend we can add/remove users to/from groups when we can't 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-06-19 16:23:02 +02:00
Morris Jobke
18e9631810
Wait for cron to finish before running upgrade command 
* fixes #9562

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-06-19 14:22:45 +02:00
Robin Appelman
3392302d22
make table name configurable for db user backend 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-06-19 14:14:44 +02:00
Morris Jobke
8646f01320
Merge pull request #9881 from nextcloud/user-db-backend-querybuilder 
use query builder in all places in the db user backend
 2018-06-19 14:12:22 +02:00
Roeland Jago Douma
82959ca93e
Comments 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-06-19 07:46:43 +02:00
Roeland Jago Douma
970dea9264
Add getProvider helper function 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-06-18 22:11:55 +02:00
Roeland Jago Douma
df34571d1d
Use constant for token version 
And don't set the version in the constructor. That would possible cause
to many updates.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-06-18 22:11:55 +02:00
Roeland Jago Douma
9e7a95fe58
Add more tests 
* Add a lot of tests
* Fixes related to those tests
* Fix tests

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-06-18 22:11:55 +02:00
Roeland Jago Douma
1999f7ce7b
Generate the new publicKey tokens by default! 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-06-18 22:11:55 +02:00
Roeland Jago Douma
f168ecfa7a
Actually convert the token 
* When getting the token
* When rotating the token

* Also store the encrypted password as base64 to avoid weird binary
stuff

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-06-18 22:11:55 +02:00