summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #22597 from nextcloud/techdebt/noid/allow-to-di-the-settin...Roeland Jago Douma2020-09-041-10/+3
|\
| * Add missing alias for OCP\Settings\IManager and deprecate the old oneJoas Schilling2020-09-041-10/+3
* | Merge pull request #17456 from brad2014/feature/brad2014/12391-improve-imip-m...John Molakvoæ2020-09-042-11/+32
|\ \ | |/ |/|
| * Minor cleanup: php-cs-fixer, tests, interface consistencyBrad Rubenstein2020-09-022-6/+9
| * iMIP email improvements (take 2)brad20142020-08-201-6/+24
* | Merge pull request #22550 from nextcloud/bugfix/13556/use-correct-root-when-c...Joas Schilling2020-09-041-2/+2
|\ \
| * | Use the correct root to determinate the webroot for the resourceJoas Schilling2020-09-021-2/+2
* | | [tx-robot] updated from transifexNextcloud bot2020-09-042-4/+4
* | | Fix app password updating out of boundsRoeland Jago Douma2020-09-035-0/+60
|/ /
* | Merge pull request #22423 from nextcloud/bugfix/noid/direct-editing-encryptionRoeland Jago Douma2020-09-012-6/+37
|\ \
| * | Do not expose direct editing if no master key is availableJulius Härtl2020-09-012-6/+37
* | | Only disable zip64 if the size is knownRoeland Jago Douma2020-09-011-1/+5
|/ /
* | Merge pull request #22116 from nextcloud/bugfix/noid/transfer-ownership-share...Roeland Jago Douma2020-09-012-0/+12
|\ \
| * | Transfer shares of the transferred root nodeJulius Härtl2020-08-312-0/+12
* | | Merge pull request #16632 from nextcloud/bugfix/external-reshareRoeland Jago Douma2020-09-011-5/+1
|\ \ \
| * | | trim slashesRobin Appelman2020-08-281-1/+1
| * | | Set proper root path for single file shares originating from other storagesJulius Härtl2020-08-281-5/+1
* | | | Merge pull request #22514 from nextcloud/fix/s3/only_delete_new_failedRoeland Jago Douma2020-08-311-7/+27
|\ \ \ \
| * | | | Only update the filecache entry once the file has been written to S3Roeland Jago Douma2020-08-311-2/+11
| * | | | Don't lose filecache entry on s3 overwrite errorRoeland Jago Douma2020-08-311-5/+16
| | |/ / | |/| |
* | | | set the mount id before calling storage wrapperRobin Appelman2020-08-311-1/+1
* | | | Merge pull request #22472 from nextcloud/fix/contacts-interaction-blob-postgresblizzz2020-08-312-1/+8
|\ \ \ \ | |/ / / |/| | |
| * | | Fix writing BLOBs to postgres with recent contacts interactionChristoph Wurst2020-08-282-1/+8
* | | | Merge pull request #22476 from nextcloud/setting-sections-uniqueRoeland Jago Douma2020-08-301-2/+2
|\ \ \ \
| * | | | ignore duplicate setting sectionsRobin Appelman2020-08-281-2/+2
| | |/ / | |/| |
* | | | Merge pull request #21288 from lmamane/masterRoeland Jago Douma2020-08-284-5/+21
|\ \ \ \ | |_|/ / |/| | |
| * | | Return correct loginname in credentials,Lionel Elie Mamane2020-08-204-5/+21
* | | | [tx-robot] updated from transifexNextcloud bot2020-08-282-2/+2
| |/ / |/| |
* | | [tx-robot] updated from transifexNextcloud bot2020-08-272-4/+4
* | | Merge pull request #22432 from nextcloud/enh/phpdocRoeland Jago Douma2020-08-26228-229/+0
|\ \ \
| * | | Remove @package annotations from public namespaceJulius Härtl2020-08-26222-222/+0
| * | | Remove wrongly annotated package namesJulius Härtl2020-08-266-7/+0
* | | | Merge pull request #22421 from nextcloud/group-folder-quota-warningRoeland Jago Douma2020-08-261-1/+3
|\ \ \ \
| * | | | show better quota warning for group folders and external storageRobin Appelman2020-08-251-1/+3
* | | | | [tx-robot] updated from transifexNextcloud bot2020-08-262-0/+32
|/ / / /
* | | | Merge pull request #22359 from nextcloud/fix/noid/flow-leaking-scopeJoas Schilling2020-08-251-0/+10
|\ \ \ \
| * | | | fix possible leaking scope in FlowArthur Schiwon2020-08-241-0/+10
| | |_|/ | |/| |
* | | | Merge pull request #22393 from nextcloud/fix/license-headers-20Roeland Jago Douma2020-08-24180-136/+335
|\ \ \ \ | |_|/ / |/| | |
| * | | Update the license headers for Nextcloud 20Christoph Wurst2020-08-24180-136/+335
* | | | Merge pull request #21894 from nextcloud/fix-file-quotaJoas Schilling2020-08-241-2/+2
|\ \ \ \ | |/ / / |/| | |
| * | | fix: file quota was not applied in all caseskorelstar2020-08-201-2/+2
| | |/ | |/|
* | | Merge pull request #22382 from nextcloud/bugfix/22380John Molakvoæ2020-08-244-0/+57
|\ \ \
| * | | Add repair step to remove old dashboard app configJulius Härtl2020-08-244-0/+57
| | |/ | |/|
* | | [tx-robot] updated from transifexNextcloud bot2020-08-234-2/+4
* | | Properly search for users when limittogroups is enabledRoeland Jago Douma2020-08-211-1/+9
|/ /
* | Merge pull request #20891 from cuppett/cuppett/issue#19790Roeland Jago Douma2020-08-201-6/+38
|\ \
| * | Resolves #19790, Provides Support for IAM CredentialsStephen Cuppett2020-08-201-6/+38
| |/
* | Merge pull request #22331 from nextcloud/bugfix/noid/dont-use-deprecated-inig...Roeland Jago Douma2020-08-2010-23/+30
|\ \
| * | Don't use deprecated getIniWrapper() anymoreJoas Schilling2020-08-2010-23/+30
| |/
* | Merge pull request #21529 from nextcloud/enh/encryption/improve_key_formatMorris Jobke2020-08-206-16/+200
|\ \