summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2016-01-058-2/+98
* [tx-robot] updated from transifexJenkins for ownCloud2016-01-0410-0/+58
* [tx-robot] updated from transifexJenkins for ownCloud2015-12-3112-2/+122
* Merge pull request #21291 from owncloud/refactor-call-checkThomas Müller2015-12-281-1/+1
|\
| * Refactor OC_Util::callCheckMorris Jobke2015-12-221-1/+1
* | Merge pull request #21254 from owncloud/files-uploadcanceliconfixThomas Müller2015-12-282-23/+36
|\ \
| * | Use showBusyState for upload into folderVincent Petry2015-12-181-22/+20
| * | Correctly render uploadtext indicator only on foldersVincent Petry2015-12-182-1/+16
* | | Merge pull request #21216 from owncloud/fopen-statcacheThomas Müller2015-12-281-2/+7
|\ \ \
| * | | clear statcache after fopen for smbRobin Appelman2015-12-151-2/+7
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-12-2810-2/+58
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-12-276-0/+20
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-12-254-0/+6
* | | | Merge pull request #21093 from owncloud/migrate-no-userRobin Appelman2015-12-243-13/+61
|\ \ \ \
| * | | | Migrate files external for the user that the filesystem is being setup forRobin Appelman2015-12-143-13/+61
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-12-232-0/+2
* | | | | Make a modifiable copy of the webdav properties in JS file listVincent Petry2015-12-221-1/+1
* | | | | Merge pull request #21287 from owncloud/travis-dav-caldavtesterThomas Müller2015-12-226-0/+3701
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Adding integration tests for CalDAVThomas Müller2015-12-216-0/+3701
* | | | | Add error logging to federated sharing handshakeRobin Appelman2015-12-215-10/+37
|/ / / /
* | | | Merge pull request #21293 from owncloud/restructure-travis-dav-testingThomas Müller2015-12-217-57/+65
|\ \ \ \
| * | | | Sleep in carddavtester as wellThomas Müller2015-12-211-0/+2
| * | | | Restructure travis testsThomas Müller2015-12-217-57/+63
* | | | | Merge pull request #21195 from owncloud/test-carddav-sharing-pluginThomas Müller2015-12-215-64/+167
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix failing unit testsThomas Müller2015-12-181-1/+1
| * | | | Fix carddav sharing plugin + adding unit testsThomas Müller2015-12-185-63/+166
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-12-212-0/+2
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-12-204-0/+4
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-12-196-4/+10
| |_|_|/ |/| | |
* | | | Removed deprecated OC_Helper::mimeTypeIcon functionRoeland Jago Douma2015-12-182-5/+5
* | | | Removed deprecated OC_Helper::getSecureMimeTypeRoeland Jago Douma2015-12-183-3/+3
* | | | Merge pull request #21268 from owncloud/cleanup-OC_Helper-getFileNameMimeTypeThomas Müller2015-12-184-5/+7
|\ \ \ \
| * | | | Use proper public API for OC_Helper::getFileNameMimeTypeMorris Jobke2015-12-174-5/+7
* | | | | Merge pull request #21264 from owncloud/deprecated_oc_user_methodsThomas Müller2015-12-188-20/+32
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Removed deprecated function OC_User::deleteUserRoeland Jago Douma2015-12-177-12/+24
| * | | | Removed deprecated private OC_User::createUserRoeland Jago Douma2015-12-175-7/+7
| * | | | Remove deprecated function OC_User::getManagerRoeland Jago Douma2015-12-171-1/+1
| |/ / /
* | | | Merge pull request #20696 from owncloud/add-carddav-backends-to-ocp-contactsm...Thomas Müller2015-12-179-21/+1184
|\ \ \ \ | |/ / / |/| | |
| * | | avoid duplicates on searchBjörn Schießle2015-12-152-15/+33
| * | | Fix last Oracle issueThomas Müller2015-12-151-1/+1
| * | | Fix Oracle insert errorThomas Müller2015-12-152-4/+8
| * | | implement delete, create, update, search, get permissionsBjörn Schießle2015-12-1510-123/+1133
| * | | save wipThomas Müller2015-12-112-0/+131
* | | | Merge pull request #21200 from owncloud/files-authorizationheaderThomas Müller2015-12-171-1/+2
|\ \ \ \
| * | | | Use Authorization headers for public webdav instead of URLVincent Petry2015-12-141-1/+2
| | |_|/ | |/| |
* | | | Merge pull request #21201 from mmattel/scanFiles_stat_output_IIThomas Müller2015-12-171-6/+184
|\ \ \ \
| * | | | Statistics output for ./occ files:scanmartin.mattel@diemattels.at2015-12-151-6/+184
| |/ / /
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-12-1716-26/+42
* | | | add unit test for #21230Morris Jobke2015-12-161-0/+41
* | | | Use name of ICollection for exception messageMorris Jobke2015-12-161-1/+1