Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-09-30 | 4 | -0/+8 |
* | Merge pull request #19355 from owncloud/cache_result_of_checkUpgrade | Thomas Müller | 2015-09-29 | 3 | -7/+12 |
|\ | |||||
| * | cache result of \OCP\Util::needUpgrade() | Individual IT Services | 2015-09-29 | 3 | -7/+12 |
* | | Merge pull request #19437 from owncloud/sabredav-2.1.7 | Thomas Müller | 2015-09-29 | 1 | -0/+0 |
|\ \ | |||||
| * | | Update sabre/dav to 2.1.7 | Thomas Müller | 2015-09-29 | 1 | -0/+0 |
* | | | Merge pull request #19441 from owncloud/debug-log-mode-during-upgrade | Thomas Müller | 2015-09-29 | 3 | -0/+28 |
|\ \ \ | |_|/ |/| | | |||||
| * | | [upgrade] switch to debug logging on upgrade | Morris Jobke | 2015-09-29 | 3 | -0/+28 |
| |/ | |||||
* | | Merge pull request #19440 from owncloud/allow-blob-for-images-per-default | Thomas Müller | 2015-09-29 | 6 | -57/+58 |
|\ \ | |||||
| * | | Add blob: scheme to default CSP policy | Lukas Reschke | 2015-09-29 | 6 | -57/+58 |
* | | | Merge pull request #19365 from owncloud/files-detailsbar-interaction | Thomas Müller | 2015-09-29 | 3 | -37/+79 |
|\ \ \ | |/ / |/| | | |||||
| * | | Fix sidebar interaction | Vincent Petry | 2015-09-28 | 3 | -37/+79 |
* | | | Merge pull request #18105 from owncloud/ocs-api-integration-tests | Thomas Müller | 2015-09-29 | 7 | -0/+229 |
|\ \ \ | |_|/ |/| | | |||||
| * | | Support different server ports - defined by EXECUTOR_NUMBER | Thomas Müller | 2015-09-29 | 3 | -8/+14 |
| * | | added delete user test | Sergio Bertolin | 2015-09-29 | 1 | -0/+8 |
| * | | Use ci profile | Thomas Müller | 2015-09-29 | 1 | -1/+1 |
| * | | Use fixed port for now | Thomas Müller | 2015-09-29 | 1 | -5/+6 |
| * | | Test user creation | Thomas Müller | 2015-09-29 | 2 | -45/+110 |
| * | | require autoload.php | Thomas Müller | 2015-09-29 | 1 | -6/+1 |
| * | | Adding phpunit for the assertions | Thomas Müller | 2015-09-29 | 1 | -0/+1 |
| * | | Adding missing files | Thomas Müller | 2015-09-29 | 2 | -0/+94 |
| * | | First integration tests for provisioning api | Thomas Müller | 2015-09-29 | 5 | -0/+59 |
* | | | Merge pull request #19424 from owncloud/use-jsqueeze | Thomas Müller | 2015-09-29 | 3 | -60/+3 |
|\ \ \ | |/ / |/| | | |||||
| * | | Update 3rdparty submodule | Thomas Müller | 2015-09-29 | 1 | -0/+0 |
| * | | User upstream class SeparatorFilter | Thomas Müller | 2015-09-28 | 2 | -58/+1 |
| * | | Suer JSqueezeFilter instead of JSMinFilter | Thomas Müller | 2015-09-28 | 1 | -2/+2 |
* | | | Merge pull request #17601 from owncloud/publicwebdav-allowajaxwhendisabled | Thomas Müller | 2015-09-29 | 1 | -1/+2 |
|\ \ \ | |||||
| * | | | Allow ajax requests on public webdav interface | Vincent Petry | 2015-09-22 | 1 | -1/+2 |
* | | | | Merge pull request #19418 from owncloud/fix-parsehashquery | Thomas Müller | 2015-09-29 | 1 | -3/+1 |
|\ \ \ \ | |||||
| * | | | | Consider both hash params and query when parsing URL | Vincent Petry | 2015-09-28 | 1 | -3/+1 |
| | |_|/ | |/| | | |||||
* | | | | Merge pull request #19367 from owncloud/lock-transaction-no-log | Thomas Müller | 2015-09-29 | 1 | -4/+0 |
|\ \ \ \ | |||||
| * | | | | remove warning when trying to get a lock while in transaction | Robin Appelman | 2015-09-25 | 1 | -4/+0 |
* | | | | | Merge pull request #19411 from owncloud/files-sidebar-shareloadspinner | Thomas Müller | 2015-09-29 | 2 | -5/+28 |
|\ \ \ \ \ | |||||
| * | | | | | Show loading spinner for first fetch of shares | Vincent Petry | 2015-09-28 | 2 | -5/+28 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge pull request #19417 from owncloud/files-upload-checkconflictbeforeupload | Thomas Müller | 2015-09-29 | 2 | -22/+64 |
|\ \ \ \ \ | |||||
| * | | | | | Show conflict dialog before upload when possible | Vincent Petry | 2015-09-28 | 2 | -22/+64 |
| |/ / / / | |||||
* | | | | | Merge pull request #19409 from owncloud/files-sidebar-hiding-tabs | Thomas Müller | 2015-09-29 | 4 | -18/+136 |
|\ \ \ \ \ | |||||
| * | | | | | Hide sidebar tab headers conditionally | Vincent Petry | 2015-09-28 | 4 | -18/+136 |
| |/ / / / | |||||
* | | | | | Merge pull request #19426 from owncloud/fix-legacy-CSP-for-images | Thomas Müller | 2015-09-29 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | Fix CSP for images for legacy apps | Olivier Paroz | 2015-09-28 | 1 | -1/+1 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge pull request #19431 from phil-davis/r2 | Lukas Reschke | 2015-09-29 | 3 | -3/+3 |
|\ \ \ \ \ | |||||
| * | | | | | Session closed exception wording | Phil Davis | 2015-09-29 | 3 | -3/+3 |
|/ / / / / | |||||
* / / / / | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-09-29 | 18 | -4/+32 |
|/ / / / | |||||
* | | | | Merge pull request #19408 from owncloud/fix-trashbin-checkbox | Robin Appelman | 2015-09-28 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | fix checkbox in trashbin | Hendrik Leppelsack | 2015-09-28 | 1 | -1/+1 |
* | | | | | Merge pull request #19413 from owncloud/share-nopermission-link | Vincent Petry | 2015-09-28 | 2 | -30/+13 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | Still show share link when recipient but no share permission | Vincent Petry | 2015-09-28 | 2 | -30/+13 |
|/ / / / | |||||
* | | | | Merge pull request #18548 from owncloud/repair-mimetype-limitversion | Thomas Müller | 2015-09-28 | 3 | -25/+54 |
|\ \ \ \ | |||||
| * | | | | Repair mime types only when upgrading from OC 8.0 | Vincent Petry | 2015-09-23 | 3 | -25/+54 |
* | | | | | Merge pull request #19404 from owncloud/files-sidebar-sorttabs | Thomas Müller | 2015-09-28 | 6 | -3/+31 |
|\ \ \ \ \ | |||||
| * | | | | | Fix tabs order in files sidebar | Vincent Petry | 2015-09-28 | 6 | -3/+31 |