Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #19869 from owncloud/cache-adjustcurrentmtimeonrename | Thomas Müller | 2015-10-29 | 4 | -3/+74 |
|\ | |||||
| * | Fix locking unit tests due to filemtime addition | Vincent Petry | 2015-10-26 | 1 | -2/+10 |
| * | Also adjust storage_mtime of target after rename | Vincent Petry | 2015-10-26 | 3 | -1/+64 |
* | | Merge pull request #11509 from owncloud/internal_email_template | Thomas Müller | 2015-10-29 | 3 | -5/+57 |
|\ \ | |||||
| * | | Allow separate templates for internal and external share notifications | Stephen Colebrook | 2015-10-29 | 3 | -5/+57 |
* | | | Merge pull request #19000 from UoM-ResPlat-DevOps/swift-squelch-expected-404-... | Thomas Müller | 2015-10-29 | 1 | -1/+4 |
|\ \ \ | |||||
| * | | | Don't log expected Swift 404 responses | Tim Dettrick | 2015-09-14 | 1 | -1/+4 |
* | | | | Merge pull request #19100 from owncloud/ext-tooltip-unavailable | Thomas Müller | 2015-10-29 | 4 | -14/+67 |
|\ \ \ \ | |||||
| * | | | | Display storage status as tooltip | Robin McCorkell | 2015-10-23 | 4 | -7/+47 |
| * | | | | Remove status indicator on modification | Robin McCorkell | 2015-10-23 | 1 | -8/+21 |
* | | | | | Merge pull request #20140 from owncloud/provisioning_killappphp | Thomas Müller | 2015-10-29 | 1 | -20/+0 |
|\ \ \ \ \ | |||||
| * | | | | | Kill empty app.php in provisioning_api | Joas Schilling | 2015-10-29 | 1 | -20/+0 |
* | | | | | | Merge pull request #19871 from owncloud/issue-19583-invalid-shares | Thomas Müller | 2015-10-29 | 6 | -8/+395 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Use the method | Joas Schilling | 2015-10-29 | 1 | -7/+1 |
| * | | | | | | Add a repair step that checks for group membership on shares | Joas Schilling | 2015-10-29 | 4 | -1/+284 |
| * | | | | | | Remove shares where the parent does not exist anymore | Joas Schilling | 2015-10-29 | 2 | -0/+110 |
| |/ / / / / | |||||
* | | | | | | Merge pull request #20120 from owncloud/sharee-list-view-tests | Thomas Müller | 2015-10-29 | 1 | -0/+158 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Add sharee list view js tests | Tom Needham | 2015-10-29 | 1 | -0/+158 |
| |/ / / / / | |||||
* | | | | | | Merge pull request #20126 from owncloud/LukasReschke-patch-1 | Thomas Müller | 2015-10-29 | 1 | -118/+82 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | |||||
| * | | | | | Fix format | Lukas Reschke | 2015-10-29 | 0 | -0/+0 |
| * | | | | | Update certificate bundle | Lukas Reschke | 2015-10-29 | 1 | -118/+82 |
* | | | | | | Merge pull request #20079 from owncloud/filelist-invalidpath | Thomas Müller | 2015-10-29 | 3 | -10/+16 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | |||||
| * | | | | | Fix file list reload callback result | Vincent Petry | 2015-10-27 | 3 | -10/+16 |
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-10-29 | 140 | -144/+466 |
| |/ / / / |/| | | | | |||||
* | | | | | Merge pull request #19758 from owncloud/ext-fallback-getmimetype | Thomas Müller | 2015-10-28 | 3 | -45/+0 |
|\ \ \ \ \ | |||||
| * | | | | | 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 | Christian Weiske | 2015-10-20 | 2 | -2/+2 |
* | | | | | | | Merge pull request #20108 from owncloud/initially_load_250_users | Thomas Müller | 2015-10-28 | 1 | -6/+11 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | 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 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | 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 | Roeland Jago Douma | 2015-10-28 | 1 | -4/+19 |
* | | | | | | | | | Merge pull request #20093 from owncloud/ldap-fix-quota-and-case | Thomas Müller | 2015-10-28 | 4 | -7/+57 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | 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" | Morris Jobke | 2015-10-27 | 3 | -25/+1 |
| | |/ / / / / / / / | |/| | | | | | | | | |||||
* / | | | | | | | | | [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 | Phil Davis | 2015-10-27 | 1 | -4/+3 |
| | |_|_|/ / / / | |/| | | | | | | |||||
* | | | | | | | | Merge pull request #17104 from owncloud/chunked-upload-locking | Robin Appelman | 2015-10-27 | 4 | -13/+104 |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | |||||
| * | | | | | | | 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 |