mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
56,859 Commits 349 Branches 696 Tags 1.6 GiB
Commit Graph

56859 Commits

Author SHA1 Message Date
Morris Jobke 7001f03645
Merge pull request #25010 from nextcloud/revert-24955-external-storage-login-ldap 
Revert "allow using any ldap property as login name when using login credentials"
 2021-01-07 14:14:50 +01:00
blizzz 72f16a46e8
Revert "allow using any ldap property as login name when using login credentials" 2021-01-07 14:01:32 +01:00
Morris Jobke 38e534e7c1
Merge pull request #24955 from nextcloud/external-storage-login-ldap 
allow using any ldap property as login name when using login credentials
 2021-01-07 13:33:18 +01:00
Roeland Jago Douma f552f23e43
Merge pull request #25003 from nextcloud/psalm/noid/phpdoc-fix-return-type 
Fix return types for Archive::getStream
 2021-01-07 13:31:24 +01:00
Roeland Jago Douma 2495e1825a
Merge pull request #25001 from nextcloud/bugfix/23044/fix-column-name-check 
Fix column name to check prior to deleting
 2021-01-07 13:30:49 +01:00
Roeland Jago Douma 450211590f
Merge pull request #25000 from nextcloud/bugfix/noid/hide-client-welcome-mail 
Hide client link in welcome mail if an empty customclient_desktop config is set
 2021-01-07 13:30:11 +01:00
Morris Jobke 15e8f8b817
Merge pull request #25004 from nextcloud/fix/noid/php8-optional-parameter-before-mandatory 
Fix warning in PHP 8 about optional parameter before mandatory one
 2021-01-07 13:26:51 +01:00
Morris Jobke 59ae722087
Fix warning in PHP 8 about optional parameter before mandatory one 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2021-01-07 12:43:56 +01:00
Morris Jobke a39bd18654
Fix return types for Archive::getStream 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2021-01-07 12:38:41 +01:00
Joas Schilling 30c603c6b2
Fix column name to check prior to deleting 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2021-01-07 10:50:36 +01:00
Julius Härtl abfb72378f
Hide client link in welcome mail if an empty customclient_desktop config is set 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2021-01-07 10:45:54 +01:00
dependabot-preview[bot] 2dd04f76d2
Merge pull request #24967 from nextcloud/dependabot/npm_and_yarn/nextcloud/axios-1.6.0 2021-01-07 09:32:37 +00:00
Roeland Jago Douma 514df6e64e
Merge pull request #24994 from nextcloud/ci/postgres_update 
Update postgres version tests
 2021-01-07 09:56:37 +01:00
Julius Härtl 27e43d810f
Merge pull request #24911 from nextcloud/fix/tasks-calendar/undefined-index-search 
Tasks search: make sure we have existing indexes before using them
 2021-01-07 09:35:52 +01:00
dependabot-preview[bot] 73f9f3f9ae
Bump @nextcloud/axios from 1.5.0 to 1.6.0 
Bumps [@nextcloud/axios](https://github.com/nextcloud/nextcloud-axios) from 1.5.0 to 1.6.0.
- [Release notes](https://github.com/nextcloud/nextcloud-axios/releases)
- [Changelog](https://github.com/nextcloud/nextcloud-axios/blob/master/CHANGELOG.md)
- [Commits](https://github.com/nextcloud/nextcloud-axios/compare/v1.5.0...v1.6.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Signed-off-by: npmbuildbot-nextcloud[bot] <npmbuildbot-nextcloud[bot]@users.noreply.github.com>
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2021-01-07 09:29:29 +01:00
Roeland Jago Douma 734b29b277
Update postgres version tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2021-01-07 09:27:10 +01:00
Roeland Jago Douma ae2ca5b002
Merge pull request #24993 from nextcloud/ci/db_drop_mysql_5 
No need to run mysql5 tests anymore
 2021-01-07 08:44:31 +01:00
Roeland Jago Douma 8fee2a977f
Merge pull request #24988 from nextcloud/enh/make_sure_cache_is_set 
Set the JSCombiner cache if needed
 2021-01-07 08:41:15 +01:00
Nextcloud bot d477d4fee3
[tx-robot] updated from transifex 2021-01-07 02:21:10 +00:00
Roeland Jago Douma e334fa2594
No need to run mysql5 tests anymore 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2021-01-06 21:26:39 +01:00
Roeland Jago Douma 733e1d8407
Merge pull request #24986 from nextcloud/crl/update-revoked-transmission.crt 
Update root.crl due to revocation of transmission.crt
 2021-01-06 20:42:27 +01:00
Roeland Jago Douma ed1dcd3651
Set the JSCombiner cache if needed 
Found while debugging a customer setup. They had to flush their Redis.
Hence the info was no longer there. Since they also used S3 this meant
requesting the files over and over on template render. Which on S3 is
not cheap.

Now we just write it back if we can't get it from the cache in the first
place. So that the next run has it cached properly again.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2021-01-06 16:15:17 +01:00
Roeland Jago Douma ad3735ba27
Merge pull request #24317 from SMillerDev/app_password_command 
App password command
 2021-01-06 15:35:39 +01:00
Morris Jobke efd5768b26
Update root.crl due to revocation of transmission.crt 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2021-01-06 13:31:36 +01:00
Morris Jobke 55caf6259a
Revert "Update root.crl due to revocation of transmission.crt" 
This reverts commit 48197dced3.
 2021-01-06 13:31:03 +01:00
Morris Jobke 48197dced3
Update root.crl due to revocation of transmission.crt 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2021-01-06 13:30:02 +01:00
Roeland Jago Douma d31435d7f5
Merge pull request #24979 from nextcloud-pr-bot/automated/noid/psalm-baseline-update 
[Automated] Update psalm-baseline.xml
 2021-01-06 09:30:24 +01:00
Nextcloud-PR-Bot f653e933f4 Update psalm baseline 
Signed-off-by: GitHub <noreply@github.com>
 2021-01-06 04:51:06 +00:00
Nextcloud bot e160104caf
[tx-robot] updated from transifex 2021-01-06 02:20:00 +00:00
Julius Härtl 5fa935d6d6
Merge pull request #24900 from nextcloud/fix/user-settings 
Fix updating user settings
 2021-01-05 23:01:59 +01:00
Julien Veyssier ef0732384f
Merge pull request #24970 from nina-py/24938-dashboard-greetings-show-good-morning-after-noon 
Fix dashboard greetings that show 'good morning' after noon
 2021-01-05 18:58:21 +01:00
Julius Härtl 15b8bb9a7a
Merge pull request #24917 from nextcloud/enhancement/guzzle7 
Update all the things for Guzzle 7 (php8 compat)
 2021-01-05 16:44:29 +01:00
Julius Härtl 9b9c1aa7fd
Merge pull request #24961 from nextcloud/bugfix/noid/copy-tests 2021-01-05 15:49:16 +01:00
Christoph Wurst 9b833f5d2d
Update all the things for Guzzle 7 (php8 compat) 
Guzzle 6 doesn't support php8, hence we need this for 21 for full php8
support.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2021-01-05 13:31:04 +01:00
Sean Molenaar 40595f3ee0
Command: Add app password generation 
Signed-off-by: Sean Molenaar <sean@seanmolenaar.eu>
 2021-01-05 13:05:17 +01:00
Christoph Wurst 90d0732828
Fix updating user settings 
The requests dispatched from the personal settings page don't always
send all the possible params but just a subset. Hence requests currently
fail on master e.g. when you update your email. This makes the arguments
optional again.

Regression of da9462b482

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2021-01-05 12:59:50 +01:00
Roeland Jago Douma 50b380e85b
Merge pull request #24964 from nextcloud/bugfix/noid/internal-server-error-when-importing-broken-ics-file 
Don't throw a 500 when importing a broken ics reminder file
 2021-01-05 12:57:00 +01:00
Nina Pypchenko 98299d9c29 Fix dashboard greetings that show 'good morning' after noon 
Updated dashboard greetings to show "Good afternoon" after 12:00 instead of 13:00.

Updated time periods for greetings:
- Morning: 5:00 to 11.59
- Afternoon: 12:00 to 17.59
- Evening: 18:00 to 21:59
- Night: 22:00 to 4.59

Updated night-time greeting to "Hello" as "Good night" is a kind of goodbye.

Closes #24938.

Signed-off-by: Nina Pypchenko <22447785+nina-py@users.noreply.github.com>
 2021-01-05 21:40:35 +11:00
Joas Schilling 9fd2b6045d
Don't throw a 500 when importing a broken ics reminder file 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2021-01-05 10:08:14 +01:00
Julius Härtl 39c67d9868
Merge pull request #24829 from nextcloud/bugfix/24813/add-missing-migrations 2021-01-05 09:32:33 +01:00
Julius Härtl 98560c80ea
Properly handle result when copying with failure and throw in tests 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2021-01-05 09:20:35 +01:00
Julius Härtl ee842f1c43
Fix writeStream mocking 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2021-01-05 09:20:35 +01:00
Nextcloud bot 364b29b1e9
[tx-robot] updated from transifex 2021-01-05 02:21:26 +00:00
John Molakvoæ (skjnldsv) 07553f0c62
Make sure we have existing indexes before using them 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2021-01-04 20:58:15 +01:00
Robin Appelman 58f3f5cc28
allow using any ldap property as login name when using external storage login credentials 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2021-01-04 19:53:07 +01:00
Roeland Jago Douma 1f48a83b09
Merge pull request #24936 from nextcloud/dependabot/npm_and_yarn/webpack-cli-4.3.1 
Bump webpack-cli from 4.3.0 to 4.3.1
 2021-01-04 12:55:11 +01:00
Christoph Wurst 969d4312e2
Merge pull request #24907 from nextcloud/fix/license-headers-21-II 
Update license headers
 2021-01-04 11:06:30 +01:00
Nextcloud bot 8d22ba4a33
[tx-robot] updated from transifex 2021-01-04 02:21:48 +00:00
Christoph Wurst b6ba622a58
Merge pull request #24946 from nextcloud/dependabot/composer/pimple/pimple-3.3.1 
Bump pimple/pimple from 3.2.3 to 3.3.1
 2021-01-03 12:40:49 +01:00
Christoph Wurst b8d16650b6
Bump pimple/pimple from 3.2.3 to 3.3.1 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2021-01-03 10:47:37 +01:00