Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #24899 from owncloud/local-storage-symlinks | Vincent Petry | 2016-06-08 | 6 | -3/+73 |
|\ | | | | | 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 |
| | | |||||
| * | Ignore forbidden files while scanning | Robin Appelman | 2016-06-07 | 1 | -1/+6 |
| | | |||||
| * | dissalow symlinks in local storages that point outside the datadir | Robin Appelman | 2016-06-07 | 3 | -2/+63 |
| | | |||||
* | | Merge pull request #24983 from ↵ | Vincent Petry | 2016-06-08 | 5 | -5/+30 |
|\ \ | | | | | | | | | | | | | owncloud/issue-23776-do-not-allow-boolean-user-config Do not allow to store boolean configs, they behave unexpected on postgres | ||||
| * | | Do not allow to store boolean configs, they behave unexpected on postgres | Joas Schilling | 2016-06-06 | 5 | -5/+30 |
| | | | |||||
* | | | Merge pull request #24991 from owncloud/2fa-do-not-generate-token | Vincent Petry | 2016-06-08 | 4 | -19/+61 |
|\ \ \ | | | | | | | | | do not generate device token if 2FA is enable for user | ||||
| * | | | do not generate device token if 2FA is enable for user | Christoph Wurst | 2016-06-07 | 4 | -19/+61 |
| | | | | |||||
* | | | | Merge pull request #24992 from owncloud/fix_decrypt_message | Vincent Petry | 2016-06-08 | 1 | -1/+10 |
|\ \ \ \ | | | | | | | | | | | Fix Decrypt message via occ | ||||
| * | | | | Fixed reviews | Sergio Bertolín | 2016-06-07 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Comments fixed | davitol | 2016-06-06 | 1 | -3/+2 |
| | | | | | |||||
| * | | | | Fix Decrypt message via occ | davitol | 2016-06-06 | 1 | -1/+11 |
| | | | | | |||||
* | | | | | Merge pull request #24998 from owncloud/issue-24994-allow-decrypting-user-0-only | Vincent Petry | 2016-06-08 | 3 | -15/+27 |
|\ \ \ \ \ | | | | | | | | | | | | | Allow to decrypt user '0' files only | ||||
| * | | | | | Allow to decrypt user '0' files only | Joas Schilling | 2016-06-07 | 3 | -15/+27 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge pull request #24999 from owncloud/initial-userloading-workaround | Vincent Petry | 2016-06-08 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | decrease initial users to load to 50 | ||||
| * | | | | | decrease initial users to load to 50 | Jörn Friedrich Dreyer | 2016-06-07 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | Prevents timeouts on the initial loading of users. proper fix will be in https://github.com/owncloud/core/pull/10994 Workaround for https://github.com/owncloud/core/issues/24734 | ||||
* | | | | | | Merge pull request #25018 from owncloud/background-contrast | Vincent Petry | 2016-06-08 | 1 | -0/+0 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | darker background image for better font contrast | ||||
| * | | | | | | darker background image for better font contrast | Christoph Wurst | 2016-06-08 | 1 | -0/+0 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | Merge pull request #25005 from owncloud/parent-storage-time-cast | Vincent Petry | 2016-06-08 | 2 | -1/+7 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | don't update storage mtime if we can't get the modified date | ||||
| * | | | | | | make sure $data['mtime'] is always a timestamp | Robin Appelman | 2016-06-07 | 1 | -0/+3 |
| | | | | | | | |||||
| * | | | | | | don't update storage mtime if we can't get the modified date | Robin Appelman | 2016-06-07 | 1 | -1/+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 #23996 from owncloud/integrations-tests-qa-145 | Vincent Petry | 2016-06-08 | 3 | -1/+73 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Added tests about overwriting files and folders as recipient | ||||
| * | | | | | | Get a range from several chunks | Sergio Bertolin | 2016-05-31 | 1 | -2/+2 |
| | | | | | | | |||||
| * | | | | | | Added another case about overwriting folder using old chunking | Sergio Bertolin | 2016-05-31 | 1 | -16/+12 |
| | | | | | | | |||||
| * | | | | | | Added same test using old chunking | Sergio Bertolin | 2016-05-31 | 1 | -1/+17 |
| | | | | | | | |||||
| * | | | | | | userUploadsChunkFileOfWithToWithChecksum has chunking-42 hardcoded | Sergio Bertolin | 2016-05-31 | 1 | -5/+5 |
| | | | | | | | |||||
| * | | | | | | add overwriting using chunking but failing | Sergio Bertolin | 2016-05-31 | 1 | -0/+19 |
| | | | | | | | |||||
| * | | | | | | Added tests about overwriting files and folders as recipient | Sergio Bertolin | 2016-05-31 | 3 | -1/+42 |
| | | | | | | | |||||
* | | | | | | | 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 | 8 | -0/+110 |
|/ / / / / / | |||||
* | | | | | | 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 | 4 | -19/+142 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | 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 |
| | | | | | | |||||
| * | | | | | Fix warnings when trying to get mtime of non existing files | Robin Appelman | 2016-06-03 | 1 | -3/+3 |
| | | | | | | |||||
| * | | | | | return success when deleting ghost files | Robin Appelman | 2016-06-03 | 1 | -1/+3 |
| | | | | | | |||||
| * | | | | | allow deleting "ghost files" trough the View and Node api | Robin Appelman | 2016-06-03 | 2 | -16/+78 |
| | | | | | | |||||
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-06-07 | 4 | -36/+36 |
| | | | | | | |||||
* | | | | | | Remove background from curved logo (#24980) | William Bargent | 2016-06-06 | 1 | -0/+0 |
| | | | | | | |||||
* | | | | | | 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 |
| |_|_|/ / |/| | | | | |||||
* | | | | | Fix second check for quota size (#24989) | Joas Schilling | 2016-06-06 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-06-06 | 4 | -0/+6 |
| | | | | | |||||
* | | | | | 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-05 | 2 | -0/+4 |
| | | | | |