summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2020-03-28132-196/+328
|
* Merge pull request #20170 from nextcloud/techdebt/remove-unused-importsChristoph Wurst2020-03-27197-332/+0
|\ | | | | Remove unused imports
| * Remove unused importsChristoph Wurst2020-03-25197-332/+0
| | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | Merge pull request #20186 from szaimen/patch-2Roeland Jago Douma2020-03-271-1/+1
|\ \ | | | | | | Fix "Use this address..." String
| * | Fix "Use this address..." Stringszaimen2020-03-261-1/+1
| | | | | | | | | Signed-off-by: szaimen <szaimen@e.mail.de>
* | | [tx-robot] updated from transifexNextcloud bot2020-03-2716-8/+428
|/ /
* | Merge pull request #19872 from nextcloud/techdebt/bable-polyfill-to-core-jsJohn Molakvoæ2020-03-2617-107/+105
|\ \ | | | | | | Migrate from @babel/polyfill to core-js@3
| * | Migrate from @babel/polyfill to core-js@3Christoph Wurst2020-03-2617-107/+105
| | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | Merge pull request #20168 from nextcloud/techdebt/short-array-syntaxJoas Schilling2020-03-26454-4220/+4220
|\ \ \ | |/ / |/| | Use the short array syntax, everywhere
| * | Use the short array syntax, everywhereChristoph Wurst2020-03-26454-4220/+4220
|/ / | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | Merge pull request #20123 from lippl/bugfix/ldap-user_count-warningblizzz2020-03-261-28/+26
|\ \ | | | | | | Bugfix - Prevent PHP Warning for count on null on LDAP
| * | single squashed commit for bug fixPhilipp Staiger2020-03-261-28/+26
| | | | | | | | | | | | Signed-off-by: Philipp Staiger <philipp@staiger.it>
* | | Merge pull request #20172 from nextcloud/techdebt/phpunit-short-returnChristoph Wurst2020-03-26230-3356/+3356
|\ \ \ | | | | | | | | Use the shorter phpunit syntax for mocked return values
| * | | Use the shorter phpunit syntax for mocked return valuesChristoph Wurst2020-03-25230-3356/+3356
| | |/ | |/| | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | [tx-robot] updated from transifexNextcloud bot2020-03-2616-22/+50
| | |
* | | Merge pull request #20169 from nextcloud/techdebt/lower-case-true-false-nullChristoph Wurst2020-03-2513-25/+25
|\ \ \ | |/ / |/| | Use lowercase true, false and null constants
| * | Use lowercase true, false and null constantsChristoph Wurst2020-03-2513-25/+25
|/ / | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | Merge pull request #19075 from nextcloud/feature/contact-interaction-eventChristoph Wurst2020-03-2532-7/+1968
|\ \ | | | | | | Collect recent contact interactions
| * | Convert share event to an interaction eventChristoph Wurst2020-03-255-1/+102
| | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
| * | Register an address book with recent contactsChristoph Wurst2020-03-2525-6/+1728
| | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
| * | Add a public event for contacts interactionChristoph Wurst2020-03-253-0/+138
|/ / | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | Merge pull request #20162 from nextcloud/security/update-minimist-packagesJohn Molakvoæ2020-03-251-51/+53
|\ \ | | | | | | Update minimist dependencies
| * | Update minimist dependenciesChristoph Wurst2020-03-251-51/+53
|/ / | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | Merge pull request #20153 from ↵John Molakvoæ2020-03-2522-247/+378
|\ \ | | | | | | | | | | | | nextcloud/enhancement/update-eslint-switch-packages Update eslint and switch to @nextcloud packages
| * | Update eslint and switch to @nextcloud packagesChristoph Wurst2020-03-2522-247/+378
| | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | Merge pull request #20150 from nextcloud/fix/auto_accept_group_shares_new_usersRoeland Jago Douma2020-03-254-0/+87
|\ \ \ | |/ / |/| | Auto accept group shares for users added to a group
| * | Auto accept group shares for users added to a groupRoeland Jago Douma2020-03-254-0/+87
| | | | | | | | | | | | | | | | | | | | | In case auto accepting is enabled (the default). Users that are newly added to a group should not have to accept those shares. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #20145 from ↵blizzz2020-03-252-3/+3
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/bugfix/noid/generated-avatars-and-nophoto-cache Fix generated avatars and nophoto cache files
| * | | Fix generated avatars and nophoto cache filesJoas Schilling2020-03-242-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since nextcloud/server#19493 newFile() by default does not write the file anymore. Setting an empty string as content will make it write the file immediate, without having to call putContent() afterwards. Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | Merge pull request #19986 from nextcloud/bugfix/19980/fix_uid_as_uriRoeland Jago Douma2020-03-252-6/+20
|\ \ \ \ | | | | | | | | | | RefreshWebcalService: randomly generate calendar-object uri
| * | | | RefreshWebcalService: randomly generate calendar-object uriGeorg Ehrke2020-03-162-6/+20
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
* | | | | Merge pull request #14722 from tacruc/GpgMailerHooksRoeland Jago Douma2020-03-258-20/+156
|\ \ \ \ \ | | | | | | | | | | | | Add Mailer events
| * | | | | Added Hook before Message is sendArne Hamann2020-03-248-20/+156
| | |/ / / | |/| | | | | | | | | | | | | Signed-off-by: Arne Hamann <kontakt+github@arne.email>
* | | | | Merge pull request #19955 from nextcloud/bug/19952/translate-web-standardsRoeland Jago Douma2020-03-253-9/+4
|\ \ \ \ \ | | | | | | | | | | | | Use a normal string to translate.
| * | | | | Use a normal string to translate.Daniel Kesselberg2020-03-243-9/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Somehow the multi line strings are still a problem for t. Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de> Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
* | | | | | [tx-robot] updated from transifexNextcloud bot2020-03-2524-4/+58
| |_|_|/ / |/| | | |
* | | | | Merge pull request #19368 from ↵Roeland Jago Douma2020-03-242-7/+7
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/build/handlebars-4.7.3 Bump handlebars from 4.5.3 to 4.7.3 in /build
| * | | | | Bump handlebars from 4.5.3 to 4.7.3 in /builddependabot-preview[bot]2020-03-102-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [handlebars](https://github.com/wycats/handlebars.js) from 4.5.3 to 4.7.3. - [Release notes](https://github.com/wycats/handlebars.js/releases) - [Changelog](https://github.com/wycats/handlebars.js/blob/master/release-notes.md) - [Commits](https://github.com/wycats/handlebars.js/compare/v4.5.3...v4.7.3) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
* | | | | | Merge pull request #19782 from nextcloud/quota-wrapper-include-externalRoeland Jago Douma2020-03-241-9/+18
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Use global used space in quota wrappen when external storage is included
| * | | | | Use global used space in quota wrappen when external storage is includedRobin Appelman2020-03-041-9/+18
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | | Merge pull request #20091 from ↵Roeland Jago Douma2020-03-242-15/+59
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/url-loader-4.0.0 Bump url-loader from 3.0.0 to 4.0.0
| * | | | | | Bump url-loader from 3.0.0 to 4.0.0dependabot-preview[bot]2020-03-222-15/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [url-loader](https://github.com/webpack-contrib/url-loader) from 3.0.0 to 4.0.0. - [Release notes](https://github.com/webpack-contrib/url-loader/releases) - [Changelog](https://github.com/webpack-contrib/url-loader/blob/master/CHANGELOG.md) - [Commits](https://github.com/webpack-contrib/url-loader/compare/v3.0.0...v4.0.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
* | | | | | | Merge pull request #20085 from ↵Roeland Jago Douma2020-03-242-8/+80
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/babel-loader-8.1.0 Bump babel-loader from 8.0.6 to 8.1.0
| * | | | | | | Bump babel-loader from 8.0.6 to 8.1.0dependabot-preview[bot]2020-03-222-8/+80
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [babel-loader](https://github.com/babel/babel-loader) from 8.0.6 to 8.1.0. - [Release notes](https://github.com/babel/babel-loader/releases) - [Changelog](https://github.com/babel/babel-loader/blob/master/CHANGELOG.md) - [Commits](https://github.com/babel/babel-loader/compare/v8.0.6...v8.1.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
* | | | | | | Merge pull request #20127 from nextcloud/bugfix/noid/check-user-on-remote-wipeRoeland Jago Douma2020-03-244-23/+44
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | Check the user on remote wipe
| * | | | | | Check the user on remote wipeJoas Schilling2020-03-164-23/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | | | Merge pull request #18788 from nextcloud/fix/18782/translate-busy-in-caldavChristoph Wurst2020-03-244-10/+47
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Translate 'Busy' in CalDAV
| * | | | | | | Translate 'Busy' in CalDAVGary Kim2020-02-234-10/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Gary Kim <gary@garykim.dev>
* | | | | | | | Merge pull request #20128 from nextcloud/bugfix/education-editionRoeland Jago Douma2020-03-242-2/+0
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Remove admin_notifications since it is obsolete since Nextcloud 14
| * | | | | | | | Remove admin_notifications since it is obsolete since Nextcloud 14Julius Härtl2020-03-242-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-05 00:51:21 +0000