Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Revert "Show cached previews directly" | Robin Appelman | 2015-09-22 | 1 | -6/+0 |
* | Merge pull request #19231 from phil-davis/r1 | Thomas Müller | 2015-09-21 | 5 | -7/+7 |
|\ | |||||
| * | Minor text typos | Phil Davis | 2015-09-21 | 5 | -7/+7 |
* | | Merge pull request #19229 from owncloud/webdavauth-in-user-external | Thomas Müller | 2015-09-21 | 156 | -1279/+0 |
|\ \ | |||||
| * | | Move WebDAVAuth to User_External | Thomas Müller | 2015-09-21 | 156 | -1279/+0 |
|/ / | |||||
* | | Merge pull request #19223 from owncloud/improve_description_decrypt_encrypt_all | Björn Schießle | 2015-09-21 | 3 | -3/+5 |
|\ \ | |||||
| * | | fix small typo | Bjoern Schiessle | 2015-09-21 | 1 | -1/+1 |
| * | | improve description and help output for the encrypt-all and decrypt-all command | Bjoern Schiessle | 2015-09-21 | 2 | -2/+4 |
|/ / | |||||
* | | Merge pull request #18934 from owncloud/bump-3rdparty | Thomas Müller | 2015-09-21 | 1 | -0/+0 |
|\ \ | |||||
| * | | Bump 3rdparty reference | Lukas Reschke | 2015-09-21 | 1 | -0/+0 |
| |/ | |||||
* | | Merge pull request #19215 from owncloud/fix_trashbin_previews | Thomas Müller | 2015-09-21 | 1 | -0/+4 |
|\ \ | |||||
| * | | make sure to add the correct file size to the file info, otherwise we will no... | Bjoern Schiessle | 2015-09-21 | 1 | -0/+4 |
* | | | Merge pull request #18481 from owncloud/fix-apache-login-master | Thomas Müller | 2015-09-21 | 1 | -4/+6 |
|\ \ \ | |||||
| * | | | Repeated calls to loginWithApache() should not not try to set user informatio... | Thomas Müller | 2015-09-21 | 1 | -4/+6 |
| |/ / | |||||
* | | | Merge pull request #18709 from owncloud/cleanup-login-semantics | Thomas Müller | 2015-09-21 | 2 | -5/+4 |
|\ \ \ | |||||
| * | | | Squashing all commits in one, remove typos. | Raghu Nayyar | 2015-09-12 | 2 | -5/+4 |
* | | | | Merge pull request #19221 from owncloud/improved_error_messages | Thomas Müller | 2015-09-21 | 2 | -0/+20 |
|\ \ \ \ | |||||
| * | | | | improved error message if user doesn't exists | Bjoern Schiessle | 2015-09-21 | 2 | -0/+20 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #17347 from owncloud/dav-fopen-overwrite | Robin Appelman | 2015-09-21 | 1 | -2/+7 |
|\ \ \ \ | |||||
| * | | | | dont download the existing file for webdav if we're going to overwrite it | Robin Appelman | 2015-09-21 | 1 | -2/+7 |
* | | | | | Merge pull request #19081 from owncloud/prevent0bytedownloads | Robin Appelman | 2015-09-21 | 2 | -2/+22 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | add unit test | Robin Appelman | 2015-09-17 | 1 | -0/+17 |
| * | | | | prevent 0 byte downloads when storage returns false | Jörn Friedrich Dreyer | 2015-09-17 | 1 | -2/+5 |
* | | | | | Merge pull request #19189 from owncloud/fix-19135 | Hendrik Leppelsack | 2015-09-21 | 3 | -4/+15 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | fix missing checkboxes in file comparator | Hendrik Leppelsack | 2015-09-21 | 3 | -4/+15 |
|/ / / / | |||||
* | | | | Merge pull request #19122 from owncloud/discardexpirationdatefornonlinkshares | Thomas Müller | 2015-09-21 | 1 | -0/+5 |
|\ \ \ \ | |||||
| * | | | | Discard expiration date from result for non-link shares | Vincent Petry | 2015-09-17 | 1 | -0/+5 |
| |/ / / | |||||
* | | | | Merge pull request #19176 from owncloud/fix-19118 | Thomas Müller | 2015-09-21 | 2 | -11/+12 |
|\ \ \ \ | |_|_|/ |/| | | | |||||
| * | | | fix checkboxes in files_external | Hendrik Leppelsack | 2015-09-19 | 2 | -11/+12 |
* | | | | Merge pull request #19197 from radarhere/patch-1 | Thomas Müller | 2015-09-21 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | Fixed typo | Andrew Murray | 2015-09-21 | 1 | -1/+1 |
* | | | | | Merge pull request #19183 from owncloud/oparoz-sharejs-typo | Thomas Müller | 2015-09-21 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | Typo | Olivier Paroz | 2015-09-19 | 1 | -1/+1 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge pull request #19148 from owncloud/issue-19113-stop-setting-single-user-... | Thomas Müller | 2015-09-21 | 4 | -10/+43 |
|\ \ \ \ \ | |||||
| * | | | | | Also catch exceptions on encryptAll and reset trashbin and singleUser mode | Joas Schilling | 2015-09-18 | 1 | -2/+7 |
| * | | | | | Do not set single user in constructor | Joas Schilling | 2015-09-18 | 4 | -8/+36 |
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-09-21 | 6 | -8/+8 |
| |_|/ / / |/| | | | | |||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-09-20 | 18 | -0/+46 |
| |/ / / |/| | | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-09-19 | 4 | -0/+6 |
* | | | | 8.2 beta1v8.2beta1 | C Montero-Luque | 2015-09-18 | 1 | -2/+2 |
* | | | | Merge pull request #19008 from owncloud/jquery_avatar_tests | Thomas Müller | 2015-09-18 | 2 | -1/+241 |
|\ \ \ \ | |||||
| * | | | | Added js tests for jquery.avatar | Roeland Jago Douma | 2015-09-14 | 2 | -1/+241 |
* | | | | | Merge pull request #19028 from owncloud/McNetic-zipstreamer-0.7 | Thomas Müller | 2015-09-18 | 2 | -4/+1 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'zipstreamer-0.7' of https://github.com/McNetic/owncloud_core in... | Thomas Müller | 2015-09-18 | 2 | -4/+1 |
| |\ \ \ \ \ | |||||
| | * | | | | | adapted to changed subproject commit | Nicolai Ehemann | 2015-09-18 | 1 | -0/+0 |
| | * | | | | | use zipstreamer via composer | Nicolai Ehemann | 2015-09-14 | 2 | -3/+0 |
| | * | | | | | lib/private/files.php: adapted to minimally changed ZipStreamer API | Nicolai Ehemann | 2015-09-14 | 2 | -2/+2 |
* | | | | | | | Merge pull request #19098 from owncloud/db-lock-no-transaction | Thomas Müller | 2015-09-18 | 3 | -17/+90 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | improve doc | Robin Appelman | 2015-09-17 | 1 | -1/+1 |
| * | | | | | | | expire old lock rows | Robin Appelman | 2015-09-17 | 3 | -13/+101 |