summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Revert "Show cached previews directly"Robin Appelman2015-09-221-6/+0
* Merge pull request #19231 from phil-davis/r1Thomas Müller2015-09-215-7/+7
|\
| * Minor text typosPhil Davis2015-09-215-7/+7
* | Merge pull request #19229 from owncloud/webdavauth-in-user-externalThomas Müller2015-09-21156-1279/+0
|\ \
| * | Move WebDAVAuth to User_ExternalThomas Müller2015-09-21156-1279/+0
|/ /
* | Merge pull request #19223 from owncloud/improve_description_decrypt_encrypt_allBjörn Schießle2015-09-213-3/+5
|\ \
| * | fix small typoBjoern Schiessle2015-09-211-1/+1
| * | improve description and help output for the encrypt-all and decrypt-all commandBjoern Schiessle2015-09-212-2/+4
|/ /
* | Merge pull request #18934 from owncloud/bump-3rdpartyThomas Müller2015-09-211-0/+0
|\ \
| * | Bump 3rdparty referenceLukas Reschke2015-09-211-0/+0
| |/
* | Merge pull request #19215 from owncloud/fix_trashbin_previewsThomas Müller2015-09-211-0/+4
|\ \
| * | make sure to add the correct file size to the file info, otherwise we will no...Bjoern Schiessle2015-09-211-0/+4
* | | Merge pull request #18481 from owncloud/fix-apache-login-masterThomas Müller2015-09-211-4/+6
|\ \ \
| * | | Repeated calls to loginWithApache() should not not try to set user informatio...Thomas Müller2015-09-211-4/+6
| |/ /
* | | Merge pull request #18709 from owncloud/cleanup-login-semanticsThomas Müller2015-09-212-5/+4
|\ \ \
| * | | Squashing all commits in one, remove typos.Raghu Nayyar2015-09-122-5/+4
* | | | Merge pull request #19221 from owncloud/improved_error_messagesThomas Müller2015-09-212-0/+20
|\ \ \ \
| * | | | improved error message if user doesn't existsBjoern Schiessle2015-09-212-0/+20
| | |/ / | |/| |
* | | | Merge pull request #17347 from owncloud/dav-fopen-overwriteRobin Appelman2015-09-211-2/+7
|\ \ \ \
| * | | | dont download the existing file for webdav if we're going to overwrite itRobin Appelman2015-09-211-2/+7
* | | | | Merge pull request #19081 from owncloud/prevent0bytedownloadsRobin Appelman2015-09-212-2/+22
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | add unit testRobin Appelman2015-09-171-0/+17
| * | | | prevent 0 byte downloads when storage returns falseJörn Friedrich Dreyer2015-09-171-2/+5
* | | | | Merge pull request #19189 from owncloud/fix-19135Hendrik Leppelsack2015-09-213-4/+15
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | fix missing checkboxes in file comparatorHendrik Leppelsack2015-09-213-4/+15
|/ / / /
* | | | Merge pull request #19122 from owncloud/discardexpirationdatefornonlinksharesThomas Müller2015-09-211-0/+5
|\ \ \ \
| * | | | Discard expiration date from result for non-link sharesVincent Petry2015-09-171-0/+5
| |/ / /
* | | | Merge pull request #19176 from owncloud/fix-19118Thomas Müller2015-09-212-11/+12
|\ \ \ \ | |_|_|/ |/| | |
| * | | fix checkboxes in files_externalHendrik Leppelsack2015-09-192-11/+12
* | | | Merge pull request #19197 from radarhere/patch-1Thomas Müller2015-09-211-1/+1
|\ \ \ \
| * | | | Fixed typoAndrew Murray2015-09-211-1/+1
* | | | | Merge pull request #19183 from owncloud/oparoz-sharejs-typoThomas Müller2015-09-211-1/+1
|\ \ \ \ \
| * | | | | TypoOlivier Paroz2015-09-191-1/+1
| | |/ / / | |/| | |
* | | | | Merge pull request #19148 from owncloud/issue-19113-stop-setting-single-user-...Thomas Müller2015-09-214-10/+43
|\ \ \ \ \
| * | | | | Also catch exceptions on encryptAll and reset trashbin and singleUser modeJoas Schilling2015-09-181-2/+7
| * | | | | Do not set single user in constructorJoas Schilling2015-09-184-8/+36
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-09-216-8/+8
| |_|/ / / |/| | | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-09-2018-0/+46
| |/ / / |/| | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-09-194-0/+6
* | | | 8.2 beta1v8.2beta1C Montero-Luque2015-09-181-2/+2
* | | | Merge pull request #19008 from owncloud/jquery_avatar_testsThomas Müller2015-09-182-1/+241
|\ \ \ \
| * | | | Added js tests for jquery.avatarRoeland Jago Douma2015-09-142-1/+241
* | | | | Merge pull request #19028 from owncloud/McNetic-zipstreamer-0.7Thomas Müller2015-09-182-4/+1
|\ \ \ \ \
| * \ \ \ \ Merge branch 'zipstreamer-0.7' of https://github.com/McNetic/owncloud_core in...Thomas Müller2015-09-182-4/+1
| |\ \ \ \ \
| | * | | | | adapted to changed subproject commitNicolai Ehemann2015-09-181-0/+0
| | * | | | | use zipstreamer via composerNicolai Ehemann2015-09-142-3/+0
| | * | | | | lib/private/files.php: adapted to minimally changed ZipStreamer APINicolai Ehemann2015-09-142-2/+2
* | | | | | | Merge pull request #19098 from owncloud/db-lock-no-transactionThomas Müller2015-09-183-17/+90
|\ \ \ \ \ \ \
| * | | | | | | improve docRobin Appelman2015-09-171-1/+1
| * | | | | | | expire old lock rowsRobin Appelman2015-09-173-13/+101