summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Collapse)AuthorAgeFilesLines
* Downstream 2016-06-09Arthur Schiwon2016-06-0946-131/+318
|\ | | | | | | Merge branch 'master' of https://github.com/owncloud/core into downstream-160609
| * Merge pull request #25000 from owncloud/fix-email-login-davVincent Petry2016-06-091-2/+2
| |\ | | | | | | Allow login by email address via webdav as well
| | * Allow login by email address via webdav as well - fixes #24791Thomas Müller2016-06-091-2/+2
| | |
| * | Merge pull request #25008 from owncloud/externals_test_with_originVincent Petry2016-06-098-18/+27
| |\ \ | | | | | | | | Add support to know where the storage test comes from
| | * | Change the default value to true instead of nullJuan Pablo Villafáñez2016-06-085-8/+8
| | | |
| | * | Fix testJuan Pablo Villafáñez2016-06-071-1/+2
| | | |
| | * | Rename variableJuan Pablo Villafáñez2016-06-077-20/+20
| | | |
| | * | Add support to know where the storage test comes fromJuan Pablo Villafáñez2016-06-077-16/+24
| | | |
| * | | [tx-robot] updated from transifexJenkins for ownCloud2016-06-0912-0/+18
| | |/ | |/|
| * | Merge pull request #25023 from owncloud/fix-22127-trusted-serversVincent Petry2016-06-083-11/+16
| |\ \ | | | | | | | | Fixed problem about removing trusted servers accidentally
| | * | Removed old htmlSergio Bertolín2016-06-081-2/+3
| | | |
| | * | Improve readabilitySergio Bertolín2016-06-081-1/+1
| | | |
| | * | Fixed problem about removing trusted servers accidentallySergio Bertolín2016-06-083-9/+13
| | | |
| * | | Merge pull request #25012 from owncloud/gdrive-fixfilesizewithmimetypemismatchVincent Petry2016-06-081-1/+1
| |\ \ \ | | |/ / | |/| | Fix GDrive file size when mime type doesn't match contents
| | * | Fix GDrive file size when mime type doesn't match contentsVincent Petry2016-06-081-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_24937Vincent Petry2016-06-081-0/+18
| |\ \ \ | | | | | | | | | | Bring back sharedstorage hooks
| | * | | Bring back sharedstorage hooksRoeland Jago Douma2016-06-081-0/+18
| | | | |
| * | | | Merge pull request #24899 from owncloud/local-storage-symlinksVincent Petry2016-06-082-0/+4
| |\ \ \ \ | | | | | | | | | | | | dissalow symlinks in local storages that point outside the datadir
| | * | | | Better handling of forbidden files in davRobin Appelman2016-06-072-0/+4
| | | | | |
| * | | | | Merge pull request #25001 from ↵Vincent Petry2016-06-084-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.2Joas Schilling2016-06-081-1/+1
| | | | | |
| | * | | | Improve the UX for "not found" perma linksJoas Schilling2016-06-074-34/+44
| | | | | |
| * | | | | Merge pull request #25007 from owncloud/gdrive-fixuploadsamenameasfolderVincent Petry2016-06-082-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 folderVincent Petry2016-06-072-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 transifexJenkins for ownCloud2016-06-084-0/+22
| |/ / /
| * | | Merge pull request #23845 from owncloud/smb-renameVincent Petry2016-06-071-0/+20
| |\ \ \ | | |/ / | |/| | implement specific rename handling for SMB
| | * | implement specific rename handling for SMBArthur Schiwon2016-05-311-0/+20
| | | |
| * | | Merge pull request #24813 from owncloud/delete-ghost-filesVincent Petry2016-06-071-0/+59
| |\ \ \ | | |_|/ | |/| | allow deleting "ghost files" trough the View and Node api
| | * | add test for deleting ghost files over davRobin Appelman2016-06-031-0/+59
| | | |
| * | | [tx-robot] updated from transifexJenkins for ownCloud2016-06-074-36/+36
| | | |
| * | | handle path not being set in shared cache (#24993)Robin Appelman2016-06-061-1/+1
| | | |
| * | | Fix checkMove() implementation for dav v2 - fixes #24776 (#24971)Thomas Müller2016-06-063-27/+46
| | | |
* | | | Revert "Downstream 2016-06-08"blizzz2016-06-0922-254/+99
| | | |
* | | | Adjust test to work with phpunit < 5.2Joas Schilling2016-06-091-1/+1
| | | |
* | | | Bring back sharedstorage hooksRoeland Jago Douma2016-06-091-0/+18
| | | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2016-06-094-0/+22
| | | |
* | | | Fix GDrive upload file which name might match the one of a folderVincent Petry2016-06-092-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 davRobin Appelman2016-06-092-0/+4
| | | |
* | | | Improve the UX for "not found" perma linksJoas Schilling2016-06-094-34/+44
| | | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2016-06-094-36/+36
| | | |
* | | | handle path not being set in shared cache (#24993)Robin Appelman2016-06-091-1/+1
| | | |
* | | | Fix checkMove() implementation for dav v2 - fixes #24776 (#24971)Thomas Müller2016-06-093-27/+46
| | | |
* | | | add test for deleting ghost files over davRobin Appelman2016-06-091-0/+59
| | | |
* | | | THIS IS NEXTCLOUD! adjusting the designJan-Christoph Borchardt2016-06-081-2/+2
| | | |
* | | | implement specific rename handling for SMBArthur Schiwon2016-06-081-0/+20
|/ / /
* | | [tx-robot] updated from transifexJenkins for ownCloud2016-06-062-0/+2
| | |
* | | Merge pull request #24964 from owncloud/issue-24961-public-upload-unlimitedVincent Petry2016-06-061-1/+1
|\ \ \ | | | | | | | | Allow public upload when the quota is unlimited
| * | | Allow public upload when the quota is unlimitedJoas Schilling2016-06-021-1/+1
| | | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2016-06-048-22/+52
| |/ / |/| |
* | | Merge pull request #24673 from owncloud/construct-pathVincent Petry2016-06-031-4/+6
|\ \ \ | | | | | | | | Construct path to the version file from the current directory and fil…