summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #19758 from owncloud/ext-fallback-getmimetypeThomas Müller2015-10-283-45/+0
|\ | | | | Fallback to default mimetype detection mechanism
| * 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 archives
| * | Fix #19181: Support .bz2 app archivesChristian Weiske2015-10-202-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | At first a bz2 handling in needs to be fixed; PEAR's Archive_Tar otherwise gives the following error: > Unsupported compression type "bz" > Supported types are "gz", "bz2" and "lzma2" After that we can whitelist the application/bz2 MIME type in the installer.
* | | Merge pull request #20108 from owncloud/initially_load_250_usersThomas Müller2015-10-281-6/+11
|\ \ \ | | | | | | | | Initially load 250 users
| * | | 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
|\ \ \ \ | | | | | | | | | | Enable DAV app testing on travis
| * | | | 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 compatible
| * | | | Make \OC\SubAdmin php-5.4 compatibleRoeland Jago Douma2015-10-281-4/+19
| | | | | | | | | | | | | | | | | | | | * Also close some cursors while we are at it
* | | | | Merge pull request #20093 from owncloud/ldap-fix-quota-and-caseThomas Müller2015-10-284-7/+57
|\ \ \ \ \ | | | | | | | | | | | | LDAP fix quota and case, fixes #20043
| * | | | | 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"
| * | | | | | Revert "setting to skip migration tests by default"Morris Jobke2015-10-273-25/+1
| | |/ / / / | |/| | | | | | | | | | | | | | | | This reverts commit 7cbdd9b90bcea3566b7d0198f23da3d427e6ef45.
* / | | | | [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 typos
| * | | | sharedialogviewSpec.js couple of text typosPhil Davis2015-10-271-4/+3
| | | | | | | | | | | | | | | I noticed a new typo in https://github.com/owncloud/core/commit/15ef39d5b9655c6c10ea58ffa94b7a80efc6290d and looked for others while I am here.
* | | | | Merge pull request #17104 from owncloud/chunked-upload-lockingRobin Appelman2015-10-274-13/+104
|\ \ \ \ \ | |_|/ / / |/| | | | locking for chunked dav upload
| * | | | 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 ↵Thomas Müller2015-10-2711-61/+247
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | owncloud/enc_configure_encryption_for_home_storage make encryption configurable for home storage
| * | | | | 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 body
| * | | | 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 principals
| * | | | | 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 MOVE
| * | | | | | Verify the src exists in webdav MOVERoeland Jago Douma2015-10-272-0/+17
| | |/ / / / | |/| | | | | | | | | | | | | | | | * Unit test added
* | | | | | Merge pull request #19824 from owncloud/ie9-share-donotsendplaceholderaspasswordThomas Müller2015-10-271-7/+12
|\ \ \ \ \ \ | |/ / / / / |/| | | | | [IE9] Don't send link share password placeholder
| * | | | | [IE9] Don't send link share password placeholderVincent Petry2015-10-261-7/+12
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When exiting the password field in the share dialog, IE9 would mistakenly think that the password has changed and would send the placeholder. This fix prevents changing the password whenever the placeholder is set as value.
* | | | | [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
|\ \ \ \ \ | |/ / / / |/| | | | Improve settings/apps page
| * | | | 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
| | | | |
| * | | | Display empty-content when there are no search resultsJoas Schilling2015-10-261-5/+13
| | | | |
| * | | | Clear search box for nowJoas Schilling2015-10-261-0/+1
| | | | | | | | | | | | | | | | | | | | Fix #15651
| * | | | Allow searching by author name and app level as wellJoas Schilling2015-10-261-1/+30
| | | | |
| * | | | Stay on the same category when refreshing the page on the apps listJoas Schilling2015-10-264-8/+31
| | | | |
* | | | | Merge pull request #19837 from owncloud/always-enabled-appsThomas Müller2015-10-264-37/+68
|\ \ \ \ \ | | | | | | | | | | | | Store list of apps which cannot be disabled in shipped.json
| * | | | | Fail hard if shipped.json is missingThomas Müller2015-10-261-9/+5
| | | | | |
| * | | | | Don't show apps which are always enabled in the app managerThomas Müller2015-10-263-9/+20
| | | | | |