Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Downstream 2016-06-09 | Arthur Schiwon | 2016-06-09 | 46 | -131/+318 |
|\ | | | | | | | Merge branch 'master' of https://github.com/owncloud/core into downstream-160609 | ||||
| * | Merge pull request #25000 from owncloud/fix-email-login-dav | Vincent Petry | 2016-06-09 | 1 | -2/+2 |
| |\ | | | | | | | Allow login by email address via webdav as well | ||||
| | * | Allow login by email address via webdav as well - fixes #24791 | Thomas Müller | 2016-06-09 | 1 | -2/+2 |
| | | | |||||
| * | | Merge pull request #25008 from owncloud/externals_test_with_origin | Vincent Petry | 2016-06-09 | 8 | -18/+27 |
| |\ \ | | | | | | | | | Add support to know where the storage test comes from | ||||
| | * | | Change the default value to true instead of null | Juan Pablo Villafáñez | 2016-06-08 | 5 | -8/+8 |
| | | | | |||||
| | * | | Fix test | Juan Pablo Villafáñez | 2016-06-07 | 1 | -1/+2 |
| | | | | |||||
| | * | | Rename variable | Juan Pablo Villafáñez | 2016-06-07 | 7 | -20/+20 |
| | | | | |||||
| | * | | Add support to know where the storage test comes from | Juan Pablo Villafáñez | 2016-06-07 | 7 | -16/+24 |
| | | | | |||||
| * | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-06-09 | 12 | -0/+18 |
| | |/ | |/| | |||||
| * | | Merge pull request #25023 from owncloud/fix-22127-trusted-servers | Vincent Petry | 2016-06-08 | 3 | -11/+16 |
| |\ \ | | | | | | | | | Fixed problem about removing trusted servers accidentally | ||||
| | * | | Removed old html | Sergio Bertolín | 2016-06-08 | 1 | -2/+3 |
| | | | | |||||
| | * | | Improve readability | Sergio Bertolín | 2016-06-08 | 1 | -1/+1 |
| | | | | |||||
| | * | | Fixed problem about removing trusted servers accidentally | Sergio Bertolín | 2016-06-08 | 3 | -9/+13 |
| | | | | |||||
| * | | | Merge pull request #25012 from owncloud/gdrive-fixfilesizewithmimetypemismatch | Vincent Petry | 2016-06-08 | 1 | -1/+1 |
| |\ \ \ | | |/ / | |/| | | Fix GDrive file size when mime type doesn't match contents | ||||
| | * | | Fix GDrive file size when mime type doesn't match contents | Vincent Petry | 2016-06-08 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Uploading a txt file with XML contents makes GDrive return the XML mime type. This fix makes sure the logic that returns "SPACE_UNKNOWN" for the size properly rely on the Google Docs mime types. | ||||
| * | | | Merge pull request #25019 from owncloud/fix_24937 | Vincent Petry | 2016-06-08 | 1 | -0/+18 |
| |\ \ \ | | | | | | | | | | | Bring back sharedstorage hooks | ||||
| | * | | | Bring back sharedstorage hooks | Roeland Jago Douma | 2016-06-08 | 1 | -0/+18 |
| | | | | | |||||
| * | | | | Merge pull request #24899 from owncloud/local-storage-symlinks | Vincent Petry | 2016-06-08 | 2 | -0/+4 |
| |\ \ \ \ | | | | | | | | | | | | | dissalow symlinks in local storages that point outside the datadir | ||||
| | * | | | | Better handling of forbidden files in dav | Robin Appelman | 2016-06-07 | 2 | -0/+4 |
| | | | | | | |||||
| * | | | | | Merge pull request #25001 from ↵ | Vincent Petry | 2016-06-08 | 4 | -34/+44 |
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | owncloud/issue-24939-better-ux-on-invalid-perma-link Improve the UX for "not found" perma links | ||||
| | * | | | | Adjust test to work with phpunit < 5.2 | Joas Schilling | 2016-06-08 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Improve the UX for "not found" perma links | Joas Schilling | 2016-06-07 | 4 | -34/+44 |
| | | | | | | |||||
| * | | | | | Merge pull request #25007 from owncloud/gdrive-fixuploadsamenameasfolder | Vincent Petry | 2016-06-08 | 2 | -1/+24 |
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | Fix GDrive upload file which name might match the one of a folder | ||||
| | * | | | | Fix GDrive upload file which name might match the one of a folder | Vincent Petry | 2016-06-07 | 2 | -1/+24 |
| | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Whenever a file is uploaded to GDrive, there is a check for that file with and without extension, due to Google Docs files having no extension. This logic now only kicks in whenever the detected extensionless file is really a Google Doc file, not a folder. This makes it possible again to upload a file "test.txt" in a folder that also has a folder called "test" | ||||
| * / | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-06-08 | 4 | -0/+22 |
| |/ / / | |||||
| * | | | Merge pull request #23845 from owncloud/smb-rename | Vincent Petry | 2016-06-07 | 1 | -0/+20 |
| |\ \ \ | | |/ / | |/| | | implement specific rename handling for SMB | ||||
| | * | | implement specific rename handling for SMB | Arthur Schiwon | 2016-05-31 | 1 | -0/+20 |
| | | | | |||||
| * | | | Merge pull request #24813 from owncloud/delete-ghost-files | Vincent Petry | 2016-06-07 | 1 | -0/+59 |
| |\ \ \ | | |_|/ | |/| | | allow deleting "ghost files" trough the View and Node api | ||||
| | * | | add test for deleting ghost files over dav | Robin Appelman | 2016-06-03 | 1 | -0/+59 |
| | | | | |||||
| * | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-06-07 | 4 | -36/+36 |
| | | | | |||||
| * | | | handle path not being set in shared cache (#24993) | Robin Appelman | 2016-06-06 | 1 | -1/+1 |
| | | | | |||||
| * | | | Fix checkMove() implementation for dav v2 - fixes #24776 (#24971) | Thomas Müller | 2016-06-06 | 3 | -27/+46 |
| | | | | |||||
* | | | | Revert "Downstream 2016-06-08" | blizzz | 2016-06-09 | 22 | -254/+99 |
| | | | | |||||
* | | | | Adjust test to work with phpunit < 5.2 | Joas Schilling | 2016-06-09 | 1 | -1/+1 |
| | | | | |||||
* | | | | Bring back sharedstorage hooks | Roeland Jago Douma | 2016-06-09 | 1 | -0/+18 |
| | | | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-06-09 | 4 | -0/+22 |
| | | | | |||||
* | | | | Fix GDrive upload file which name might match the one of a folder | Vincent Petry | 2016-06-09 | 2 | -1/+24 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Whenever a file is uploaded to GDrive, there is a check for that file with and without extension, due to Google Docs files having no extension. This logic now only kicks in whenever the detected extensionless file is really a Google Doc file, not a folder. This makes it possible again to upload a file "test.txt" in a folder that also has a folder called "test" | ||||
* | | | | Better handling of forbidden files in dav | Robin Appelman | 2016-06-09 | 2 | -0/+4 |
| | | | | |||||
* | | | | Improve the UX for "not found" perma links | Joas Schilling | 2016-06-09 | 4 | -34/+44 |
| | | | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-06-09 | 4 | -36/+36 |
| | | | | |||||
* | | | | handle path not being set in shared cache (#24993) | Robin Appelman | 2016-06-09 | 1 | -1/+1 |
| | | | | |||||
* | | | | Fix checkMove() implementation for dav v2 - fixes #24776 (#24971) | Thomas Müller | 2016-06-09 | 3 | -27/+46 |
| | | | | |||||
* | | | | add test for deleting ghost files over dav | Robin Appelman | 2016-06-09 | 1 | -0/+59 |
| | | | | |||||
* | | | | THIS IS NEXTCLOUD! adjusting the design | Jan-Christoph Borchardt | 2016-06-08 | 1 | -2/+2 |
| | | | | |||||
* | | | | implement specific rename handling for SMB | Arthur Schiwon | 2016-06-08 | 1 | -0/+20 |
|/ / / | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-06-06 | 2 | -0/+2 |
| | | | |||||
* | | | Merge pull request #24964 from owncloud/issue-24961-public-upload-unlimited | Vincent Petry | 2016-06-06 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Allow public upload when the quota is unlimited | ||||
| * | | | Allow public upload when the quota is unlimited | Joas Schilling | 2016-06-02 | 1 | -1/+1 |
| | | | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-06-04 | 8 | -22/+52 |
| |/ / |/| | | |||||
* | | | Merge pull request #24673 from owncloud/construct-path | Vincent Petry | 2016-06-03 | 1 | -4/+6 |
|\ \ \ | | | | | | | | | Construct path to the version file from the current directory and fil… |