Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #19758 from owncloud/ext-fallback-getmimetype | Thomas Müller | 2015-10-28 | 3 | -45/+0 |
|\ | | | | | Fallback to default mimetype detection mechanism | ||||
| * | Fallback to default mimetype detection mechanism | Vincent Petry | 2015-10-13 | 3 | -45/+0 |
| | | |||||
* | | Merge pull request #19182 from cweiske/support-bzip2 | Thomas Müller | 2015-10-28 | 2 | -2/+2 |
|\ \ | | | | | | | Fix #19181: Support .bz2 app archives | ||||
| * | | Fix #19181: Support .bz2 app archives | Christian Weiske | 2015-10-20 | 2 | -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_users | Thomas Müller | 2015-10-28 | 1 | -6/+11 |
|\ \ \ | | | | | | | | | Initially load 250 users | ||||
| * | | | Initially load at least 250 users | Jörn Friedrich Dreyer | 2015-10-28 | 1 | -6/+11 |
| | | | | |||||
* | | | | Merge pull request #20089 from owncloud/litmus-test-webdav | Thomas Müller | 2015-10-28 | 7 | -0/+327 |
|\ \ \ \ | | | | | | | | | | | Enable DAV app testing on travis | ||||
| * | | | | run litmus scripts only if code in the dav app did change changed | Thomas Müller | 2015-10-28 | 4 | -2/+18 |
| | | | | | |||||
| * | | | | Enable DAV app testing on travis | Thomas Müller | 2015-10-27 | 6 | -0/+311 |
| | | | | | |||||
* | | | | | Merge pull request #20102 from owncloud/fix_subadmin | Thomas Müller | 2015-10-28 | 1 | -4/+19 |
|\ \ \ \ \ | |_|/ / / |/| | | | | Make \OC\SubAdmin php-5.4 compatible | ||||
| * | | | | Make \OC\SubAdmin php-5.4 compatible | Roeland Jago Douma | 2015-10-28 | 1 | -4/+19 |
| | | | | | | | | | | | | | | | | | | | | * Also close some cursors while we are at it | ||||
* | | | | | Merge pull request #20093 from owncloud/ldap-fix-quota-and-case | Thomas Müller | 2015-10-28 | 4 | -7/+57 |
|\ \ \ \ \ | | | | | | | | | | | | | LDAP fix quota and case, fixes #20043 | ||||
| * | | | | | fix attribute casing to ensure array keys work | Arthur Schiwon | 2015-10-27 | 2 | -4/+15 |
| | | | | | | |||||
| * | | | | | fix update quota with known value | Arthur Schiwon | 2015-10-27 | 2 | -3/+42 |
| | | | | | | |||||
* | | | | | | Merge pull request #20097 from owncloud/revert-19508 | Thomas Müller | 2015-10-28 | 3 | -25/+1 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Revert "setting to skip migration tests by default" | ||||
| * | | | | | | Revert "setting to skip migration tests by default" | Morris Jobke | 2015-10-27 | 3 | -25/+1 |
| | |/ / / / | |/| | | | | | | | | | | | | | | | | This reverts commit 7cbdd9b90bcea3566b7d0198f23da3d427e6ef45. | ||||
* / | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-10-28 | 26 | -8/+160 |
|/ / / / / | |||||
* | | | | | Merge pull request #20082 from owncloud/phil-davis-sharedialogviewspec-typos | Thomas Müller | 2015-10-27 | 1 | -4/+3 |
|\ \ \ \ \ | |/ / / / |/| | | | | sharedialogviewSpec.js couple of text typos | ||||
| * | | | | sharedialogviewSpec.js couple of text typos | Phil Davis | 2015-10-27 | 1 | -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-locking | Robin Appelman | 2015-10-27 | 4 | -13/+104 |
|\ \ \ \ \ | |_|/ / / |/| | | | | locking for chunked dav upload | ||||
| * | | | | adjust tests for new dav classes | Robin Appelman | 2015-10-20 | 1 | -6/+6 |
| | | | | | |||||
| * | | | | remove locking for chunks | Robin Appelman | 2015-10-20 | 1 | -4/+0 |
| | | | | | |||||
| * | | | | fix locking in tests | Robin Appelman | 2015-10-20 | 1 | -2/+8 |
| | | | | | |||||
| * | | | | Adjust for wide locking | Robin Appelman | 2015-10-20 | 2 | -6/+12 |
| | | | | | |||||
| * | | | | Add tests for uploading to locked files | Robin Appelman | 2015-10-20 | 1 | -1/+81 |
| | | | | | |||||
| * | | | | locking for chunked dav upload | Robin Appelman | 2015-10-20 | 1 | -4/+7 |
| | | | | | |||||
* | | | | | Merge pull request #19894 from ↵ | Thomas Müller | 2015-10-27 | 11 | -61/+247 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | owncloud/enc_configure_encryption_for_home_storage make encryption configurable for home storage | ||||
| * | | | | | make encryption configurable for home storage | Bjoern Schiessle | 2015-10-27 | 11 | -61/+247 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge pull request #20078 from owncloud/tipsy-body | Thomas Müller | 2015-10-27 | 1 | -1/+2 |
|\ \ \ \ \ | |/ / / / |/| | | | | Append tipsys to body | ||||
| * | | | | append tipsys to body | Hendrik Leppelsack | 2015-10-27 | 1 | -1/+2 |
| | | | | | |||||
* | | | | | Merge pull request #20066 from owncloud/list-principaly-in-debug-mode | Thomas Müller | 2015-10-27 | 1 | -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 principals | Thomas Müller | 2015-10-26 | 1 | -3/+8 |
| | | | | | | |||||
* | | | | | | Merge pull request #20076 from owncloud/fix_20069 | Thomas Müller | 2015-10-27 | 2 | -0/+17 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Verify the src exists in webdav MOVE | ||||
| * | | | | | | Verify the src exists in webdav MOVE | Roeland Jago Douma | 2015-10-27 | 2 | -0/+17 |
| | |/ / / / | |/| | | | | | | | | | | | | | | | | * Unit test added | ||||
* | | | | | | Merge pull request #19824 from owncloud/ie9-share-donotsendplaceholderaspassword | Thomas Müller | 2015-10-27 | 1 | -7/+12 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | [IE9] Don't send link share password placeholder | ||||
| * | | | | | [IE9] Don't send link share password placeholder | Vincent Petry | 2015-10-26 | 1 | -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 transifex | Jenkins for ownCloud | 2015-10-27 | 90 | -90/+216 |
| | | | | | |||||
* | | | | | Merge pull request #19813 from owncloud/stay-on-apps-category-refresh | Thomas Müller | 2015-10-26 | 5 | -34/+206 |
|\ \ \ \ \ | |/ / / / |/| | | | | Improve settings/apps page | ||||
| * | | | | Fix backwards and forward button | Joas Schilling | 2015-10-26 | 1 | -1/+12 |
| | | | | | |||||
| * | | | | Use speaking ids | Joas Schilling | 2015-10-26 | 4 | -20/+61 |
| | | | | | |||||
| * | | | | Fix backspace in search and empty content message | Joas Schilling | 2015-10-26 | 1 | -4/+9 |
| | | | | | |||||
| * | | | | Add js tests for empty content page | Joas Schilling | 2015-10-26 | 1 | -4/+19 |
| | | | | | |||||
| * | | | | Adjust js unit tests | Joas Schilling | 2015-10-26 | 1 | -4/+43 |
| | | | | | |||||
| * | | | | Display empty-content when there are no search results | Joas Schilling | 2015-10-26 | 1 | -5/+13 |
| | | | | | |||||
| * | | | | Clear search box for now | Joas Schilling | 2015-10-26 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | Fix #15651 | ||||
| * | | | | Allow searching by author name and app level as well | Joas Schilling | 2015-10-26 | 1 | -1/+30 |
| | | | | | |||||
| * | | | | Stay on the same category when refreshing the page on the apps list | Joas Schilling | 2015-10-26 | 4 | -8/+31 |
| | | | | | |||||
* | | | | | Merge pull request #19837 from owncloud/always-enabled-apps | Thomas Müller | 2015-10-26 | 4 | -37/+68 |
|\ \ \ \ \ | | | | | | | | | | | | | Store list of apps which cannot be disabled in shipped.json | ||||
| * | | | | | Fail hard if shipped.json is missing | Thomas Müller | 2015-10-26 | 1 | -9/+5 |
| | | | | | | |||||
| * | | | | | Don't show apps which are always enabled in the app manager | Thomas Müller | 2015-10-26 | 3 | -9/+20 |
| | | | | | |