Commit Graph

44339 Commits

Author SHA1 Message Date
blizzz 28e64afb8c
Merge pull request #10034 from nextcloud/fix/noid/ldap-silence-quota-logmsgs
lower log level for quota manipulation cases
2018-06-28 23:06:23 +02:00
Arthur Schiwon cc51a00c93
lower log level for quota manipulation cases
and simplify the forest of ifs a little bit

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-06-28 21:10:07 +02:00
Roeland Jago Douma 9ad0e61df6
Merge pull request #10040 from nextcloud/fix-filenames-in-sharing-integration-tests
Fix filenames in sharing integration tests
2018-06-28 19:32:24 +02:00
Roeland Jago Douma dd880d1319
Merge pull request #10042 from nextcloud/fix-variable-not-replaced-in-behat-yml-when-default-value-was-used
Fix variable not replaced in "behat.yml" when default value was used
2018-06-28 19:31:19 +02:00
Daniel Calviño Sánchez ea6b5063b5 Fix variable not replaced in "behat.yml" when default value was used
As "selenium.server" is a simulated variable it is not recognized by
Mink, so it must be always replaced by its value in "behat.yml" before
the file is parsed by Behat.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-06-28 17:32:38 +02:00
Morris Jobke 111c6ceef9
Merge pull request #10039 from nextcloud/ci/noid/disable-codecov-status-and-comment
Disable codecov status and comment
2018-06-28 17:17:25 +02:00
Daniel Calviño Sánchez b506ec1c89 Check all paths for own files and shares
Add "PARENT (2)" and its subdirectories to the paths to be checked, as
before only the own "PARENT" folder was being checked, but not the
shared one.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-06-28 16:45:42 +02:00
Daniel Calviño Sánchez e1c28c403d Fix filenames in sharing integration tests
When a file is shared and the receiver of the share already has a file
with the same name that file is left untouched, and "(2)" is appended to
the name of the shared file.

As "textfile0.txt" is included in the user folder skeleton all the users
in the integration test have that file, so when it is shared the
receiver sees the share as "/textfile0 (2).txt", and her own file as
"/textfile0.txt".

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-06-28 16:36:19 +02:00
Morris Jobke 096c92cbee
Disable codecov status and comment
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-06-28 16:34:16 +02:00
Roeland Jago Douma 388ea2234f
Merge pull request #10036 from nextcloud/feature/9221/show-path-in-log
Log path of file that failed to be parsed
2018-06-28 11:36:24 +02:00
Morris Jobke d4692d1fbe
Log path of file that failed to be parsed
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-06-28 11:09:50 +02:00
Morris Jobke a077c129c8
Merge pull request #10031 from nextcloud/fix/9987/ldap-backupserver-connect
LDAP backup server should not be queried when auth fails
2018-06-28 08:38:52 +02:00
Nextcloud bot 1bf486d93f
[tx-robot] updated from transifex 2018-06-28 00:12:20 +00:00
Arthur Schiwon 7a728f2154
LDAP backup server should not be queried when auth fails
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-06-27 23:12:07 +02:00
Roeland Jago Douma ad2ef3a81f
Merge pull request #10020 from nextcloud/bugfix/spreed-1007/email-address-misparsed-in-comments-and-chat
Fix "parsing" of email-addresses in comments and chat messages
2018-06-27 20:40:47 +02:00
Roeland Jago Douma 0872f0b4b2
Merge pull request #10018 from nextcloud/rakekniven-patch-2
Update root.vue
2018-06-27 20:22:31 +02:00
Morris Jobke aa99be29ba
Merge pull request #10027 from nextcloud/feature/noid/settings-groupware
Add groupware settings section
2018-06-27 20:04:02 +02:00
Julius Härtl f3949cf1a8
Add groupware settings section
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-06-27 19:16:21 +02:00
Morris Jobke 9b2d855d19
Merge pull request #10023 from nextcloud/bugfix/noid/class-name-already-in-use
Use the correct Base class
2018-06-27 17:21:37 +02:00
Joas Schilling 826ea8c3f9
Use the correct Base class
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-06-27 14:17:00 +02:00
Morris Jobke 314ad266d5
Compile app
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-06-27 13:47:31 +02:00
Joas Schilling e1936a49e7
Fix "parsing" of email-addresses in comments and chat messages
\\b matches any non-word character, including \@ and \-
In order to not detect urls in the middle of email-addresses,
we need to check for white space characters and beginning of the
message instead.

Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-06-27 13:04:05 +02:00
Roeland Jago Douma 221f558f66
Merge pull request #10016 from nextcloud/dependabot/npm_and_yarn/apps/accessibility/webpack-4.12.2
Bump webpack from 4.12.1 to 4.12.2 in /apps/accessibility
2018-06-27 12:47:53 +02:00
Roeland Jago Douma 719f62b9c9
Merge pull request #10013 from nextcloud/dependabot/npm_and_yarn/apps/oauth2/webpack-4.12.2
Bump webpack from 4.12.1 to 4.12.2 in /apps/oauth2
2018-06-27 12:47:08 +02:00
Morris Jobke e4e3387417
Merge pull request #10009 from nextcloud/techdebt/noid/replace-headers-with-http_response_code-calls
Replace hard coded HTTP status codes with proper calls to http_response_code
2018-06-27 12:14:52 +02:00
Morris Jobke d984be7e2a
Merge pull request #10019 from nextcloud/accessibility-skip-translatable
Make skip navigation links translatable
2018-06-27 12:09:56 +02:00
Nextcloud bot 46b62ff579
[tx-robot] updated from transifex 2018-06-27 10:06:12 +00:00
Jan-Christoph Borchardt 4afdf922f2
Make skip navigation links translatable
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2018-06-27 11:37:08 +02:00
rakekniven 94f5a21b48
Update root.vue
Fix for #8897 (Description of stable is not suitable )
2018-06-27 11:30:24 +02:00
dependabot[bot] fab3377ebb
Bump webpack from 4.12.1 to 4.12.2 in /apps/accessibility
Bumps [webpack](https://github.com/webpack/webpack) from 4.12.1 to 4.12.2.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v4.12.1...v4.12.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-06-27 09:17:57 +00:00
dependabot[bot] e7cc2dd01c
Bump webpack from 4.12.1 to 4.12.2 in /apps/oauth2
Bumps [webpack](https://github.com/webpack/webpack) from 4.12.1 to 4.12.2.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v4.12.1...v4.12.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-06-27 09:17:55 +00:00
Julius Härtl 81ad19b4e2
Merge pull request #10015 from nextcloud/dependabot/npm_and_yarn/apps/updatenotification/webpack-4.12.2
Bump webpack from 4.12.1 to 4.12.2 in /apps/updatenotification
2018-06-27 11:15:34 +02:00
dependabot[bot] 08aebce923
Bump webpack from 4.12.1 to 4.12.2 in /apps/updatenotification
Bumps [webpack](https://github.com/webpack/webpack) from 4.12.1 to 4.12.2.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v4.12.1...v4.12.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-06-27 08:08:42 +00:00
John Molakvoæ 3d44c1e6ac
Merge pull request #10014 from nextcloud/dependabot/npm_and_yarn/settings/webpack-4.12.2
Bump webpack from 4.12.1 to 4.12.2 in /settings
2018-06-27 10:06:37 +02:00
dependabot[bot] 11853855ee
Bump webpack from 4.12.1 to 4.12.2 in /settings
Bumps [webpack](https://github.com/webpack/webpack) from 4.12.1 to 4.12.2.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v4.12.1...v4.12.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-06-27 07:32:56 +00:00
Nextcloud bot a6666071be
[tx-robot] updated from transifex 2018-06-27 00:11:52 +00:00
Morris Jobke e9001fecb6
Merge pull request #10005 from nextcloud/group-exists-error
show error message when group exists
2018-06-26 17:35:55 +02:00
Morris Jobke 2b8a4f1aeb
Merge pull request #10007 from nextcloud/feature/noid/oauth_valid_redirect_uri
Validate OAuth2 redirect uri
2018-06-26 17:31:54 +02:00
Roeland Jago Douma 555de27567
Validate OAuth2 redirect uri
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-06-26 16:15:53 +02:00
Morris Jobke b0a296e2e1
Do not use HTTP code OC_Response constants anymore
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-06-26 16:14:15 +02:00
Morris Jobke 79d9841bce
Replace hardcoded status headers with calls to http_response_code()
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-06-26 16:14:15 +02:00
Morris Jobke d9d557a5ef
Merge pull request #10004 from nextcloud/accessibility-skip
Add skip navigation / skip to content links for accessibility
2018-06-26 16:11:19 +02:00
Morris Jobke cfb50fdeaf
Merge pull request #10006 from nextcloud/group-exists-details
Fix groupExists when a backend provides group details
2018-06-26 16:09:53 +02:00
Roeland Jago Douma 890cd746e4
Merge pull request #10003 from nextcloud/accessibility-package-deps-fix
Fix deps security
2018-06-26 15:29:49 +02:00
Robin Appelman 290b5b5461
show error message when group exists
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-06-26 15:00:54 +02:00
Robin Appelman 605ba57086
Fix groupExists when a backend provides group details
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-06-26 15:00:08 +02:00
Jan-Christoph Borchardt de5d5ee0e7
Add skip navigation / skip to content links
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2018-06-26 14:26:30 +02:00
Morris Jobke 43f7ea5852
Merge pull request #10002 from nextcloud/docs/noid/phpdoc-putContent-resource
Add resource type phpDoc for putContent methods
2018-06-26 13:59:21 +02:00
Julius Härtl 73cf71a20f
Add resource type phpDoc for putContent methods
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-06-26 13:58:58 +02:00
John Molakvoæ (skjnldsv) 66f71ac42e
Fix deps security
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-06-26 13:49:33 +02:00