Commit Graph

40315 Commits

Author SHA1 Message Date
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
Jan-Christoph Borchardt d0d6a92054 Fix sorting of entries in Files sidebar
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-08-25 18:40:28 +02:00
Roeland Jago Douma 1682ead807 Merge pull request #6260 from nextcloud/popover-border-radius
Add standard border-radius to datepicker
2017-08-25 15:58:23 +02:00
Roeland Jago Douma f456462dfd Merge pull request #6261 from nextcloud/fix-favorites-permanent
Fix permanent display of favorite icon
2017-08-25 15:57:07 +02:00
Jan-Christoph Borchardt ee69a29f2f Fix permanent display of favorite icon
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-08-25 14:25:21 +02:00
Jan-Christoph Borchardt cd1e384b14 Add standard border-radius to datepicker
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-08-25 14:08:29 +02:00
Nextcloud bot 7b8bd8188e
[tx-robot] updated from transifex 2017-08-25 00:08:59 +00:00
Morris Jobke 15a29717f1 Merge pull request #6244 from nextcloud/redis_cluster
[drone] Give redis a change to fireup
2017-08-25 00:17:59 +02:00
Roeland Jago Douma 8b29ea53db Merge pull request #6249 from nextcloud/ignore-vscode
Add Visual Studio Code to .gitignore
2017-08-24 19:27:19 +02:00
Roeland Jago Douma f99527ab8b Merge pull request #6251 from nextcloud/get_right_translation
Don't fetch the translation from core but from files
2017-08-24 19:24:07 +02:00
Roeland Jago Douma 3d22e7a6f5
Use a new phpredis
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-08-24 19:01:13 +02:00
Björn Schießle 60ee450809 Merge pull request #5870 from nextcloud/generate-system-wide-key-pair
extend the identity proof manager to allow system wide key pairs
2017-08-24 18:36:35 +02:00
Joas Schilling 6a130d01e7
Also for reset password
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-24 18:02:37 +02:00
Morris Jobke f6f10b5932 Merge pull request #6241 from nextcloud/integration_ram
[drone] Install intergration tests in RAM
2017-08-24 17:55:07 +02:00
Joas Schilling 09747b296a
Add meta information to emails for better customisation
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-24 17:54:22 +02:00
Roeland Jago Douma 5a9a199aaa
Don't fetch the translation from core but from files
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-08-24 14:54:14 +02:00
Jakob Sack af8d93ac02 Add Visual Studio Code to .gitignore 2017-08-24 14:26:44 +02:00
Roeland Jago Douma 8c02bcdeee
[drone] Install intergration tests in RAM
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-08-24 11:04:30 +02:00
Nextcloud bot a7f2dc6dd6
[tx-robot] updated from transifex 2017-08-24 00:08:50 +00:00
Roeland Jago Douma 697fcc93da Merge pull request #6239 from nextcloud/fix-uploading-message
Show "Uploading..." in web UI for long uploads
2017-08-23 19:15:58 +02:00
Roeland Jago Douma ef223b7760
Give redis a change to fireup
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-08-23 18:19:22 +02:00
Roeland Jago Douma 9357cf735a Merge pull request #6164 from nextcloud/dont-show-error-message-when-sql-failed
Prevent SQL error message in case of error
2017-08-23 16:49:57 +02:00
Morris Jobke 4225f93818 Merge pull request #6165 from nextcloud/bump-dompurify
Bump DOMPurify
2017-08-23 16:35:27 +02:00
Morris Jobke 57fd256b9a
Replace ... with …
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-08-23 16:22:11 +02:00
Morris Jobke 591dda2fed
Show "Uploading..." in web UI for long uploads
If the estimated upload time is bigger than 4 hours it shows the text
"Uploading..." because the time then doesn't give any good hint to the
user anyways.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-08-23 15:59:05 +02:00
Morris Jobke 08b71ca682 Merge pull request #6236 from nextcloud/drone-ci-images
Fix phan test
2017-08-23 15:23:31 +02:00
Morris Jobke e826961a51
Fix phan test
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-08-23 15:22:28 +02:00
Morris Jobke cba19b96e8 Merge pull request #6229 from nextcloud/drone-ci-images
Use docker images without XDebug and with Opcache
2017-08-23 15:07:44 +02:00
Morris Jobke 0460ee70ef
Use docker images without XDebug and with Opcache
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-08-23 14:15:13 +02:00
Morris Jobke 4fcd1450be Merge pull request #6218 from nextcloud/sabre-xml-fix
[3rdparty] Fix sabre/xml empty prop parsing
2017-08-23 11:18:18 +02:00
Nextcloud bot 782f6e9454
[tx-robot] updated from transifex 2017-08-23 00:08:55 +00:00