Commit Graph

40349 Commits

Author SHA1 Message Date
Nextcloud bot 27c6dc9657
[tx-robot] updated from transifex 2017-09-02 00:08:29 +00:00
Nextcloud bot 45f687a279
[tx-robot] updated from transifex 2017-09-01 00:08:27 +00:00
Roeland Jago Douma 84ea66dca8 Merge pull request #6296 from nextcloud/improve_2fa
Improve 2FA
2017-08-31 10:52:40 +02:00
Morris Jobke 77354cb7a2 Merge pull request #6315 from nextcloud/metadata-for-all-emails
Implement metadata for email templates of remaining emails
2017-08-31 09:54:31 +02:00
Nextcloud bot 99dcf5036d
[tx-robot] updated from transifex 2017-08-31 00:08:31 +00:00
Morris Jobke 404bd1be60
Implement metadata for email templates of remaining emails
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-08-30 22:56:14 +02:00
Morris Jobke ee14659ae8 Merge pull request #6216 from nextcloud/allow-to-sort-groups-by-name
Allow to sort groups by name
2017-08-30 22:01:10 +02:00
Morris Jobke d26ec44617
Add side effect note
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-08-30 21:16:27 +02:00
Roeland Jago Douma 969eea2c0d Merge pull request #6273 from nextcloud/move-multiple-files
Move multiple files
2017-08-30 14:23:05 +02:00
Morris Jobke 2aa9a9840e Merge pull request #5994 from nextcloud/drone_postgres_71
Add drone step for postgres with php 7.1
2017-08-30 14:03:59 +02:00
Roeland Jago Douma 7e065c2946
Add drone step for postgres with php 7.1
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-08-30 13:55:16 +02:00
Nextcloud bot 1e24fe858a
[tx-robot] updated from transifex 2017-08-30 00:08:26 +00:00
Roeland Jago Douma 84b7022118
Improve 2FA
* Store the auth state in the session so we don't have to query it every
time.
* Added some tests

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-08-29 20:27:36 +02:00
Morris Jobke 4edb261805 Merge pull request #6303 from nextcloud/background-image
Adjust background image to the one used on the website
2017-08-29 19:09:54 +02:00
Morris Jobke d86bb5aed8 Merge pull request #6301 from nextcloud/master-add-share-with
Add shareWith to email template metadata
2017-08-29 17:58:00 +02:00
Morris Jobke b2dd7bf045 Merge pull request #6302 from nextcloud/comradekingu-patch-1
Spelling: Shortening and single please.
2017-08-29 17:53:58 +02:00
Allan Nordhøy d6adc240c4 Spelling: Shortening and single please. 2017-08-29 16:10:54 +02:00
Morris Jobke 3cfe91bf0f
Add shareWith to email template metadata
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-08-29 16:09:25 +02:00
Jan-Christoph Borchardt 2e6d1a3453 Set primary action button color to same as theming color
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-08-29 16:05:18 +02:00
Jan-Christoph Borchardt badbab81ea Update background image to the one used on the website
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-08-29 16:04:11 +02:00
Joas Schilling 79a7b7f192 Merge pull request #6293 from nextcloud/less-user-enumeration
Return the user id in case of an error
2017-08-29 13:25:24 +02:00
Morris Jobke 7d8b7d4e4e Merge pull request #4925 from nextcloud/error-styling
Improve design and wording of various error messages
2017-08-29 12:03:16 +02:00
Morris Jobke 8c917cbfe0 Merge pull request #6288 from nextcloud/master-6287
Allow the expiration date to be set to null
2017-08-29 11:32:11 +02:00
Joas Schilling 0aff1c9268
Return the user id in case of an error
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-29 11:10:30 +02:00
Björn Schießle 5adc1efe9f Merge pull request #6283 from nextcloud/add-new-propfind
add propfind to detect encryption status
2017-08-29 10:47:33 +02:00
Nextcloud bot daf2d6cb96
[tx-robot] updated from transifex 2017-08-29 00:08:27 +00:00
Morris Jobke be23f7e1de
Allow the expiration date to be set to null
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-08-28 17:49:16 +02:00
Bjoern Schiessle e83e1c7c23
add propfind to detect encryption status
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-08-28 14:02:25 +02:00
Nextcloud bot 8e4085526d
[tx-robot] updated from transifex 2017-08-28 00:08:24 +00:00
Thomas Citharel 2af0c3d928 Move multiple files
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2017-08-27 15:20:18 +02:00
Roeland Jago Douma a17aba4e23 Merge pull request #6245 from nextcloud/postgres
[Drone] Properly quote "7.0" in drone so it actually runs tests
2017-08-27 14:13:44 +02:00
Roeland Jago Douma df268fef34
Properly quote 7.0 so drone handles it right
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-08-26 19:01:56 +02:00
Morris Jobke 34716f99a2 Merge pull request #6263 from nextcloud/scanner-exception-handling
Better handling of errors durring scanning
2017-08-26 19:00:52 +02:00
Robin Appelman 804d97d6ff
unlock file when an exception occurs during scanning
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-08-26 18:58:06 +02:00
Robin Appelman 18908af87b
Dont swallow exception when inserting mimetypes if we're inside a transaction
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-08-26 18:58:06 +02:00
Morris Jobke 2bf15eda26 Merge pull request #6255 from nextcloud/email-meta-data
Add meta information to emails for better customisation
2017-08-26 18:53:52 +02:00
Morris Jobke 0b652648cc Merge pull request #6177 from nextcloud/properly-add-slo-url
Properly allow \OCP\Authentication\IApacheBackend to specify logout URL
2017-08-26 18:50:52 +02:00
Morris Jobke 2966b503ba Merge pull request #6253 from nextcloud/update-synfony-components
update symfony components to 3.3.6
2017-08-26 18:34:30 +02:00
Morris Jobke 92292dc06a Merge pull request #6189 from nextcloud/circle-token
link to getShareByToken
2017-08-26 18:26:12 +02:00
Roeland Jago Douma 85d5a71258 Merge pull request #6182 from nextcloud/fixes-in-files-drop-js
Fixes in files_drop.js
2017-08-26 17:58:30 +02:00
Morris Jobke f0c34a3e89
Allow the expiration date to be set to null
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-08-26 17:57:24 +02:00
Roeland Jago Douma 141bee931f Merge pull request #6250 from nextcloud/twofactor/provider-custom-csp
Allow 2FA providers to specify their custom CSP
2017-08-26 16:25:41 +02:00
Roeland Jago Douma 6c6253ff6f
Bump autoloader
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-08-26 13:48:18 +02:00
Christoph Wurst 6676232a56
Allow 2FA providers to specify their custom CSP
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-08-26 13:48:08 +02:00
Morris Jobke cfe5d35862 Merge pull request #6252 from nextcloud/only_show1_error
Don't try the actual file upload if the checks already error out
2017-08-26 12:46:01 +02:00
Morris Jobke ae1ef85137 Merge pull request #6157 from nextcloud/smb-2.0.2
update icewind/smb to 2.0.2
2017-08-26 12:02:48 +02:00
Roeland Jago Douma 69d2d0178a
Don't try the actual file upload if the checks already error out
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-08-26 11:30:04 +02:00
Morris Jobke 4e6343a4fb Merge pull request #6262 from nextcloud/navigation-entries-sort
Fix sorting of entries in Files sidebar
2017-08-26 11:16:39 +02:00
Robin Appelman b477615a41
update symfony components
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-08-26 11:09:39 +02:00
Nextcloud bot ca490bafb9
[tx-robot] updated from transifex 2017-08-26 00:08:26 +00:00