Roeland Jago Douma
a080c425cd
Merge pull request #10618 from nextcloud/mimetype-insert-if-not-exists
...
use insertIfNotExists to store new mimetypes.
2018-08-10 10:31:55 +02:00
Christoph Wurst
1124b87bc0
Fix 2FA being enforced if only backup codes provider is active
...
Fixes https://github.com/nextcloud/server/issues/10634 .
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2018-08-10 09:26:40 +02:00
Roeland Jago Douma
8c1e75e052
Do not use file as template parameter
...
Using file will overwrite the $file parameter in the template base.
Leading to trying to include a file that is the exception message. Which
will of course fail.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-08-09 16:45:25 +02:00
Joas Schilling
e1d3965883
Add the ToS app to the enterprise bundle
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-08-09 16:12:48 +02:00
Robin Appelman
5e9d6b1585
use insertIfNotExists to store new mimetypes.
...
Also throw an error if we can't find the mimetype after insert
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-08-09 15:20:55 +02:00
Christoph Wurst
8db66d5dfb
Fix double-inserts of the same provider state
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2018-08-09 13:56:04 +02:00
Roeland Jago Douma
0757c52980
Merge pull request #10588 from nextcloud/fix/single-2fa-provider-login-redirect
...
Fix login redirection if only one 2FA provider is active
2018-08-09 12:27:29 +02:00
Björn Schießle
6aa6d2186c
Merge pull request #10255 from nextcloud/add-support-for-room-shares
...
Add support for room shares
2018-08-09 10:44:11 +02:00
Christoph Wurst
201cbf2d33
Fix app code checker to ignore `build` directory
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2018-08-09 06:44:52 +02:00
Christoph Wurst
d8197f2b97
Rename providerset method to get primary providers
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2018-08-08 20:28:21 +02:00
Björn Schießle
11e99859ef
Merge pull request #10397 from nextcloud/encryption-s3-fix
...
make file cache updates more robust
2018-08-08 18:27:18 +02:00
Christoph Wurst
c6e47e8a51
Fix login redirection if only one 2FA provider is active
...
Fixes https://github.com/nextcloud/server/issues/10500 .
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2018-08-08 15:25:59 +02:00
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
Nextcloud bot
1cb8fe3cb0
[tx-robot] updated from transifex
2018-08-08 00:13:19 +00: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
Nextcloud bot
35342b4b7d
[tx-robot] updated from transifex
2018-08-07 00:12:06 +00: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
Nextcloud bot
ca54166e35
[tx-robot] updated from transifex
2018-08-06 00:12:21 +00:00
Nextcloud bot
752ee28b1b
[tx-robot] updated from transifex
2018-08-04 00:12:38 +00:00
Nextcloud bot
bf88448f87
[tx-robot] updated from transifex
2018-08-03 00:12:22 +00: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
Nextcloud bot
62af5bf033
[tx-robot] updated from transifex
2018-08-02 00:12:37 +00: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
Roeland Jago Douma
b5c5faebfc
Merge pull request #10484 from nextcloud/bugfix/noid/theming-cache-update
...
Append cache bump parameter to scss files URL
2018-08-01 13:28:53 +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
rakekniven
ed026ce4df
Fixed tiny grammar issue
...
ID in uppercase.
Signed-off-by: Mark Ziegler <mark.ziegler@rakekniven.de>
2018-07-31 13:34:14 +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
Nextcloud bot
5e43f3c6a6
[tx-robot] updated from transifex
2018-07-31 00:12:12 +00: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
f208ce920d
Merge pull request #10221 from nextcloud/bugfix/noid/prevent-too-long-identifiers
...
Prevent too long identifier names
2018-07-30 21:00:53 +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
Nextcloud bot
0c7a17795b
[tx-robot] updated from transifex
2018-07-28 00:12:07 +00: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
Roeland Jago Douma
7b23cf3dc6
Merge pull request #10415 from nextcloud/bugfix/noid/regex-icons
...
Fix regex for icon urls
2018-07-27 07:23:04 +02:00
Nextcloud bot
6ccc34f5af
[tx-robot] updated from transifex
2018-07-27 00:12:20 +00: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
Nextcloud bot
e98f4de66a
[tx-robot] updated from transifex
2018-07-26 00:12:01 +00: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
Nextcloud bot
fb77ff9da4
[tx-robot] updated from transifex
2018-07-25 00:12:34 +00: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
Daniel Calviño Sánchez
49fd17ff14
Add "password_by_talk" column to "share" table in the database
...
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-07-24 13:56:25 +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)
fee62fd20b
Comply @since requirements
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-07-23 15:17:38 +02:00
Nextcloud bot
4d060755e5
[tx-robot] updated from transifex
2018-07-23 00:12:05 +00: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
John Molakvoæ (skjnldsv)
fc2767bbbb
Autoresize + autoloader
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-07-21 15:02:20 +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