mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
45,491 Commits 349 Branches 696 Tags 1.6 GiB
Commit Graph

45491 Commits

Author SHA1 Message Date
Joas Schilling 3cec0080cf
Bump the version on master 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-09-05 12:31:40 +02:00
Christoph Wurst 16ecd9558f
Merge pull request #11058 from nextcloud/3rdparty/guzzle/6.3.3 
[3rdparty] Update to guzzle 6.3.3
 2018-09-05 11:54:19 +02:00
Roeland Jago Douma 66af2f092f
[3rdparty] Update to guzzle 6.3.3 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-09-05 11:20:16 +02:00
Nextcloud bot bcaf9a48bb
[tx-robot] updated from transifex 2018-09-05 00:12:50 +00:00
Julius Härtl 8feadb8d98
Merge pull request #11048 from nextcloud/stable14-10963 
[stable14] Updates logo scss to regard default values
 2018-09-04 20:31:16 +02:00
Julius Härtl 2e25d22d16
Merge pull request #11022 from nextcloud/bump/npm/settings 
Bump js deps settings
 2018-09-04 13:34:39 +02:00
Roeland Jago Douma 419c7071ff
Merge pull request #11047 from nextcloud/typo/config.sample.php 
Fix typo in config.sample.php
 2018-09-04 12:17:07 +02:00
Roeland Jago Douma adbeb74dc1
Merge pull request #11046 from nextcloud/feature/10725/applogger 
Add wrapper Logger in DIContainer
 2018-09-04 12:15:43 +02:00
Marius Blüm 182636b809
Fix typo in config.sample.php 
Signed-off-by: Marius Blüm <marius@lineone.io>
 2018-09-04 11:18:10 +02:00
Michael Weimann a74629d1e1
Updates logo scss to regard default values 
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
 2018-09-04 11:12:48 +02:00
Roeland Jago Douma b52454db56
Bump js deps settings 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-09-04 10:32:26 +02:00
Roeland Jago Douma 9319d557a4
Add wrapper Logger in DIContainer 
This makes sure that for example app for the context is always set.
We can in the future extend this to include more info.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-09-04 10:05:25 +02:00
John Molakvoæ bcdd5d7b4c
Merge pull request #10975 from nextcloud/dependabot/npm_and_yarn/build/node-sass-4.9.3 
Bump node-sass from 4.9.2 to 4.9.3 in /build
 2018-09-04 09:58:25 +02:00
Christoph Wurst fdc61e81db
Merge pull request #11023 from nextcloud/bump/npm/accessibility 
Bump JS deps Accessibility
 2018-09-04 09:53:23 +02:00
Christoph Wurst 54b1f4df3e
Merge pull request #11044 from nextcloud/td/8.2.0-public-util 
Remove deprecated methods from OCP\Util
 2018-09-04 09:51:33 +02:00
Roeland Jago Douma 52012be4fa
Merge pull request #11040 from nextcloud/feature/11035/worker-src 
Add worker-src to CSP
 2018-09-04 09:50:36 +02:00
Roeland Jago Douma 4f02b307b0
Remove deprecated methods from OCP\Util 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-09-04 08:43:07 +02:00
Roeland Jago Douma 373630c78f
Merge pull request #10914 from nextcloud/quota-typo 
remove space between quota and colon
 2018-09-04 08:29:01 +02:00
Roeland Jago Douma 8354c50911
Deprecate the childSrc functions 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-09-04 07:35:44 +02:00
Roeland Jago Douma c8fe4b4fc8
Add workerSrc to CSP 
Fixes #11035

Since the child-src directive is deprecated (we should kill it at some
point) we need to have the proper worker-src available

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-09-04 07:35:44 +02:00
Christoph Wurst 12a2a754e2
Merge pull request #11024 from nextcloud/bump/npm/updatenotification 
Bump JS deps updatenotification
 2018-09-04 07:23:58 +02:00
Nextcloud bot ccae6271e5
[tx-robot] updated from transifex 2018-09-04 00:12:17 +00:00
Roeland Jago Douma a0a34502c6
Merge pull request #11016 from nextcloud/bump/npm/oauth 
Bump OAuth2 js deps
 2018-09-03 16:57:27 +02:00
Roeland Jago Douma 0545b495e3
Bump JS deps updatenotification 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-09-03 13:10:07 +02:00
Roeland Jago Douma af291b52db
Bump JS deps Accessibility 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-09-03 13:08:15 +02:00
Julius Härtl 41d213c873
Merge pull request #10969 from nextcloud/fix/10968/upload-progress 
Fixes the upload progress bar layout
 2018-09-03 12:04:38 +02:00
Julius Härtl 736f8636f5
Merge pull request #10984 from nextcloud/dependabot/npm_and_yarn/apps/accessibility/webpack-4.17.1 
Bump webpack from 4.16.1 to 4.17.1 in /apps/accessibility
 2018-09-03 12:03:50 +02:00
Roeland Jago Douma fdfe4e4044
Bump OAuth2 js deps 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-09-03 10:40:46 +02:00
dependabot[bot] 9bdeeed234
Bump webpack from 4.16.1 to 4.17.1 in /apps/accessibility 
Bumps [webpack](https://github.com/webpack/webpack) from 4.16.1 to 4.17.1.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v4.16.1...v4.17.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-09-03 07:33:33 +00:00
dependabot[bot] 5d8a750463
Bump node-sass from 4.9.2 to 4.9.3 in /build 
Bumps [node-sass](https://github.com/sass/node-sass) from 4.9.2 to 4.9.3.
- [Release notes](https://github.com/sass/node-sass/releases)
- [Changelog](https://github.com/sass/node-sass/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sass/node-sass/compare/v4.9.2...v4.9.3)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-09-03 07:12:34 +00:00
Roeland Jago Douma 0066bc5bc5
Update map 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-09-03 09:07:16 +02:00
Nextcloud bot 5fe3bbb677
[tx-robot] updated from transifex 2018-09-03 00:12:18 +00:00
Michael Weimann d85ea7fbec
Fixes the upload progress bar layout 
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
 2018-09-02 19:11:11 +02:00
Nextcloud bot d055db7b87
[tx-robot] updated from transifex 2018-09-02 00:12:31 +00:00
Nextcloud bot 021dad53be
[tx-robot] updated from transifex 2018-09-01 00:12:17 +00:00
Morris Jobke c31632ccdf
Merge pull request #10861 from nextcloud/version/noid/14.0.0RC2 
14.0.0 RC 2
 2018-08-31 15:09:46 +02:00
Morris Jobke 9cc6634776
14.0.0 RC 2 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-08-31 14:44:50 +02:00
Morris Jobke 7159ac1233
Merge pull request #10943 from nextcloud/fix/2fa-provider-dao-concurrent-insert 
Fix handlng of concurrent inserts of the 2FA provider registry DAO
 2018-08-31 14:42:55 +02:00
Roeland Jago Douma 3693d9568e
Merge pull request #10944 from nextcloud/content-list-overflow-fix 
Fix overflow x scroll on app content list
 2018-08-31 14:19:06 +02:00
Morris Jobke f4ffa1737e
Merge pull request #10942 from nextcloud/feature/10776/longer-password-reset-time 
Change password expiration time from 12h to 7d
 2018-08-31 14:13:14 +02:00
Morris Jobke cf3f4888cc
Change password expiration time from 12h to 7d 
We use the same logic for creating accounts without a password and there the 12h is a bit short. Users don't expect that the signup link needs to be clicked within 12h - 7d should be a more expected behavior.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-08-31 13:31:03 +02:00
Christoph Wurst fb98db7da7
Fix handlng of concurrent inserts of the 2FA provider registry DAO 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2018-08-31 11:46:27 +02:00
John Molakvoæ (skjnldsv) 27f14cf91b
Fix overflow x scroll on app content list 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-08-31 09:17:54 +02:00
Nextcloud bot 2a22615879
[tx-robot] updated from transifex 2018-08-31 00:12:09 +00:00
Morris Jobke 1ddde36e93
Merge pull request #10939 from nextcloud/bugfix/10930/perm-checker-wrong-path 
Fix path when app has wrong permission
 2018-08-30 21:43:25 +02:00
Morris Jobke 8ea2f8dea4
Merge pull request #10910 from nextcloud/customproperties-ignored-list 
use the same ignored properties list for both CustomerPropertiesBackends
 2018-08-30 21:23:36 +02:00
Roeland Jago Douma 625c81bd11
Merge pull request #10906 from nextcloud/request-params-array 
ensure we always return an array from `Request::getParams`
 2018-08-30 21:07:49 +02:00
Morris Jobke f393cb71ce
Merge pull request #10936 from nextcloud/make-possible-to-pick-both-files-and-folders 
Make possible to pick both files and folders
 2018-08-30 21:03:25 +02:00
Morris Jobke df7dc9c4ab
Merge pull request #10925 from nextcloud/use-main-text-color-for-editable-divs-and-text-areas 
Use main text color for editable divs and text areas
 2018-08-30 20:59:47 +02:00
Daniel Kesselberg a6bb19fa11
Fix path when app has wrong permission 
Replace slow array function used in loop: https://github.com/kalessil/phpinspectionsea/blob/master/docs/performance.md#slow-array-function-used-in-loop

Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2018-08-30 20:52:43 +02:00