summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Bump docker containers usedRoeland Jago Douma2018-01-241-26/+26
* Fix "Undefined method setExpectedException()"Joas Schilling2018-01-2419-58/+50
* Require PHPUnit 6.5 or higherJoas Schilling2018-01-247-65/+19
* Merge pull request #7902 from nextcloud/fix_7700Morris Jobke2018-01-244-16/+89
|\
| * Make filelist and sidebar use the fileid preview endpointRoeland Jago Douma2018-01-242-1/+13
| * Add preview endpoint for the fileidRoeland Jago Douma2018-01-242-15/+76
* | Merge pull request #7980 from nextcloud/3rdparty_pimpleJulius Härtl2018-01-241-0/+0
|\ \ | |/ |/|
| * [3rdparty] Bump pimpe to 3.2.3Roeland Jago Douma2018-01-231-0/+0
* | Merge pull request #7917 from nextcloud/warn_old_ocs_route_consMorris Jobke2018-01-241-0/+4
|\ \
| * | Warn about the old OCP\API::register construct for OCSRoeland Jago Douma2018-01-171-0/+4
* | | [tx-robot] updated from transifexNextcloud bot2018-01-24112-116/+122
* | | Merge pull request #7918 from nextcloud/properly-log-exceptionsRoeland Jago Douma2018-01-2337-149/+321
|\ \ \
| * | | Properly log the full exception instead of only the messageMorris Jobke2018-01-2337-149/+321
* | | | Merge pull request #7971 from nextcloud/comradekingu-patch-1Morris Jobke2018-01-232-2/+2
|\ \ \ \
| * | | | There was an error loading → Could not loadAllan Nordhøy2018-01-201-1/+1
| * | | | There was an error loading → could not loadAllan Nordhøy2018-01-201-1/+1
* | | | | Merge pull request #7858 from nextcloud/fix-local-storageMorris Jobke2018-01-233-7/+15
|\ \ \ \ \
| * | | | | Use fallback path if data dir is not available for Storage/Local.phpMorris Jobke2018-01-183-7/+15
* | | | | | Merge pull request #7989 from nextcloud/cleanup-unused-share-methodsMorris Jobke2018-01-231-107/+0
|\ \ \ \ \ \
| * | | | | | Remove not used methods of legacy share.phpMorris Jobke2018-01-221-107/+0
| | |_|_|_|/ | |/| | | |
* | | | | | [tx-robot] updated from transifexNextcloud bot2018-01-2310-2/+78
* | | | | | Merge pull request #7354 from nextcloud/refacor-update-page-printblizzz2018-01-224-35/+24
|\ \ \ \ \ \
| * | | | | | Reuse systemconfigMorris Jobke2017-11-301-6/+5
| * | | | | | Refactor method to check if update is neededMorris Jobke2017-11-304-30/+20
* | | | | | | Merge pull request #7985 from nextcloud/remove-public-videoRoeland Jago Douma2018-01-222-13/+2
|\ \ \ \ \ \ \
| * | | | | | | Remove video preview from files_sharingJulius Härtl2018-01-222-13/+2
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #7988 from nextcloud/cleanup-old-repair-stepsRoeland Jago Douma2018-01-2215-1444/+0
|\ \ \ \ \ \ \
| * | | | | | | Remove old repair steps that aren't executed anymoreMorris Jobke2018-01-2215-1444/+0
| |/ / / / / /
* | | | | | | Merge pull request #7994 from nextcloud/smb-notify-test-timeoutRoeland Jago Douma2018-01-221-2/+2
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | increase the time we wait for smb notifications in the testRobin Appelman2018-01-221-2/+2
* | | | | | | Merge pull request #7986 from nextcloud/fix_7749Morris Jobke2018-01-221-3/+13
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | If the preview is size 0 it is invalidRoeland Jago Douma2018-01-221-3/+13
|/ / / / / /
* | | | | | Merge pull request #7975 from nextcloud/3rdparty_rm_polyfillRoeland Jago Douma2018-01-221-0/+0
|\ \ \ \ \ \
| * | | | | | [3rdparty] Remove polyfill-php70Roeland Jago Douma2018-01-211-0/+0
* | | | | | | [tx-robot] updated from transifexNextcloud bot2018-01-222-0/+2
* | | | | | | [tx-robot] updated from transifexNextcloud bot2018-01-21148-144/+178
|/ / / / / /
* | | | | | Merge pull request #7956 from nextcloud/remove-vendor-detectionRoeland Jago Douma2018-01-201-10/+2
|\ \ \ \ \ \
| * | | | | | Disable vendor detection when upgrading from 11.0.xMorris Jobke2018-01-201-10/+2
|/ / / / / /
* | | | | | Merge pull request #7955 from nextcloud/remove-app-disable-upgradeJulius Härtl2018-01-205-57/+1
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Remove not needed 3rdparty app disabling during upgrade for PHP 5.xMorris Jobke2018-01-195-57/+1
* | | | | | [tx-robot] updated from transifexNextcloud bot2018-01-202-0/+4
* | | | | | Merge pull request #7961 from nextcloud/smb-2.0.4Roeland Jago Douma2018-01-1911-77/+98
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | update icewind/smb to 2.0.4Robin Appelman2018-01-1911-77/+98
| | |_|_|/ | |/| | |
* | | | | Merge pull request #7953 from nextcloud/theming-background-highresMorris Jobke2018-01-191-6/+4
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Theming: adjust background image resizingJulius Härtl2018-01-191-6/+4
|/ / / /
* | | | [tx-robot] updated from transifexNextcloud bot2018-01-19108-106/+108
* | | | Merge pull request #7941 from nextcloud/fix-7934Roeland Jago Douma2018-01-181-3/+0
|\ \ \ \
| * | | | remove hardcoded sharepoint icon pathArthur Schiwon2018-01-181-3/+0
* | | | | Merge pull request #7939 from nextcloud/do-not-show-non-installed-warning-on-...Morris Jobke2018-01-181-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Do not show "Not installed warning" during occ installMorris Jobke2018-01-181-1/+1
|/ / / /