aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Enhance README to mention module compilationVincent Petry2020-10-091-1/+6
| | | | | | Added hint about MODULE=xxx when recompiling production assets. Signed-off-by: Vincent Petry <vincent@nextcloud.com>
* Add to README about compiling JS production assets.Vincent Petry2020-10-091-0/+7
| | | | | | | Add note in README about the need to checkin also compiled JS assets after running `make build-js-production`. Signed-off-by: Vincent Petry <vincent@nextcloud.com>
* Merge pull request #23264 from nextcloud/bug/23177/escape-htmlRoeland Jago Douma2020-10-091-0/+8
|\ | | | | Add local version of escapeHTML
| * Add local version of escapeHTMLDaniel Kesselberg2020-10-071-0/+8
| | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
* | Merge pull request #23249 from nextcloud/techdebt/server-container-cleanupRoeland Jago Douma2020-10-091-227/+263
|\ \ | | | | | | Server container cleanup
| * | Clean up the serverChristoph Wurst2020-10-091-227/+263
| | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | Merge pull request #23287 from nextcloud/enh/bruteforce/limit_storageRoeland Jago Douma2020-10-097-1/+116
|\ \ \ | |/ / |/| | Limit storing bruteforce attempts
| * | Limit throttler to 48 hoursRoeland Jago Douma2020-10-081-0/+5
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | Add cleanup job for old brutefoce attemptsRoeland Jago Douma2020-10-086-1/+111
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #23299 from ↵Roeland Jago Douma2020-10-091-33/+0
|\ \ \ | | | | | | | | | | | | | | | | nextcloud-pr-bot/automated/noid/psalm-baseline-update [Automated] Update psalm-baseline.xml
| * | | Update psalm baselineNextcloud-PR-Bot2020-10-091-33/+0
|/ / / | | | | | | | | | Signed-off-by: GitHub <noreply@github.com>
* | | [tx-robot] updated from transifexNextcloud bot2020-10-09106-72/+316
| | |
* | | Merge pull request #23161 from nextcloud/enh/noid/setup-checks2Roeland Jago Douma2020-10-083-58/+0
|\ \ \ | |/ / |/| | Remove setup check for php mail
| * | Remove setup check for php mailDaniel Kesselberg2020-10-033-58/+0
| | | | | | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
* | | Merge pull request #23291 from ↵Roeland Jago Douma2020-10-083-10/+10
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/techdebt/noid/use-psr-logger-in-event-dispatcher Use PSR Logger in event dispatcher
| * | | Use PSR Logger in event dispatcherJoas Schilling2020-10-083-10/+10
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | Merge pull request #23292 from ↵Roeland Jago Douma2020-10-081-1/+0
|\ \ \ \ | |/ / / |/| | | | | | | | | | | nextcloud/enh/noid/job-run-does-not-return-anything Job::run() does not return anything
| * | | Job::run() does not return anythingMorris Jobke2020-10-081-1/+0
|/ / / | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #23275 from nextcloud/fix/dashboard-statuses-sortRoeland Jago Douma2020-10-083-4/+13
|\ \ \ | | | | | | | | Fix dashboard statuses sort
| * | | fix dashboard statuses sort functionJulien Veyssier2020-10-083-4/+13
| | | | | | | | | | | | | | | | Signed-off-by: Julien Veyssier <eneiluj@posteo.net>
* | | | Merge pull request #23279 from nextcloud/enh/weather-favoritesRoeland Jago Douma2020-10-087-4/+144
|\ \ \ \ | | | | | | | | | | Add favorite weather locations
| * | | | add favorite weather locationsJulien Veyssier2020-10-087-4/+144
| |/ / / | | | | | | | | | | | | Signed-off-by: Julien Veyssier <eneiluj@posteo.net>
* | | | Merge pull request #23020 from nextcloud/disable-notify-self-checkRobin Appelman2020-10-081-1/+10
|\ \ \ \ | | | | | | | | | | add option to disable notify self check
| * | | | add option to disable notify self checkRobin Appelman2020-09-231-1/+10
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | Merge pull request #23269 from sharidas/fix-remove-user-from-grpJohn Molakvoæ2020-10-083-4/+4
|\ \ \ \ \ | | | | | | | | | | | | Fix the user remove from group in UI
| * | | | | Fix the user remove from group in UISujith Haridasan2020-10-083-4/+4
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | Fix the removal of user from the group in UI. Signed-off-by: Sujith Haridasan <sujith.h@gmail.com>
* | | | | Merge pull request #23245 from nextcloud/techdebt/server-bus-deprecate-aliasRoeland Jago Douma2020-10-081-3/+3
|\ \ \ \ \ | |/ / / / |/| | | | Deprecate the named alias of IBus
| * | | | Deprecate the named alias of IBusChristoph Wurst2020-10-071-3/+3
| | |_|/ | |/| | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | [tx-robot] updated from transifexNextcloud bot2020-10-0872-62/+162
| | | |
* | | | Merge pull request #21860 from nextcloud/techdebt/encryption-psr-containerMorris Jobke2020-10-071-74/+77
|\ \ \ \ | |/ / / |/| | | Migrate encryption to the PSR container
| * | | Migrate encryption to the PSR containerChristoph Wurst2020-10-071-74/+77
| | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | Merge pull request #23184 from ↵Morris Jobke2020-10-073-38/+35
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | nextcloud/bugfix/noid/make-sure-getUsersFavoritingObject-can-be-run-without-a-user Make sure getUsersFavoritingObject can be run without a user
| * | | | Make sure getUsersFavoritingObject can be run without a userJoas Schilling2020-10-063-38/+35
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | Merge pull request #23248 from nextcloud/techdebt/server-getters-query-getRoeland Jago Douma2020-10-071-102/+103
|\ \ \ \ \ | | | | | | | | | | | | Use the ContainerInterface::get inside the server container
| * | | | | Use the ContainerInterface::get inside the server containerChristoph Wurst2020-10-071-102/+103
| | |/ / / | |/| | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | | Merge pull request #23252 from nextcloud/fix/l10n/activitiesRoeland Jago Douma2020-10-071-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Use the correct l10n for activities
| * | | | | Use the correct l10n for activitiesRoeland Jago Douma2020-10-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | | Merge pull request #23164 from nextcloud/feat/files-sidebar-cleanup-standardsJohn Molakvoæ2020-10-0757-238/+303
|\ \ \ \ \ \
| * | | | | | Bump @nextcloud/vue to v2.6.9John Molakvoæ (skjnldsv)2020-10-0738-45/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
| * | | | | | Upgrade lifecycle and vue parent contextJohn Molakvoæ (skjnldsv)2020-10-0725-116/+165
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
| * | | | | | Move Files Sidebar to proper javascript standardJohn Molakvoæ (skjnldsv)2020-10-077-117/+124
| | |/ / / / | |/| | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | | | | Merge pull request #23243 from ↵Roeland Jago Douma2020-10-071-222/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | nextcloud-pr-bot/automated/noid/psalm-baseline-update [Automated] Update psalm-baseline.xml
| * | | | | | Update psalm baselineNextcloud-PR-Bot2020-10-071-222/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | Signed-off-by: GitHub <noreply@github.com>
* | | | | | Merge pull request #23244 from ↵Roeland Jago Douma2020-10-072-14/+17
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | nextcloud/techdebt/noid/user-psr-logger-interface-in-comments Use PSR logger interface in comments manager
| * | | | | Use PSR logger interface in comments managerJoas Schilling2020-10-072-14/+17
| |/ / / / | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | [tx-robot] updated from transifexNextcloud bot2020-10-0754-138/+200
| | | | |
* | | | | Merge pull request #23129 from nextcloud/enh/noid/tests-user-statusMorris Jobke2020-10-062-1/+27
|\ \ \ \ \ | | | | | | | | | | | | More tests for user_status
| * | | | | Another test for user live status listenerDaniel Kesselberg2020-10-011-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
| * | | | | Add test case for getDefaultStatusByIdDaniel Kesselberg2020-09-241-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
* | | | | | Merge pull request #23025 from Iscle/masterMorris Jobke2020-10-061-2/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | DirectController: Let users choose the link expiration time