summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #21481 from owncloud/ext-smb-dependenciesThomas Müller2016-01-071-2/+4
|\
| * Check libsmbclient-php as well as smbclient binaryRobin McCorkell2016-01-071-2/+4
* | Merge pull request #21455 from owncloud/fix-method-signatureThomas Müller2016-01-071-1/+1
|\ \
| * | Fix method call + undefined variableLukas Reschke2016-01-071-1/+1
| |/
* | Merge pull request #20773 from owncloud/share2.0_createThomas Müller2016-01-073-10/+451
|\ \
| * | [Sharing 2.0] Add L10N instance to manager for translated errorsRoeland Jago Douma2016-01-062-5/+9
| * | [Sharing 2.0] Do not use static function to get numeric storage idRoeland Jago Douma2016-01-062-5/+15
| * | [Sharing 2.0] General exceptions return 403Roeland Jago Douma2016-01-061-1/+1
| * | [Share 2.0] Enable share creation via OCS APIRoeland Jago Douma2016-01-063-5/+432
* | | Merge pull request #21359 from owncloud/check-changesThomas Müller2016-01-072-4/+2
|\ \ \
| * | | fix js unit testsMorris Jobke2016-01-071-2/+2
| * | | Also remove it from the web interfaceRobin Appelman2016-01-071-2/+0
| | |/ | |/|
* / | Add token in webdav download link of public pageVincent Petry2016-01-072-4/+8
|/ /
* | Merge pull request #21343 from owncloud/ldap-showremnants-json-outputThomas Müller2016-01-071-11/+15
|\ \
| * | Add an option to occ ldap:showremnants to output a json encoded array for use...Stephen Colebrook2015-12-221-11/+15
* | | [tx-robot] updated from transifexJenkins for ownCloud2016-01-0716-0/+78
* | | Make LDAP more robust to exceptions and log them properlyMorris Jobke2016-01-062-1/+2
| |/ |/|
* | Inject OCSClientLukas Reschke2016-01-063-18/+25
* | [tx-robot] updated from transifexJenkins for ownCloud2016-01-066-22/+22
* | Use color instead of transparency for proper tooltip appearanceMorris Jobke2016-01-051-0/+3
* | [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