summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
...
* | cleanup locks in scanner on errorRobin Appelman2018-05-231-9/+12
| | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | Merge pull request #9540 from nextcloud/backport/9517/stable13Morris Jobke2018-05-239-17/+160
|\ \ | | | | | | [stable13] Improve OAuth
| * | Certain tokens can expireRoeland Jago Douma2018-05-229-15/+106
| | | | | | | | | | | | | | | | | | | | | | | | However due to the nature of what we store in the token (encrypted passwords etc). We can't just delete the tokens because that would make the oauth refresh useless. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | Allow the rotation of tokensRoeland Jago Douma2018-05-224-2/+54
| | | | | | | | | | | | | | | | | | This for example will allow rotating the apptoken for oauth Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | [tx-robot] updated from transifexNextcloud bot2018-05-23154-182/+422
| | |
* | | Merge pull request #9525 from nextcloud/backport/8504/stable13Morris Jobke2018-05-221-1/+1
|\ \ \ | |/ / |/| | [stable13] Dont use $info as array when its not an array
| * | Dont use $info as array when its not an arrayJoas Schilling2018-05-181-1/+1
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | [tx-robot] updated from transifexNextcloud bot2018-05-226-4/+24
| | |
* | | [tx-robot] updated from transifexNextcloud bot2018-05-202-0/+2
|/ /
* | [tx-robot] updated from transifexNextcloud bot2018-05-1816-16/+16
| |
* | [tx-robot] updated from transifexNextcloud bot2018-05-1716-104/+104
| |
* | Merge pull request #9432 from nextcloud/backport/9225/ipv6-database-hostMorris Jobke2018-05-141-10/+24
|\ \ | | | | | | [stable13] Allow IPv6 database host
| * | php 5.6 compatibilityJoas Schilling2018-05-091-1/+1
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | Move regex to a function and add testsJoas Schilling2018-05-091-11/+24
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | Allow IPv6 database hostsJoas Schilling2018-05-091-6/+7
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Merge pull request #9436 from nextcloud/backport/9373/stable13Morris Jobke2018-05-141-1/+1
|\ \ \ | | | | | | | | [stable13] Get correct version of an app
| * | | Get correct version of an appRoeland Jago Douma2018-05-091-1/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Related to #8929 We should get the version of the app. Not of the appfolder. Else there is no way to properly compare the versions. Now note that installing in 1 go will still fail. But at least on the next page load the new version will be properly detected. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | [tx-robot] updated from transifexNextcloud bot2018-05-142-0/+2
| | |
* | | [tx-robot] updated from transifexNextcloud bot2018-05-128-18/+88
| | |
* | | [tx-robot] updated from transifexNextcloud bot2018-05-114-0/+4
| | |
* | | [tx-robot] updated from transifexNextcloud bot2018-05-104-26/+66
|/ /
* | [tx-robot] updated from transifexNextcloud bot2018-05-0912-0/+16
| |
* | Merge pull request #9389 from nextcloud/log-lock-state-on-conflict-13Morris Jobke2018-05-073-10/+23
|\ \ | | | | | | [13] Log lock state on conflict
| * | always log locking errorsRobin Appelman2018-05-041-3/+1
| | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | Log more info about locking conflicts for memcache locking backendsRobin Appelman2018-05-042-7/+22
| |/ | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* / remove unneeded locks in getCacheEntryRobin Appelman2018-05-041-3/+1
|/ | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* Issue #9318: catch exceptions in SCSSCacher::resetCache()Roland Tapken2018-05-031-1/+5
| | | | Signed-off-by: Roland Tapken <roland@bitarbeiter.net>
* [tx-robot] updated from transifexNextcloud bot2018-04-272-2/+2
|
* [tx-robot] updated from transifexNextcloud bot2018-04-222-8/+40
|
* [tx-robot] updated from transifexNextcloud bot2018-04-212-0/+10
|
* Merge pull request #9231 from nextcloud/13-9205Morris Jobke2018-04-182-8/+15
|\ | | | | [stable13] Provide an option to disable HTML emails
| * Provide an option to disable HTML emailsMorris Jobke2018-04-182-8/+15
| | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #9233 from nextcloud/13-9159Roeland Jago Douma2018-04-181-0/+5
|\ \ | | | | | | [stable13] fix appinfo parsing when a single localized option is provided
| * | fix appinfo parsing when a single localized option is providedRobin Appelman2018-04-181-0/+5
| |/ | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* / Show EOL warning in the update sectionJoas Schilling2018-04-181-0/+1
|/ | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* [tx-robot] updated from transifexNextcloud bot2018-04-072-2/+2
|
* Merge pull request #8779 from nextcloud/backport/8255/show-group-display-namesJohn Molakvoæ2018-04-062-2/+2
|\ | | | | [stable13] Show group display names
| * Correctly return the group nameJoas Schilling2018-03-121-1/+1
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * Show the displayname in the users group listJoas Schilling2018-03-121-1/+1
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Merge pull request #9095 from JaredBoone/bugfix/8387Morris Jobke2018-04-062-2/+2
|\ \ | | | | | | Do not convert email addresses with idn_to_ascii if…
| * | Do not convert email addresses with idn_to_ascii if INTL_IDNA_VARIANT_UTS46 ↵Jared Boone2018-04-052-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | is undefined. Fixes https://github.com/nextcloud/server/issues/8387. Signed-off-by: Jared Boone <jared.boone@gmail.com>
* | | Add more logging for the object storage during creation of the bucketsMorris Jobke2018-04-051-2/+3
|/ / | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Allow usage of Windows 10 WebDav NetdriveRoeland Jago Douma2018-04-051-0/+1
| | | | | | | | | | | | | | | | | | Fixes #3523 As long as we don't have #8123 lets not leave our Window10 netdrive users hanging. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #9077 from nextcloud/fix-callForSeenUsers-stable13Morris Jobke2018-04-051-1/+2
|\ \ | | | | | | [stable13] Move on with the next user if we found the user on one user back-end
| * | Move on with the next user if we found the user on one user back-endBjoern Schiessle2018-04-041-1/+2
| | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | | [tx-robot] updated from transifexNextcloud bot2018-04-052-0/+14
|/ /
* | Fix proper permissions for multiple file accessRoeland Jago Douma2018-04-041-11/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #8890 In case you have access to a file via multiple ways, for example: 1. the file is shared with you with permission read only 2. the folder containing the file is shared with your read/write Requesting the getById function on the userFolder would give back two entries but both with the same permissions. Depending on the node you picked this is not right. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | reset encryptionVersion to '1' if a file was stream copied, because this ↵Bjoern Schiessle2018-04-031-7/+8
| | | | | | | | | | | | means that we basically write the file from scratch Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | Merge pull request #9015 from nextcloud/backport-apps-versionsMorris Jobke2018-04-031-6/+22
|\ \ | | | | | | [stable13] Use app version to generate scss filename
| * | Use app version to generate scss filenameJohn Molakvoæ (skjnldsv)2018-03-281-6/+22
| | | | | | | | | | | | | | | | | | Fixed scsscacher tests Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>