Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | Add PostgreSQL specific implementation for includeIgnoreConflict. | Ole Ostergaard | 2019-03-21 | 1 | -0/+12 | |
| | | | | Signed-off-by: Ole Ostergaard <ole.c.ostergaard@gmail.com> | |||||
* | Add insertIgnoreConflict to Adapter and use it for for executing the file ↵ | Ole Ostergaard | 2019-03-21 | 3 | -11/+18 | |
| | | | | | | locking. Signed-off-by: Ole Ostergaard <ole.c.ostergaard@gmail.com> | |||||
* | [tx-robot] updated from transifex | Nextcloud bot | 2019-03-21 | 128 | -814/+130 | |
| | ||||||
* | Merge pull request #14578 from nextcloud/enh/force_enable_apps | Roeland Jago Douma | 2019-03-20 | 4 | -32/+57 | |
|\ | | | | | Force enable apps | |||||
| * | Do not ignore the max-version for the "update-available" check | Joas Schilling | 2019-03-20 | 1 | -2/+11 | |
| | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | |||||
| * | Remove apps from the list which have no release at all | Joas Schilling | 2019-03-20 | 1 | -0/+5 | |
| | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | |||||
| * | allow enforcing apps to ignore the max version | Roeland Jago Douma | 2019-03-20 | 4 | -34/+45 | |
| | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | |||||
* | | Merge pull request #14753 from ↵ | Roeland Jago Douma | 2019-03-20 | 5 | -170/+4 | |
|\ \ | | | | | | | | | | | | | nextcloud/revert-13097-feature/11319/where-is-your-data Revert "Where is your data?" | |||||
| * | | Revert "Where is your data?" | Roeland Jago Douma | 2019-03-20 | 5 | -170/+4 | |
| |/ | ||||||
* | | Update lib/private/Share20/Manager.php | Morris Jobke | 2019-03-20 | 1 | -1/+1 | |
| | | | | | | | | | | tabulator change Co-Authored-By: aignerat <46312655+aignerat@users.noreply.github.com> | |||||
* | | Update lib/private/Share20/Manager.php | Morris Jobke | 2019-03-20 | 1 | -1/+1 | |
| | | | | | | | | | | fixed tabulator Co-Authored-By: aignerat <46312655+aignerat@users.noreply.github.com> | |||||
* | | groupname like username - allow share with both | Christian Aigner | 2019-03-20 | 1 | -2/+2 | |
|/ | | | | Signed-off-by: Christian Aigner <christian.aigner@huemer-it.com> | |||||
* | Merge pull request #14691 from nextcloud/rename-mountpoint-within-mountpoint | Roeland Jago Douma | 2019-03-20 | 1 | -11/+6 | |
|\ | | | | | always allow moving mountpoints inside the same mountpoint | |||||
| * | always allow moving mountpoints inside the same mountpoint | Robin Appelman | 2019-03-19 | 1 | -11/+6 | |
| | | | | | | | | | | | | even if that mountpoint isn't normally a valid target for moving mounts into Signed-off-by: Robin Appelman <robin@icewind.nl> | |||||
* | | Merge pull request #14664 from ↵ | Roeland Jago Douma | 2019-03-19 | 4 | -111/+17 | |
|\ \ | | | | | | | | | | | | | nextcloud/bugfix/noid/absolute-paths-of-images-for-linked-collaboration-resources Replace the icon-class with an absolute link to an image | |||||
| * | | Use rich objects instead of name, link and icon | Joas Schilling | 2019-03-19 | 4 | -112/+17 | |
| | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | |||||
| * | | Replace the icon-class with an absolute link to an image | Joas Schilling | 2019-03-19 | 4 | -6/+7 | |
| |/ | | | | | | | | | | | Otherwise the icon can not be displayed in mobile apps Signed-off-by: Joas Schilling <coding@schilljs.com> | |||||
* / | Fix getting the access list on external storage | Roeland Jago Douma | 2019-03-19 | 1 | -1/+7 | |
|/ | | | | | | | If a file is on external storage there is no owner. WHich means we can't check. So just return an empty array then. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | |||||
* | Merge pull request #14724 from nextcloud/enh/nonce_for_iframes | Morris Jobke | 2019-03-18 | 1 | -1/+5 | |
|\ | | | | | CSP: set nonce for iframes | |||||
| * | CSP: set nonce for iframes | Roeland Jago Douma | 2019-03-16 | 1 | -1/+5 | |
| | | | | | | | | | | | | | | This for now uses the jsNonce. That way we can easily backport it. For 17 I will fix it properly. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | |||||
* | | [tx-robot] updated from transifex | Nextcloud bot | 2019-03-18 | 2 | -6/+6 | |
| | | ||||||
* | | [tx-robot] updated from transifex | Nextcloud bot | 2019-03-17 | 2 | -2/+14 | |
|/ | ||||||
* | [tx-robot] updated from transifex | Nextcloud bot | 2019-03-16 | 4 | -12/+12 | |
| | ||||||
* | Merge pull request #14689 from nextcloud/rename-moveable-mount-readonly-parent | Roeland Jago Douma | 2019-03-15 | 1 | -1/+9 | |
|\ | | | | | allow renaming the root of a movable mount even if the parent folder … | |||||
| * | allow renaming the root of a movable mount even if the parent folder is readonly | Robin Appelman | 2019-03-14 | 1 | -1/+9 | |
| | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl> | |||||
* | | Remove spaming debug logs | Joas Schilling | 2019-03-15 | 2 | -2/+0 | |
| | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | |||||
* | | Merge pull request #14684 from nextcloud/long-etag-dav | Roeland Jago Douma | 2019-03-14 | 1 | -1/+5 | |
|\ \ | | | | | | | handle long etags from dav external storage | |||||
| * | | handle long etags from dav external storage | Robin Appelman | 2019-03-14 | 1 | -1/+5 | |
| |/ | | | | | | | | | | | we can only store etags up to 40 characters long in the database, so when we get an etag that's longer we simply hash it to bring down the length Signed-off-by: Robin Appelman <robin@icewind.nl> | |||||
* | | [tx-robot] updated from transifex | Nextcloud bot | 2019-03-14 | 16 | -60/+134 | |
| | | ||||||
* | | add casting to string for postgresql query builder | Robin Appelman | 2019-03-14 | 1 | -5/+7 | |
|/ | | | | Signed-off-by: Robin Appelman <robin@icewind.nl> | |||||
* | Do not allow invalid users to be created | Roeland Jago Douma | 2019-03-14 | 1 | -0/+14 | |
| | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | |||||
* | Remove sensitive SMB arguments from exception log | Morris Jobke | 2019-03-12 | 1 | -0/+6 | |
| | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de> | |||||
* | Add a message about disabled global routes | Joas Schilling | 2019-03-11 | 1 | -0/+8 | |
| | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | |||||
* | Make sure urlParams are correctly injected in global routes | Joas Schilling | 2019-03-11 | 1 | -1/+15 | |
| | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | |||||
* | Merge pull request #14548 from ↵ | Morris Jobke | 2019-03-08 | 2 | -4/+23 | |
|\ | | | | | | | | | nextcloud/bugfix/noid/avoid-duplicate-container-creation Avoid duplicate App container creation | |||||
| * | Make the file strict | Joas Schilling | 2019-03-05 | 1 | -4/+5 | |
| | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | |||||
| * | Avoid duplicate App container creation | Joas Schilling | 2019-03-05 | 2 | -1/+19 | |
| | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | |||||
* | | Merge pull request #14589 from ↵ | Morris Jobke | 2019-03-08 | 1 | -0/+12 | |
|\ \ | | | | | | | | | | | | | nextcloud/feature/noid/add-preview-information-as-optional-data Add preview data as optional data for files | |||||
| * | | Add preview data as optional data for files | Joas Schilling | 2019-03-07 | 1 | -0/+12 | |
| | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | |||||
* | | | Merge pull request #14425 from cowai/fix-multiple-incomplete-folders | Morris Jobke | 2019-03-08 | 4 | -8/+32 | |
|\ \ \ | | | | | | | | | Do not calculate folder size for parent that also needs proper scan, fixes #3524 | |||||
| * | | | Avoid calculating folder size for parent that needs scan. | Ari Selseng | 2019-03-06 | 4 | -8/+32 | |
| | | | | | | | | | | | | | | | | Signed-off-by: Ari Selseng <ari@selseng.net> | |||||
* | | | | Remove Google+ from Social Sharing Bundle (2) | Marius Blüm | 2019-03-07 | 1 | -1/+0 | |
| |/ / |/| | | | | | Signed-off-by: Marius Blüm <marius@lineone.io> | |||||
* | | | Merge pull request #14568 from nextcloud/techdebt/noid/cleanup-code-leftovers | Roeland Jago Douma | 2019-03-06 | 6 | -19/+2 | |
|\ \ \ | | | | | | | | | Cleanup some PHPDoc leftovers and unused variables | |||||
| * | | | Cleanup some PHPDoc leftovers and unused variables | Morris Jobke | 2019-03-06 | 6 | -19/+2 | |
| | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de> | |||||
* | | | | Merge pull request #14424 from nextcloud/fix/13554/swift_to_tmp | Roeland Jago Douma | 2019-03-06 | 1 | -1/+10 | |
|\ \ \ \ | |/ / / |/| | | | Use a tmp file for swift writes | |||||
| * | | | Use a tmp file for swift writes | Roeland Jago Douma | 2019-03-04 | 1 | -1/+10 | |
| | | | | | | | | | | | | | | | | | | | | | | | | Else this leads to a seekable stream error with chunked uploads Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | |||||
* | | | | Merge pull request #13327 from ↵ | Morris Jobke | 2019-03-06 | 1 | -0/+3 | |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | nextcloud/allow-bracket-notation-for-remove-ipv6-address Allow bracket IPv6 address format inside IPAdress Normalizer | |||||
| * | | | | Allow bracket IPv6 address format inside IPAdress Normalizer | Thomas Citharel | 2019-01-03 | 1 | -0/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When run with php's build-in server (for instance on localhost:8080), IP provided through $this->server['REMOTE_ADDR'] is [::1], which is not an acceptable format for \inet_pton. This removes the brackets if there's any. Signed-off-by: Thomas Citharel <tcit@tcit.fr> | |||||
* | | | | | Merge pull request #14175 from skydiablo/master | Morris Jobke | 2019-03-05 | 1 | -0/+1 | |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | Fix ObjectStorage expired token (v3) | |||||
| * | | | | Update SwiftFactory.php | Volker | 2019-02-13 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | Auth-Service (in explizit v3) will recheck the cached-token and will end in an "token expired exception". |