summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2020-08-15146-1252/+1268
|
* Merge pull request #22257 from nextcloud/debt/noid/add-parameter-to-setMorris Jobke2020-08-142-2/+2
|\ | | | | Update documentation for QueryBuilder::set
| * Update documentation for QueryBuilder::setDaniel Kesselberg2020-08-142-2/+2
| | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
* | Merge pull request #22221 from nextcloud/fix/19097/ldap-depracted-eventblizzz2020-08-145-5/+117
|\ \ | | | | | | provide event class and typed event to LDAP loaded event; also fixing a logged deprecation message
| * | provide event class to LDAP loaded event to fix deprecation messageArthur Schiwon2020-08-125-5/+117
| | | | | | | | | | | | | | | | | | * and also dispatch the typed event as current approach to it Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | Merge pull request #18969 from nextcloud/enh/apps/use-sidebarMorris Jobke2020-08-1417-173/+289
|\ \ \ | |_|/ |/| | Migrate app management settings to proper sidebar standards
| * | Use appsidebar for appsJohn Molakvoæ (skjnldsv)2020-08-1415-130/+165
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | Use appsidebar for appsJohn Molakvoæ (skjnldsv)2020-08-144-93/+174
|/ / | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | Merge pull request #22243 from nextcloud/fix/20490/no_session_duplicate_warningsMorris Jobke2020-08-141-4/+4
|\ \ | | | | | | Silence duplicate session warnings
| * | Silence duplicate session warningsRoeland Jago Douma2020-08-141-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | Fixes #20490 Basically restroring the old behavior. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #22198 from ↵dependabot-preview[bot]2020-08-144-7/+7
|\ \ \ | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/vue-router-3.4.3
| * | | Bump vue-router from 3.3.4 to 3.4.3dependabot-preview[bot]2020-08-144-7/+7
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [vue-router](https://github.com/vuejs/vue-router) from 3.3.4 to 3.4.3. - [Release notes](https://github.com/vuejs/vue-router/releases) - [Changelog](https://github.com/vuejs/vue-router/blob/dev/CHANGELOG.md) - [Commits](https://github.com/vuejs/vue-router/compare/v3.3.4...v3.4.3) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
* | | Merge pull request #22200 from cweiske/duplicated-sql-where-lineRoeland Jago Douma2020-08-141-1/+0
|\ \ \ | |/ / |/| | Remove duplicated SQL addWhere line
| * | Remove duplicated SQL addWhere lineChristian Weiske2020-08-111-1/+0
| | |
* | | [tx-robot] updated from transifexNextcloud bot2020-08-14262-690/+906
| | |
* | | Merge pull request #22242 from nextcloud/techdebt/noid/remove-deprecated-methodsGary Kim2020-08-145-51/+0
|\ \ \ | | | | | | | | Remove deprecated and unused method calls
| * | | Remove getLastJob from IJobListMorris Jobke2020-08-134-41/+0
| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | Remove setCustomJs of the files_external FrontendDefinitionTraitMorris Jobke2020-08-131-10/+0
| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | Merge pull request #20451 from exussum12/AllowPreviewWhenGeneratorHasBeenRemovedMorris Jobke2020-08-132-13/+77
|\ \ \ \ | | | | | | | | | | Always try and show pre rendered preview
| * | | | Fix existing test and add a specific one for the new caseMorris Jobke2020-08-131-9/+72
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | | Always try and show pre rendered previewScott Dutton2020-08-131-4/+5
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently if the following situation happens Server generates preview Server has command removed which allows a preview to be shown Client asks for preview, gets a 404 error when preview exists (Mime checked before preview) This happens more often with documents, or video as the commands are not native PHP, they require a binary on the server. After the fix the following would happen Server generates preview Server has command removed which allows a preview to be shown Client asks for preview, gets preview which has been generated (Mime checked after preview) This would also allow offline generation (for example a docker image containing the extra binaries), allowing a reduction in attack surface of the instance serving the preview data. Signed-off-by: Scott Dutton <scott@exussum.co.uk>
* | | | Merge pull request #22128 from nextcloud/bugfix/noid/cleanup-chunks-on-failureMorris Jobke2020-08-132-10/+19
|\ \ \ \ | | | | | | | | | | Delete chunks if the move on an upload failed
| * | | | Return proper status when file didn't exist beforeJulius Härtl2020-08-132-2/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | Adjust chunking test for non-existing target nodeJulius Härtl2020-08-121-3/+7
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | Delete chunks if the move on an upload failedJulius Härtl2020-08-121-6/+10
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | | Merge pull request #22235 from ↵Morris Jobke2020-08-131-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | nextcloud/fix/22217/fix-naming-of-app-config-option Fix name of app config option to properly reflect what it does
| * | | | Fix name of app config option to properly reflect what it doesMorris Jobke2020-08-131-1/+1
|/ / / / | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | Merge pull request #22229 from nextcloud/bugfix/noid/dashboard-outdated-bundlesMorris Jobke2020-08-132-2/+2
|\ \ \ \ | | | | | | | | | | Bump outdated dashboard bundles
| * | | | Bump outdated dashboard bundlesJulius Härtl2020-08-132-2/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | | Merge pull request #22202 from nextcloud/enh/noid/cleanup-servercontainerMorris Jobke2020-08-131-125/+83
|\ \ \ \ \ | |/ / / / |/| | | | Use autowiring where possible in server container
| * | | | Add @deprecated labels for server DI containter aliasesMorris Jobke2020-08-131-0/+64
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | | Use registerDeprecatedAlias for non-namespaced aliasesMorris Jobke2020-08-131-3/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | | Use autowiring where possible in server containerMorris Jobke2020-08-131-125/+19
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | Merge pull request #21788 from nextcloud/debt/noid/unused-methodRoeland Jago Douma2020-08-131-9/+0
|\ \ \ \ \ | | | | | | | | | | | | Remove unused method uploadFile
| * | | | | Remove unused method uploadFileDaniel Kesselberg2020-08-131-9/+0
| |/ / / / | | | | | | | | | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
* | | | | Merge pull request #22205 from nextcloud/activity-settings-cleanupMorris Jobke2020-08-1316-345/+89
|\ \ \ \ \ | | | | | | | | | | | | merge file activity settings into a single 'favorite changed' item
| * | | | | merge file activity settings into a single 'favorite changed' itemRobin Appelman2020-08-1313-309/+37
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | | move share notifcation settings to files groupRobin Appelman2020-08-136-36/+52
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | | Merge pull request #21344 from nextcloud/fix/twofactor-cleanup-eventMorris Jobke2020-08-137-16/+118
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Emit an event for every disabled 2FA provider during cleanup
| * | | | | Emit an event for every disabled 2FA provider during cleanupChristoph Wurst2020-06-167-16/+118
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | | | [tx-robot] updated from transifexNextcloud bot2020-08-1338-30/+60
| |/ / / / |/| | | |
* | | | | Merge pull request #22206 from nextcloud/enh/noid/tests-recent-contact-mapperMorris Jobke2020-08-121-0/+134
|\ \ \ \ \ | | | | | | | | | | | | Add some tests for RecentContactMapper
| * | | | | Add some tests for RecentContactMapperDaniel Kesselberg2020-08-121-0/+134
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
* | | | | | Merge pull request #22217 from ↵Morris Jobke2020-08-121-0/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/enh/noid/disable-admin-changed-email-appconfig Add app config option to disable "Email was changed by admin" email
| * | | | | | Add app config option to disable "Email was changed by admin" emailMorris Jobke2020-08-121-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | | Merge pull request #22199 from ↵Morris Jobke2020-08-12347-1868/+1847
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | nextcloud/techdebt/noid/PHPUnit_Framework_MockObject_MockObject Change PHPDoc type hint from PHPUnit_Framework_MockObject_MockObject to …
| * | | | | | Change PHPDoc type hint from PHPUnit_Framework_MockObject_MockObject to ↵Morris Jobke2020-08-12347-1868/+1847
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | \PHPUnit\Framework\MockObject\MockObject Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | Merge pull request #22211 from nextcloud/fix/noid/rm-useless-logblizzz2020-08-121-8/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | remove logging message carrying no valuable information
| * | | | | | remove logging message carrying no valuable informationArthur Schiwon2020-08-121-8/+5
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the exception caught is not an error, but due to valid configuration and code flow is expecting this. For an admin it is confusing, and it carries no information worth for debugging. Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | | | | Merge pull request #22196 from nextcloud/enh/sse/do_not_concatenate_intsMorris Jobke2020-08-121-2/+8
|\ \ \ \ \ \ | |/ / / / / |/| | | | | SSE enhancement of file signature