| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge pull request #22536 from owncloud/add-integration-tests-for-tags | Thomas Müller | 2016-02-22 | 4 | -6/+285 |
|\ |
|
| * | Check if user has permission to create such a tag | Lukas Reschke | 2016-02-19 | 4 | -6/+285 |
* | | Merge pull request #22555 from owncloud/jenkins-19978 | Thomas Müller | 2016-02-22 | 1 | -0/+3 |
|\ \ |
|
| * | | Solution for Proposal #19974 | Pierre Jochem | 2016-02-22 | 1 | -0/+3 |
| |/ |
|
* | | Fix public page footer position in IE | Vincent Petry | 2016-02-22 | 1 | -0/+5 |
* | | Fixes pagination in IE | Morris Jobke | 2016-02-22 | 1 | -1/+0 |
|/ |
|
* | Merge pull request #22503 from owncloud/issue_22500 | Thomas Müller | 2016-02-19 | 1 | -0/+3 |
|\ |
|
| * | make sure that the file name doesn't end with a trailing slash. Can for examp... | Bjoern Schiessle | 2016-02-19 | 1 | -0/+3 |
* | | Merge pull request #22509 from owncloud/add-filesplugin-to-new-webdav-endpoint | Thomas Müller | 2016-02-19 | 1 | -0/+4 |
|\ \ |
|
| * | | Add FilesPlugin - fixes #22507 | Thomas Müller | 2016-02-19 | 1 | -0/+4 |
* | | | Merge pull request #22348 from owncloud/issue-21812-calendar-old-caldav-url | Thomas Müller | 2016-02-19 | 4 | -5/+90 |
|\ \ \
| |/ /
|/| | |
|
| * | | Add correct principals for the current user before ACL check | Joas Schilling | 2016-02-19 | 3 | -3/+77 |
| * | | Convert the old principal to the new principal before getting calendars | Joas Schilling | 2016-02-19 | 1 | -2/+13 |
* | | | Merge pull request #22515 from owncloud/webdav_checksum_only_for_files | Thomas Müller | 2016-02-19 | 1 | -5/+7 |
|\ \ \
| |/ /
|/| | |
|
| * | | Only add checksum headers for files | Roeland Jago Douma | 2016-02-19 | 1 | -5/+7 |
| |/ |
|
* | | Merge pull request #22198 from owncloud/birthday-calendar | Thomas Müller | 2016-02-19 | 14 | -41/+548 |
|\ \
| |/
|/| |
|
| * | Adding cli command to sync birthday calendar | Thomas Müller | 2016-02-18 | 6 | -14/+171 |
| * | Prevent deletion of birthday calendar | Thomas Müller | 2016-02-18 | 3 | -8/+8 |
| * | Sync a users contacts birthday to the users birthday calendar | Thomas Müller | 2016-02-18 | 10 | -38/+388 |
* | | Merge pull request #22405 from owncloud/gdrive-mimetype-and-office-fixes | Thomas Müller | 2016-02-19 | 1 | -4/+13 |
|\ \ |
|
| * | | Fix GDrive handling of office files | Vincent Petry | 2016-02-15 | 1 | -4/+13 |
* | | | Merge pull request #22424 from owncloud/add-generic-csrf-protection-to-webdav | Thomas Müller | 2016-02-19 | 7 | -83/+84 |
|\ \ \ |
|
| * | | | Require CSRF token for non WebDAV authenticated requests | Lukas Reschke | 2016-02-18 | 7 | -83/+84 |
* | | | | Merge pull request #22444 from owncloud/fix-federated-share-delete | Thomas Müller | 2016-02-18 | 3 | -79/+152 |
|\ \ \ \ |
|
| * | | | | get the actual user instead of a federated cloud id | Bjoern Schiessle | 2016-02-18 | 1 | -15/+43 |
| * | | | | get the actual user instead of a federated cloud id | Bjoern Schiessle | 2016-02-18 | 2 | -64/+109 |
| |/ / / |
|
* | | | | Merge pull request #21610 from owncloud/quota-sharedfile | Thomas Müller | 2016-02-18 | 4 | -19/+158 |
|\ \ \ \ |
|
| * | | | | Defer quota check in web UI when overwriting shared file | Vincent Petry | 2016-02-17 | 2 | -9/+42 |
| * | | | | Check the quota on the actual file's storage in dav quota plugin | Vincent Petry | 2016-02-17 | 2 | -10/+116 |
* | | | | | Properly trigger testRemote after getting a 404 from remote fed share | Vincent Petry | 2016-02-18 | 1 | -0/+3 |
| |_|_|/
|/| | | |
|
* | | | | Merge pull request #22399 from owncloud/issue-22394-index-names-for-oracle | Thomas Müller | 2016-02-18 | 1 | -0/+9 |
|\ \ \ \ |
|
| * | | | | Add index names so Doctrine does not use a too long random string | Joas Schilling | 2016-02-15 | 1 | -0/+9 |
| | |_|/
| |/| | |
|
* | | | | Merge pull request #22434 from owncloud/share_ocs_api_handle_invalid_shares | Thomas Müller | 2016-02-18 | 2 | -7/+356 |
|\ \ \ \ |
|
| * | | | | Add unit tests for formatShare | Roeland Jago Douma | 2016-02-17 | 1 | -0/+325 |
| * | | | | OCS Share API should not return invalid shares | Roeland Jago Douma | 2016-02-17 | 2 | -7/+31 |
| | |/ /
| |/| | |
|
* | | | | Merge pull request #22478 from owncloud/external-missing-auth | Thomas Müller | 2016-02-18 | 1 | -0/+7 |
|\ \ \ \
| |_|_|/
|/| | | |
|
| * | | | dont die when missing an auth backend | Robin Appelman | 2016-02-17 | 1 | -0/+7 |
* | | | | Merge pull request #22475 from owncloud/fix-js-issues | Thomas Müller | 2016-02-18 | 1 | -2/+2 |
|\ \ \ \ |
|
| * | | | | Fixes code analysis issues | Morris Jobke | 2016-02-17 | 1 | -2/+2 |
| |/ / / |
|
* | | | | Merge pull request #22418 from owncloud/issue-22393-filelist-plugins-for-othe... | Thomas Müller | 2016-02-18 | 2 | -9/+8 |
|\ \ \ \ |
|
| * | | | | Show the comments and tags on the share filters | Joas Schilling | 2016-02-16 | 2 | -9/+8 |
* | | | | | Merge pull request #22408 from owncloud/gdrive-remove-mimetype-detection | Thomas Müller | 2016-02-18 | 1 | -1/+2 |
|\ \ \ \ \
| |_|/ / /
|/| | | | |
|
| * | | | | Fix GDrive mime type detection with encryption | Vincent Petry | 2016-02-15 | 1 | -1/+2 |
| | |_|/
| |/| | |
|
* | | | | Merge pull request #16783 from owncloud/handle-redirects-global | Thomas Müller | 2016-02-17 | 2 | -14/+0 |
|\ \ \ \ |
|
| * | | | | Add handler for global ajax errors | Vincent Petry | 2016-02-15 | 2 | -14/+0 |
| |/ / / |
|
* | | / | remove global credentials | Robin Appelman | 2016-02-17 | 9 | -272/+3 |
| |_|/
|/| | |
|
* | | | Merge pull request #22451 from owncloud/use-proper-user-folder | Thomas Müller | 2016-02-17 | 1 | -6/+10 |
|\ \ \ |
|
| * | | | Handles null as return code and uses proper UserFolder in trashbin | Morris Jobke | 2016-02-16 | 1 | -6/+10 |
* | | | | Merge pull request #22435 from owncloud/trashbin-hook-nouser | Thomas Müller | 2016-02-17 | 1 | -2/+5 |
|\ \ \ \ |
|
| * | | | | Don't resize trash when no user | Vincent Petry | 2016-02-16 | 1 | -2/+5 |