Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | cleanup locks in scanner on error | Robin Appelman | 2018-05-23 | 1 | -9/+12 | |
| | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl> | |||||
* | | Merge pull request #9540 from nextcloud/backport/9517/stable13 | Morris Jobke | 2018-05-23 | 9 | -17/+160 | |
|\ \ | | | | | | | [stable13] Improve OAuth | |||||
| * | | Certain tokens can expire | Roeland Jago Douma | 2018-05-22 | 9 | -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 tokens | Roeland Jago Douma | 2018-05-22 | 4 | -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 transifex | Nextcloud bot | 2018-05-23 | 154 | -182/+422 | |
| | | | ||||||
* | | | Merge pull request #9525 from nextcloud/backport/8504/stable13 | Morris Jobke | 2018-05-22 | 1 | -1/+1 | |
|\ \ \ | |/ / |/| | | [stable13] Dont use $info as array when its not an array | |||||
| * | | Dont use $info as array when its not an array | Joas Schilling | 2018-05-18 | 1 | -1/+1 | |
| | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | |||||
* | | | [tx-robot] updated from transifex | Nextcloud bot | 2018-05-22 | 6 | -4/+24 | |
| | | | ||||||
* | | | [tx-robot] updated from transifex | Nextcloud bot | 2018-05-20 | 2 | -0/+2 | |
|/ / | ||||||
* | | [tx-robot] updated from transifex | Nextcloud bot | 2018-05-18 | 16 | -16/+16 | |
| | | ||||||
* | | [tx-robot] updated from transifex | Nextcloud bot | 2018-05-17 | 16 | -104/+104 | |
| | | ||||||
* | | Merge pull request #9432 from nextcloud/backport/9225/ipv6-database-host | Morris Jobke | 2018-05-14 | 1 | -10/+24 | |
|\ \ | | | | | | | [stable13] Allow IPv6 database host | |||||
| * | | php 5.6 compatibility | Joas Schilling | 2018-05-09 | 1 | -1/+1 | |
| | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | |||||
| * | | Move regex to a function and add tests | Joas Schilling | 2018-05-09 | 1 | -11/+24 | |
| | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | |||||
| * | | Allow IPv6 database hosts | Joas Schilling | 2018-05-09 | 1 | -6/+7 | |
| | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | |||||
* | | | Merge pull request #9436 from nextcloud/backport/9373/stable13 | Morris Jobke | 2018-05-14 | 1 | -1/+1 | |
|\ \ \ | | | | | | | | | [stable13] Get correct version of an app | |||||
| * | | | Get correct version of an app | Roeland Jago Douma | 2018-05-09 | 1 | -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 transifex | Nextcloud bot | 2018-05-14 | 2 | -0/+2 | |
| | | | ||||||
* | | | [tx-robot] updated from transifex | Nextcloud bot | 2018-05-12 | 8 | -18/+88 | |
| | | | ||||||
* | | | [tx-robot] updated from transifex | Nextcloud bot | 2018-05-11 | 4 | -0/+4 | |
| | | | ||||||
* | | | [tx-robot] updated from transifex | Nextcloud bot | 2018-05-10 | 4 | -26/+66 | |
|/ / | ||||||
* | | [tx-robot] updated from transifex | Nextcloud bot | 2018-05-09 | 12 | -0/+16 | |
| | | ||||||
* | | Merge pull request #9389 from nextcloud/log-lock-state-on-conflict-13 | Morris Jobke | 2018-05-07 | 3 | -10/+23 | |
|\ \ | | | | | | | [13] Log lock state on conflict | |||||
| * | | always log locking errors | Robin Appelman | 2018-05-04 | 1 | -3/+1 | |
| | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl> | |||||
| * | | Log more info about locking conflicts for memcache locking backends | Robin Appelman | 2018-05-04 | 2 | -7/+22 | |
| |/ | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl> | |||||
* / | remove unneeded locks in getCacheEntry | Robin Appelman | 2018-05-04 | 1 | -3/+1 | |
|/ | | | | Signed-off-by: Robin Appelman <robin@icewind.nl> | |||||
* | Issue #9318: catch exceptions in SCSSCacher::resetCache() | Roland Tapken | 2018-05-03 | 1 | -1/+5 | |
| | | | | Signed-off-by: Roland Tapken <roland@bitarbeiter.net> | |||||
* | [tx-robot] updated from transifex | Nextcloud bot | 2018-04-27 | 2 | -2/+2 | |
| | ||||||
* | [tx-robot] updated from transifex | Nextcloud bot | 2018-04-22 | 2 | -8/+40 | |
| | ||||||
* | [tx-robot] updated from transifex | Nextcloud bot | 2018-04-21 | 2 | -0/+10 | |
| | ||||||
* | Merge pull request #9231 from nextcloud/13-9205 | Morris Jobke | 2018-04-18 | 2 | -8/+15 | |
|\ | | | | | [stable13] Provide an option to disable HTML emails | |||||
| * | Provide an option to disable HTML emails | Morris Jobke | 2018-04-18 | 2 | -8/+15 | |
| | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de> | |||||
* | | Merge pull request #9233 from nextcloud/13-9159 | Roeland Jago Douma | 2018-04-18 | 1 | -0/+5 | |
|\ \ | | | | | | | [stable13] fix appinfo parsing when a single localized option is provided | |||||
| * | | fix appinfo parsing when a single localized option is provided | Robin Appelman | 2018-04-18 | 1 | -0/+5 | |
| |/ | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl> | |||||
* / | Show EOL warning in the update section | Joas Schilling | 2018-04-18 | 1 | -0/+1 | |
|/ | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | |||||
* | [tx-robot] updated from transifex | Nextcloud bot | 2018-04-07 | 2 | -2/+2 | |
| | ||||||
* | Merge pull request #8779 from nextcloud/backport/8255/show-group-display-names | John Molakvoæ | 2018-04-06 | 2 | -2/+2 | |
|\ | | | | | [stable13] Show group display names | |||||
| * | Correctly return the group name | Joas Schilling | 2018-03-12 | 1 | -1/+1 | |
| | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | |||||
| * | Show the displayname in the users group list | Joas Schilling | 2018-03-12 | 1 | -1/+1 | |
| | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | |||||
* | | Merge pull request #9095 from JaredBoone/bugfix/8387 | Morris Jobke | 2018-04-06 | 2 | -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 Boone | 2018-04-05 | 2 | -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 buckets | Morris Jobke | 2018-04-05 | 1 | -2/+3 | |
|/ / | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de> | |||||
* | | Allow usage of Windows 10 WebDav Netdrive | Roeland Jago Douma | 2018-04-05 | 1 | -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-stable13 | Morris Jobke | 2018-04-05 | 1 | -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-end | Bjoern Schiessle | 2018-04-04 | 1 | -1/+2 | |
| | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org> | |||||
* | | | [tx-robot] updated from transifex | Nextcloud bot | 2018-04-05 | 2 | -0/+14 | |
|/ / | ||||||
* | | Fix proper permissions for multiple file access | Roeland Jago Douma | 2018-04-04 | 1 | -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 Schiessle | 2018-04-03 | 1 | -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-versions | Morris Jobke | 2018-04-03 | 1 | -6/+22 | |
|\ \ | | | | | | | [stable13] Use app version to generate scss filename | |||||
| * | | Use app version to generate scss filename | John Molakvoæ (skjnldsv) | 2018-03-28 | 1 | -6/+22 | |
| | | | | | | | | | | | | | | | | | | Fixed scsscacher tests Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> |