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

8866 commits

Author SHA1 Message Date
Daniel Calviño Sánchez
4b7fa4ac2e Add support for tokens in room shares 
Tokens will be used to give access to a share to guests in public rooms.
Although the token itself is created in the provider of room shares and
no changes are needed for that, due to the code structure it is
necessary to explicitly call the provider from the manager when getting
a room share by token.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2018-08-08 14:25:44 +02:00
Daniel Calviño Sánchez
d9458b303a Add support for room shares to the share manager 
Room shares are implemented in an external app (Nextcloud Talk), so in
order to keep the share manager as isolated as possible from room share
specifics all the validity checks are done in the provider of room
shares. However, due to the code structure it is necessary to explicitly
check for room shares in "generalCreateChecks" to prevent an exception
from being thrown.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2018-08-08 14:25:43 +02:00
Daniel Calviño Sánchez
4ee839d69c Add provider for room shares 
The RoomShareProvider is provided by the Talk app, so it is necessary to
check whether the app is available or not, and also whether the class
itself exists or not (just in case an older version of the app that did
not have support yet for room shares is being used).

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2018-08-08 14:25:43 +02:00
Daniel Calviño Sánchez
857bb45366 Add comment with IDs of internal share types 
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2018-08-08 14:25:43 +02:00
Daniel Calviño Sánchez
7292a986a0 Add type for room shares 
This type represents shares with a Nextcloud Talk conversation.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2018-08-08 14:25:43 +02:00
Roeland Jago Douma
6b1ba9cdaf
Merge pull request #10553 from nextcloud/bugfix/10518/disable-oracle-enforcement-for-now 
Disable Oracle enforcement for now until the following issues are sol…
 2018-08-08 14:10:18 +02:00
Roeland Jago Douma
e7e30ac25f
Merge pull request #10586 from nextcloud/fix/noid/check_if_ua_is_set 
Check if HTTP_USER_AGENT is set before using it
 2018-08-08 13:59:31 +02:00
Roeland Jago Douma
c74a5250e5
Check if HTTP_USER_AGENT is set before using it 
Sentry reported some errors regarding this. Apparently not everybody
sets a user agent. If it is not set we assume this is not IE ;)

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-08-08 13:32:03 +02:00
Christoph Wurst
d248a0bd1e
Fix 2FA provider registry population on login 
If the 2FA provider registry has not been populated yet, we have to make
sure all available providers are loaded and queried on login. Otherwise
previously active 2FA providers aren't detected as enabled.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2018-08-08 06:57:52 +02:00
Roeland Jago Douma
70dab08dc8
Merge pull request #10569 from nextcloud/custom-avatar-userconfig 
get avatar custom status from user config
 2018-08-07 20:44:40 +02:00
Robin Appelman
ec8ab83ea5
get avatar custom status from user config 
this saves a cache operation because the user config is already cached

Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-08-07 14:55:33 +02:00
John Molakvoæ (skjnldsv)
7e6fa90fa1
Icons cacher css url fix 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-08-07 10:18:46 +02:00
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