Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Removed deprecated function OC_User::deleteUser | Roeland Jago Douma | 2015-12-17 | 7 | -12/+24 |
| | | | | Replaced with proper OCP calls | ||||
* | Removed deprecated private OC_User::createUser | Roeland Jago Douma | 2015-12-17 | 5 | -7/+7 |
| | | | | | All function calls are replaced with the recommended (which was already the body of the function). | ||||
* | Remove deprecated function OC_User::getManager | Roeland Jago Douma | 2015-12-17 | 1 | -1/+1 |
| | | | | | Private deprecated function => removed Replaced all instances with suggested replacement | ||||
* | Merge pull request #21200 from owncloud/files-authorizationheader | Thomas Müller | 2015-12-17 | 1 | -1/+2 |
|\ | | | | | Use Authorization headers for public webdav in web UI | ||||
| * | Use Authorization headers for public webdav instead of URL | Vincent Petry | 2015-12-14 | 1 | -1/+2 |
| | | | | | | | | | | | | Instead of prepending the token as username in the URL, use the Authorization header instead. This is because IE9 considers this a cross-domain call and refuses to do it in the first place. | ||||
* | | Merge pull request #21201 from mmattel/scanFiles_stat_output_II | Thomas Müller | 2015-12-17 | 1 | -6/+184 |
|\ \ | | | | | | | Statistics output for ./occ files:scan (rework) | ||||
| * | | Statistics output for ./occ files:scan | martin.mattel@diemattels.at | 2015-12-15 | 1 | -6/+184 |
| |/ | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-12-17 | 16 | -26/+42 |
| | | |||||
* | | add unit test for #21230 | Morris Jobke | 2015-12-16 | 1 | -0/+41 |
| | | |||||
* | | Use name of ICollection for exception message | Morris Jobke | 2015-12-16 | 1 | -1/+1 |
| | | | | | | | | * fixes #21230 | ||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-12-16 | 2 | -0/+20 |
| | | |||||
* | | Merge pull request #21133 from owncloud/fix-shared-files-of-deleted-users | C. Montero Luque | 2015-12-15 | 4 | -9/+203 |
|\ \ | | | | | | | Fix shared files of deleted users, detect DN change when checking for existence on LDAP | ||||
| * | | fix find DN by UUID for AD | Arthur Schiwon | 2015-12-14 | 1 | -13/+56 |
| | | | |||||
| * | | unit test on getHome in combination with OfflineUser | Arthur Schiwon | 2015-12-11 | 1 | -2/+52 |
| | | | |||||
| * | | adjust unit test | Arthur Schiwon | 2015-12-11 | 1 | -0/+8 |
| | | | |||||
| * | | look for DN changes before marking a user as deleted | Arthur Schiwon | 2015-12-11 | 3 | -3/+76 |
| | | | |||||
| * | | throw NoUserException in getHome when the requested user does not exist anymore | Arthur Schiwon | 2015-12-11 | 1 | -5/+25 |
| | | | |||||
* | | | Merge pull request #21189 from owncloud/fix_21187 | Thomas Müller | 2015-12-15 | 2 | -1/+4 |
|\ \ \ | | | | | | | | | File shares can't have create permissions | ||||
| * | | | File shares can't have create permissions | Roeland Jago Douma | 2015-12-14 | 2 | -1/+4 |
| | | | | | | | | | | | | | | | | fixes #21187 | ||||
* | | | | Merge pull request #21067 from owncloud/fix_20296 | Thomas Müller | 2015-12-15 | 7 | -6/+23 |
|\ \ \ \ | | | | | | | | | | | don't allow to create a federated share if source and target are the same | ||||
| * | | | | Fixed JS unit tests for fed owner display name | Vincent Petry | 2015-12-14 | 1 | -0/+4 |
| | | | | | |||||
| * | | | | show display name but internally use the user name | Björn Schießle | 2015-12-14 | 6 | -6/+11 |
| | | | | | |||||
| * | | | | don't allow to create a federated share if source and target server are the same | Björn Schießle | 2015-12-14 | 1 | -0/+8 |
| | |_|/ | |/| | | |||||
* / | | | Remove unneeded upgrade code | Morris Jobke | 2015-12-15 | 1 | -16/+0 |
|/ / / | | | | | | | | | | stable8.2 has version 0.7.0 of the user_ldap app | ||||
* | | | Fix mount type root detection | Vincent Petry | 2015-12-14 | 2 | -7/+40 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since Webdav doesn't contain that information, we need to rely on the parent folder's mount type to find out whether a child item is a shared/external root or not. Fixed the mount type detection logic and added unit test. Also added a fix that ignores detection if no parent folder exists (ex: shared file list, favorites, etc) | ||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-12-13 | 8 | -2/+36 |
|/ / | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-12-12 | 86 | -0/+150 |
| | | |||||
* | | Merge pull request #21153 from owncloud/files-deleteactiontext | Thomas Müller | 2015-12-11 | 3 | -5/+49 |
|\ \ | | | | | | | Bring back file delete action text to be based on context | ||||
| * | | Bring back file delete action text to be based on context | Vincent Petry | 2015-12-11 | 3 | -5/+49 |
| | | | | | | | | | | | | | | | | | | | | | | | | For received shares, the delete action becomes "Unshare" and for personal mounts it becomes "Disconnect storage". This also makes it possible from now on to pass a function to a file action's "displayName" attribute. | ||||
* | | | skip test if we cant use the filesystem when not logged in | Robin Appelman | 2015-12-11 | 1 | -2/+5 |
| | | | |||||
* | | | Fix thrashbin wrapper when no user is loggedin | Robin Appelman | 2015-12-11 | 2 | -2/+13 |
|/ / | |||||
* | | Merge pull request #21144 from owncloud/dav-auth-checkduplicateheader | Thomas Müller | 2015-12-11 | 1 | -1/+1 |
|\ \ | | | | | | | Properly check X-Requested-With header in case of multiple values | ||||
| * | | Properly check X-Requested-With header in case of multiple values | Vincent Petry | 2015-12-11 | 1 | -1/+1 |
| | | | | | | | | | | | | Saw this happening in IE8... | ||||
* | | | Merge pull request #21135 from owncloud/add-polyfill | Thomas Müller | 2015-12-11 | 3 | -111/+9 |
|\ \ \ | | | | | | | | | Add polyfills for PHP55, PHP56 and PHP70 functionalities | ||||
| * | | | Use PHP polyfills | Lukas Reschke | 2015-12-11 | 3 | -111/+9 |
| | |/ | |/| | |||||
* | | | Merge pull request #21045 from owncloud/scrutinizer-patch-1 | Thomas Müller | 2015-12-11 | 10 | -9/+38 |
|\ \ \ | | | | | | | | | Scrutinizer Auto-Fixes | ||||
| * | | | adjust PHPDoc | Thomas Müller | 2015-12-10 | 2 | -0/+4 |
| | | | | |||||
| * | | | Scrutinizer Auto-Fixes | Scrutinizer Auto-Fixer | 2015-12-10 | 10 | -9/+34 |
| |/ / | | | | | | | | | | This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com | ||||
* / / | Catch exception when querying direct download link | Vincent Petry | 2015-12-10 | 2 | -3/+33 |
|/ / | |||||
* | | Merge pull request #21114 from owncloud/group-propagation-tests | Thomas Müller | 2015-12-10 | 4 | -78/+215 |
|\ \ | |/ |/| | Add test case for group share propagation | ||||
| * | Add test case for group share propagation | Robin Appelman | 2015-12-10 | 4 | -78/+215 |
| | | |||||
* | | Deduplicate version expire jobs | Morris Jobke | 2015-12-10 | 2 | -37/+10 |
|/ | | | | | | * versionSize is calculated anyway in the expire job - > dropped * offset/neededSpace was needed for expiry before the file is moved to the versions -> now this is included already in the currently used space because the expiry job is defered to a point in time after the version creation * fixes #21108 | ||||
* | Merge pull request #21071 from owncloud/fix-swift-unit-test-execution-master | Thomas Müller | 2015-12-10 | 2 | -4/+283 |
|\ | | | | | Looks like ceph requires more time to come up .... | ||||
| * | Looks like ceph requires more time to come up .... | Thomas Müller | 2015-12-09 | 2 | -4/+283 |
| | | | | | | | | | | | | Use sed - not replace apply btrfs hack | ||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-12-10 | 8 | -0/+54 |
| | | |||||
* | | Merge pull request #21077 from owncloud/external-index-names | Thomas Müller | 2015-12-09 | 2 | -7/+1 |
|\ \ | |/ |/| | Let doctrine generate index names for files_external | ||||
| * | Let doctrine generate index names | Robin Appelman | 2015-12-09 | 2 | -7/+1 |
| | | |||||
* | | Merge pull request #20989 from owncloud/fix_20769 | Thomas Müller | 2015-12-09 | 1 | -0/+41 |
|\ \ | | | | | | | Update parent when moving share into recieved share | ||||
| * | | Update parent when moving share into recieved share | Roeland Jago Douma | 2015-12-07 | 1 | -0/+41 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #20769 When I receive a share and move a share of myself into that share (which is allowed currently) I effectively hand over ownership of the files I move. So we need to update the share I move to have as a parent the share I move it into. Else our mounting system gets confused. | ||||
* | | | Merge pull request #21059 from owncloud/remove-deaed-code-mount-config | Thomas Müller | 2015-12-09 | 1 | -52/+6 |
|\ \ \ | | | | | | | | | Remove dead code |