summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #19869 from owncloud/cache-adjustcurrentmtimeonrenameThomas Müller2015-10-294-3/+74
|\
| * Fix locking unit tests due to filemtime additionVincent Petry2015-10-261-2/+10
| * Also adjust storage_mtime of target after renameVincent Petry2015-10-263-1/+64
* | Merge pull request #11509 from owncloud/internal_email_templateThomas Müller2015-10-293-5/+57
|\ \
| * | Allow separate templates for internal and external share notificationsStephen Colebrook2015-10-293-5/+57
* | | Merge pull request #19000 from UoM-ResPlat-DevOps/swift-squelch-expected-404-...Thomas Müller2015-10-291-1/+4
|\ \ \
| * | | Don't log expected Swift 404 responsesTim Dettrick2015-09-141-1/+4
* | | | Merge pull request #19100 from owncloud/ext-tooltip-unavailableThomas Müller2015-10-294-14/+67
|\ \ \ \
| * | | | Display storage status as tooltipRobin McCorkell2015-10-234-7/+47
| * | | | Remove status indicator on modificationRobin McCorkell2015-10-231-8/+21
* | | | | Merge pull request #20140 from owncloud/provisioning_killappphpThomas Müller2015-10-291-20/+0
|\ \ \ \ \
| * | | | | Kill empty app.php in provisioning_apiJoas Schilling2015-10-291-20/+0
* | | | | | Merge pull request #19871 from owncloud/issue-19583-invalid-sharesThomas Müller2015-10-296-8/+395
|\ \ \ \ \ \
| * | | | | | Use the methodJoas Schilling2015-10-291-7/+1
| * | | | | | Add a repair step that checks for group membership on sharesJoas Schilling2015-10-294-1/+284
| * | | | | | Remove shares where the parent does not exist anymoreJoas Schilling2015-10-292-0/+110
| |/ / / / /
* | | | | | Merge pull request #20120 from owncloud/sharee-list-view-testsThomas Müller2015-10-291-0/+158
|\ \ \ \ \ \
| * | | | | | Add sharee list view js testsTom Needham2015-10-291-0/+158
| |/ / / / /
* | | | | | Merge pull request #20126 from owncloud/LukasReschke-patch-1Thomas Müller2015-10-291-118/+82
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Fix formatLukas Reschke2015-10-290-0/+0
| * | | | | Update certificate bundleLukas Reschke2015-10-291-118/+82
* | | | | | Merge pull request #20079 from owncloud/filelist-invalidpathThomas Müller2015-10-293-10/+16
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Fix file list reload callback resultVincent Petry2015-10-273-10/+16
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-10-29140-144/+466
| |/ / / / |/| | | |
* | | | | Merge pull request #19758 from owncloud/ext-fallback-getmimetypeThomas Müller2015-10-283-45/+0
|\ \ \ \ \
| * | | | | Fallback to default mimetype detection mechanismVincent Petry2015-10-133-45/+0
* | | | | | Merge pull request #19182 from cweiske/support-bzip2Thomas Müller2015-10-282-2/+2
|\ \ \ \ \ \
| * | | | | | Fix #19181: Support .bz2 app archivesChristian Weiske2015-10-202-2/+2
* | | | | | | Merge pull request #20108 from owncloud/initially_load_250_usersThomas Müller2015-10-281-6/+11
|\ \ \ \ \ \ \
| * | | | | | | Initially load at least 250 usersJörn Friedrich Dreyer2015-10-281-6/+11
* | | | | | | | Merge pull request #20089 from owncloud/litmus-test-webdavThomas Müller2015-10-287-0/+327
|\ \ \ \ \ \ \ \
| * | | | | | | | run litmus scripts only if code in the dav app did change changedThomas Müller2015-10-284-2/+18
| * | | | | | | | Enable DAV app testing on travisThomas Müller2015-10-276-0/+311
* | | | | | | | | Merge pull request #20102 from owncloud/fix_subadminThomas Müller2015-10-281-4/+19
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Make \OC\SubAdmin php-5.4 compatibleRoeland Jago Douma2015-10-281-4/+19
* | | | | | | | | Merge pull request #20093 from owncloud/ldap-fix-quota-and-caseThomas Müller2015-10-284-7/+57
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | fix attribute casing to ensure array keys workArthur Schiwon2015-10-272-4/+15
| * | | | | | | | | fix update quota with known valueArthur Schiwon2015-10-272-3/+42
* | | | | | | | | | Merge pull request #20097 from owncloud/revert-19508Thomas Müller2015-10-283-25/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Revert "setting to skip migration tests by default"Morris Jobke2015-10-273-25/+1
| | |/ / / / / / / / | |/| | | | | | | |
* / | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-10-2826-8/+160
|/ / / / / / / / /
* | | | | | | | | Merge pull request #20082 from owncloud/phil-davis-sharedialogviewspec-typosThomas Müller2015-10-271-4/+3
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | sharedialogviewSpec.js couple of text typosPhil Davis2015-10-271-4/+3
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge pull request #17104 from owncloud/chunked-upload-lockingRobin Appelman2015-10-274-13/+104
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | adjust tests for new dav classesRobin Appelman2015-10-201-6/+6
| * | | | | | | remove locking for chunksRobin Appelman2015-10-201-4/+0
| * | | | | | | fix locking in testsRobin Appelman2015-10-201-2/+8
| * | | | | | | Adjust for wide lockingRobin Appelman2015-10-202-6/+12
| * | | | | | | Add tests for uploading to locked filesRobin Appelman2015-10-201-1/+81
| * | | | | | | locking for chunked dav uploadRobin Appelman2015-10-201-4/+7