summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2019-07-2864-56/+38
|
* Merge pull request #16560 from nextcloud/bugfix/noid/fix_cutype_reportingRoeland Jago Douma2019-07-271-11/+16
|\ | | | | fix calendar-user-type reporting
| * fix CUType reportingGeorg Ehrke2019-07-261-11/+16
| | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
* | Merge pull request #16558 from nextcloud/enh/less_verbose_locked_loggingRoeland Jago Douma2019-07-271-3/+3
|\ \ | | | | | | Do not log all locked exceptions
| * | Do not log all locked exceptionsRoeland Jago Douma2019-07-261-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | This can happen for valid reasons (multiple users writing at the same time) with for example the text app. Apps should properly handle it. No reason to log it by default. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | [tx-robot] updated from transifexNextcloud bot2019-07-27126-212/+218
| | |
* | | Merge pull request #16556 from ↵Morris Jobke2019-07-261-0/+25
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/feature/16554_adminAuditShareByMail/wiswedel log email shares in admin_audit log
| * | | log email shares in admin_audit logSascha Wiswedel2019-07-261-0/+25
| |/ / | | | | | | | | | Signed-off-by: Sascha Wiswedel <sascha.wiswedel@nextcloud.com>
* | | Merge pull request #16557 from nextcloud/enh/do_not_log_locked_filesMorris Jobke2019-07-261-1/+8
|\ \ \ | | | | | | | | Do not log locked files
| * | | Do not log locked filesRoeland Jago Douma2019-07-261-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This is the code doing its job. There is no need to spam the log file with this. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | Merge pull request #16555 from nextcloud/fix/16529/mask-keysMorris Jobke2019-07-262-4/+7
|\ \ \ \ | | | | | | | | | | use a pattern to identify sensitive config keys
| * | | | treat sensitive config keys by patternArthur Schiwon2019-07-262-4/+7
| | |/ / | |/| | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | | Merge pull request #16551 from nextcloud/fix/12735/displayname-emailMorris Jobke2019-07-262-1/+227
|\ \ \ \ | | | | | | | | | | supresses disclosing the userid for LDAP users in the welcome mail
| * | | | supresses disclosing the userid for LDAP users in the welcome mailArthur Schiwon2019-07-262-1/+227
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | The userid is not relevant here, and by default cannot be used to login with. Typically, there is a common type of login names in organizations (LDAP username or email most often) that does not need to be disclosed. Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | | Merge pull request #16456 from nextcloud/dep/searchByTagRoeland Jago Douma2019-07-2610-306/+0
|\ \ \ \ | |_|/ / |/| | | Remove deprecated searchByTag
| * | | Remove deprecated searchByTagRoeland Jago Douma2019-07-2610-306/+0
| |/ / | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #16461 from nextcloud/fix/noid/pgsql-versionRoeland Jago Douma2019-07-261-2/+2
|\ \ \ | |/ / |/| | fixes the check for postgresql
| * | fixes the check for postgresqlArthur Schiwon2019-07-181-2/+2
| | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | Merge pull request #16542 from ↵Roeland Jago Douma2019-07-261-17/+3
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/build/fstream-1.0.12 [Security] Bump fstream from 1.0.11 to 1.0.12 in /build
| * | | [Security] Bump fstream from 1.0.11 to 1.0.12 in /builddependabot-preview[bot]2019-07-251-17/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [fstream](https://github.com/npm/fstream) from 1.0.11 to 1.0.12. **This update includes a security fix.** - [Release notes](https://github.com/npm/fstream/releases) - [Commits](https://github.com/npm/fstream/compare/v1.0.11...v1.0.12) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
* | | | [tx-robot] updated from transifexNextcloud bot2019-07-2612-54/+56
| | | |
* | | | Merge pull request #16532 from nextcloud/bugfix/14776/maxcontrast-fixMorris Jobke2019-07-251-3/+6
|\ \ \ \ | |/ / / |/| | | Fix max contrast retrieval to limit minimum color for relative time
| * | | Trigger fallback code to get max contrast value and use integer thereMorris Jobke2019-07-251-2/+5
| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | Fix max contrast retrieval to limit minimum color for relative timeMorris Jobke2019-07-241-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | Merge pull request #16503 from ↵Roeland Jago Douma2019-07-251-0/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | nextcloud/bugfix/5504/create_new_birthday_calendars_with_VEVENT_only allow to provide supported calendar component set internally as a string
| * | | | allow to provide supported calendar component set internally as a stringGeorg Ehrke2019-07-221-0/+5
| |/ / / | | | | | | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
* | | | [tx-robot] updated from transifexNextcloud bot2019-07-2514-12/+50
| | | |
* | | | Merge pull request #16528 from nextcloud/shipped-texteditorMorris Jobke2019-07-241-1/+0
|\ \ \ \ | | | | | | | | | | Remove files_texteditor from shipped apps
| * | | | Remove files_texteditor from shipped appsJulius Härtl2019-07-241-1/+0
|/ / / / | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | Merge pull request #15637 from nextcloud/bugfix/15567/ignore-hidden-shareblizzz2019-07-242-4/+51
|\ \ \ \ | | | | | | | | | | Allow hidden smb shares
| * | | | Fix wrong indentationDaniel Kesselberg2019-07-221-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
| * | | | Fix invalid recursionDaniel Kesselberg2019-07-212-3/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
| * | | | Allow hidden smb sharesDaniel Kesselberg2019-07-162-1/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A hidden smb share ends with $. This patch changes the placeholder detection to allow shares with $ at the end. Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
* | | | | Merge pull request #16523 from ↵blizzz2019-07-241-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/bugfix/noid/nested-recursion-breaking-max-nested-level-for-parent-comment Nested recursion breaking max nested level for parent comment calculation
| * | | | | PHPStorm code cleanupJoas Schilling2019-07-241-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | | Get the topmost parent for the parent instead of doing endless recursionJoas Schilling2019-07-241-1/+1
|/ / / / / | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | Merge pull request #16493 from nextcloud/enh/remove-curly-bracesRoeland Jago Douma2019-07-241-1/+1
|\ \ \ \ \ | | | | | | | | | | | | The array and string offset access syntax using curly braces is depre…
| * | | | | The array and string offset access syntax using curly braces is deprecated.Daniel Kesselberg2019-07-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
* | | | | | [tx-robot] updated from transifexNextcloud bot2019-07-244-0/+6
| | | | | |
* | | | | | Merge pull request #16505 from nextcloud/enh/nitpicks-14954Roeland Jago Douma2019-07-232-5/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | Dont assign $options to $options and cleanup doc
| * | | | | | Dont assign $options to $options and cleanup docDaniel Kesselberg2019-07-222-5/+4
| | |_|/ / / | |/| | | | | | | | | | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
* | | | | | Merge pull request #16514 from ↵Roeland Jago Douma2019-07-232-55/+180
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/babel/preset-env-7.5.5 Bump @babel/preset-env from 7.5.4 to 7.5.5
| * | | | | | Bump @babel/preset-env from 7.5.4 to 7.5.5dependabot-preview[bot]2019-07-212-55/+180
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [@babel/preset-env](https://github.com/babel/babel) from 7.5.4 to 7.5.5. - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md) - [Commits](https://github.com/babel/babel/compare/v7.5.4...v7.5.5) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
* | | | | | | Merge pull request #16492 from nextcloud/enh/exclude-rnd-filesMorris Jobke2019-07-232-4/+6
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | Exclude .rnd files from integrity check
| * | | | | | Exclude .rnd files from integrity checkDaniel Kesselberg2019-07-212-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
* | | | | | | Merge pull request #16497 from ↵Roeland Jago Douma2019-07-234-19/+148
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/babel/core-7.5.5 Bump @babel/core from 7.5.4 to 7.5.5
| * | | | | | | Bump @babel/core from 7.5.4 to 7.5.5dependabot-preview[bot]2019-07-224-19/+148
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [@babel/core](https://github.com/babel/babel) from 7.5.4 to 7.5.5. - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md) - [Commits](https://github.com/babel/babel/compare/v7.5.4...v7.5.5) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
* | | | | | | [tx-robot] updated from transifexNextcloud bot2019-07-238-2/+22
| |_|/ / / / |/| | | | |
* | | | | | Merge pull request #16450 from ↵Morris Jobke2019-07-223-58/+10
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/tech-debt/noid/cleanup-unused-OC_API-methods Removes unused OC_API::register
| * | | | | | Adjust deprecation testsMorris Jobke2019-07-221-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>