Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | Merge pull request #21195 from owncloud/test-carddav-sharing-plugin | Thomas Müller | 2015-12-21 | 5 | -64/+167 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | ||||||
| * | | | | | Fix failing unit tests | Thomas Müller | 2015-12-18 | 1 | -1/+1 | |
| * | | | | | Fix carddav sharing plugin + adding unit tests | Thomas Müller | 2015-12-18 | 5 | -63/+166 | |
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-12-21 | 2 | -0/+2 | |
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-12-20 | 4 | -0/+4 | |
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-12-19 | 6 | -4/+10 | |
| |_|_|/ / |/| | | | | ||||||
* | | | | | Removed deprecated OC_Helper::mimeTypeIcon function | Roeland Jago Douma | 2015-12-18 | 2 | -5/+5 | |
* | | | | | Removed deprecated OC_Helper::getSecureMimeType | Roeland Jago Douma | 2015-12-18 | 3 | -3/+3 | |
* | | | | | Merge pull request #21268 from owncloud/cleanup-OC_Helper-getFileNameMimeType | Thomas Müller | 2015-12-18 | 4 | -5/+7 | |
|\ \ \ \ \ | ||||||
| * | | | | | Use proper public API for OC_Helper::getFileNameMimeType | Morris Jobke | 2015-12-17 | 4 | -5/+7 | |
* | | | | | | Merge pull request #21264 from owncloud/deprecated_oc_user_methods | Thomas Müller | 2015-12-18 | 8 | -20/+32 | |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | ||||||
| * | | | | | Removed deprecated function OC_User::deleteUser | Roeland Jago Douma | 2015-12-17 | 7 | -12/+24 | |
| * | | | | | Removed deprecated private OC_User::createUser | Roeland Jago Douma | 2015-12-17 | 5 | -7/+7 | |
| * | | | | | Remove deprecated function OC_User::getManager | Roeland Jago Douma | 2015-12-17 | 1 | -1/+1 | |
| |/ / / / | ||||||
* | | | | | Merge pull request #20696 from owncloud/add-carddav-backends-to-ocp-contactsm... | Thomas Müller | 2015-12-17 | 9 | -21/+1184 | |
|\ \ \ \ \ | |/ / / / |/| | | | | ||||||
| * | | | | avoid duplicates on search | Björn Schießle | 2015-12-15 | 2 | -15/+33 | |
| * | | | | Fix last Oracle issue | Thomas Müller | 2015-12-15 | 1 | -1/+1 | |
| * | | | | Fix Oracle insert error | Thomas Müller | 2015-12-15 | 2 | -4/+8 | |
| * | | | | implement delete, create, update, search, get permissions | Björn Schießle | 2015-12-15 | 10 | -123/+1133 | |
| * | | | | save wip | Thomas Müller | 2015-12-11 | 2 | -0/+131 | |
| | |_|/ | |/| | | ||||||
* | | | | Merge pull request #21200 from owncloud/files-authorizationheader | Thomas Müller | 2015-12-17 | 1 | -1/+2 | |
|\ \ \ \ | ||||||
| * | | | | Use Authorization headers for public webdav instead of URL | Vincent Petry | 2015-12-14 | 1 | -1/+2 | |
| | |_|/ | |/| | | ||||||
* | | | | 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 | 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 | |
* | | | | [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 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 | Roeland Jago Douma | 2015-12-14 | 2 | -1/+4 | |
* | | | | | | Merge pull request #21067 from owncloud/fix_20296 | Thomas Müller | 2015-12-15 | 7 | -6/+23 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | 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 | |
|/ / / / / | ||||||
* | | | / | Fix mount type root detection | Vincent Petry | 2015-12-14 | 2 | -7/+40 | |
| |_|_|/ |/| | | | ||||||
* | | | | [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 | Vincent Petry | 2015-12-11 | 3 | -5/+49 | |
* | | | 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 | Vincent Petry | 2015-12-11 | 1 | -1/+1 |