summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Drop OC_SubAdmin and replace usagesLukas Reschke2015-10-2925-1793/+2538
* 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
* | | | | Merge pull request #19894 from owncloud/enc_configure_encryption_for_home_sto...Thomas Müller2015-10-2711-61/+247
|\ \ \ \ \
| * | | | | make encryption configurable for home storageBjoern Schiessle2015-10-2711-61/+247
| | |/ / / | |/| | |
* | | | | Merge pull request #20078 from owncloud/tipsy-bodyThomas Müller2015-10-271-1/+2
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | append tipsys to bodyHendrik Leppelsack2015-10-271-1/+2
* | | | | Merge pull request #20066 from owncloud/list-principaly-in-debug-modeThomas Müller2015-10-271-3/+8
|\ \ \ \ \
| * | | | | as soon as debug mode is enabled we allow listing of principalsThomas Müller2015-10-261-3/+8
* | | | | | Merge pull request #20076 from owncloud/fix_20069Thomas Müller2015-10-272-0/+17
|\ \ \ \ \ \
| * | | | | | Verify the src exists in webdav MOVERoeland Jago Douma2015-10-272-0/+17
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #19824 from owncloud/ie9-share-donotsendplaceholderaspasswordThomas Müller2015-10-271-7/+12
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | [IE9] Don't send link share password placeholderVincent Petry2015-10-261-7/+12
| |/ / / /
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-10-2790-90/+216
* | | | | Merge pull request #19813 from owncloud/stay-on-apps-category-refreshThomas Müller2015-10-265-34/+206
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix backwards and forward buttonJoas Schilling2015-10-261-1/+12
| * | | | Use speaking idsJoas Schilling2015-10-264-20/+61
| * | | | Fix backspace in search and empty content messageJoas Schilling2015-10-261-4/+9
| * | | | Add js tests for empty content pageJoas Schilling2015-10-261-4/+19
| * | | | Adjust js unit testsJoas Schilling2015-10-261-4/+43