aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2016-03-2114-4/+88
* [tx-robot] updated from transifexJenkins for ownCloud2016-03-2020-12/+62
* [tx-robot] updated from transifexJenkins for ownCloud2016-03-1914-4/+64
* [tx-robot] updated from transifexJenkins for ownCloud2016-03-1812-8/+56
* Merge pull request #23272 from owncloud/dropbox-downloadnotthefullfileinmemoryThomas Müller2016-03-172-7/+29
|\
| * Fix dropbox storage to not store the whole file in memoryVincent Petry2016-03-152-7/+29
* | Merge pull request #23282 from owncloud/fix-caching-unavailable-ldapThomas Müller2016-03-172-3/+89
|\ \
| * | fix writing to cache when fallback server should be used immediatelyArthur Schiwon2016-03-162-3/+89
* | | Merge pull request #23346 from owncloud/fix_23325Thomas Müller2016-03-171-0/+5
|\ \ \
| * | | Set proper public webdav permissions when public upload disabledRoeland Jago Douma2016-03-171-0/+5
* | | | Merge pull request #23370 from owncloud/fix-username-changeThomas Müller2016-03-171-1/+4
|\ \ \ \
| * | | | Update avatar on username change if avatar is setMorris Jobke2016-03-171-1/+4
* | | | | Merge pull request #23371 from owncloud/paurisa-Fixed_21588Thomas Müller2016-03-1723-1/+1487
|\ \ \ \ \
| * | | | | Rating icons changed to .svgPau2016-03-1723-1/+1487
| |/ / / /
* | | | | Merge pull request #23255 from owncloud/update-sabre3.0.8-fseekThomas Müller2016-03-171-0/+0
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Update 3rdparty commit for sabre update 3.0.8Vincent Petry2016-03-161-0/+0
* | | | | Merge pull request #23287 from owncloud/issue-22786-absolute-pathsThomas Müller2016-03-171-2/+2
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Make sure to append the web root as per docJoas Schilling2016-03-161-2/+2
* | | | | Merge pull request #23334 from owncloud/ext-user-mounting-guiThomas Müller2016-03-176-5/+14
|\ \ \ \ \
| * | | | | Display external storage GUI even if user mounting disabledRobin McCorkell2016-03-166-5/+14
* | | | | | Merge pull request #23303 from owncloud/exclude-only-specific-third-partyThomas Müller2016-03-171-1/+1
|\ \ \ \ \ \
| * | | | | | Exclude only known failing third-party filesLukas Reschke2016-03-161-1/+1
| | |_|_|/ / | |/| | | |
* | | | | | Merge pull request #23326 from owncloud/manishbisht-combined-database-errorsThomas Müller2016-03-172-6/+8
|\ \ \ \ \ \
| * | | | | | Update oci.phpManish Bisht2016-03-162-6/+8
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #23336 from owncloud/occ-typosThomas Müller2016-03-174-4/+4
|\ \ \ \ \ \
| * | | | | | Some typo corrections in occ command outputCarla Schroder2016-03-164-4/+4
* | | | | | | Merge pull request #23340 from owncloud/dont-try-to-test-syntax-as-dav-testThomas Müller2016-03-171-4/+4
|\ \ \ \ \ \ \
| * | | | | | | Don't try to execute a dav syntax testJoas Schilling2016-03-171-4/+4
|/ / / / / / /
* / / / / / / [tx-robot] updated from transifexJenkins for ownCloud2016-03-172-0/+6
|/ / / / / /
* | | | | | Merge pull request #23192 from owncloud/make-ancient-users-happy-with-totally...Thomas Müller2016-03-161-0/+7
|\ \ \ \ \ \
| * | | | | | Fallback for crappy ancient distributionsLukas Reschke2016-03-121-0/+7
* | | | | | | Merge pull request #23258 from owncloud/sharee-testsThomas Müller2016-03-167-219/+299
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Split the context so we don't reset the config on each testJoas Schilling2016-03-154-57/+82
| * | | | | | Add tests for user enumeration and sharing in group onlyJoas Schilling2016-03-152-45/+103
| * | | | | | Always use the admin when putting poeple in a groupJoas Schilling2016-03-151-4/+5
| * | | | | | Make the app config code ready for reuseJoas Schilling2016-03-152-78/+104
| * | | | | | Deduplicate the existing backgroundJoas Schilling2016-03-141-44/+14
* | | | | | | Merge pull request #23253 from owncloud/give-swift-more-timeThomas Müller2016-03-161-2/+3
|\ \ \ \ \ \ \
| * | | | | | | Give swift 15 seconds after startupMorris Jobke2016-03-161-2/+3
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge pull request #23082 from owncloud/contacts_calendar_name_colorThomas Müller2016-03-161-0/+5
|\ \ \ \ \ \ \
| * | | | | | | add title and color to birthday calendarGeorg Ehrke2016-03-101-0/+5
* | | | | | | | Merge pull request #23300 from owncloud/smb-not-availableThomas Müller2016-03-161-14/+40
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | handle connection errors as storage not available in smbRobin Appelman2016-03-161-14/+40
* | | | | | | | Merge pull request #23108 from owncloud/set-encrypted-version-at-least-to-1Thomas Müller2016-03-162-1/+54
|\ \ \ \ \ \ \ \
| * | | | | | | | Ensure that stored version is at least 1 for cross-storage copyLukas Reschke2016-03-162-1/+54
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge pull request #22994 from owncloud/check-syntax-on-travisThomas Müller2016-03-162-0/+13
|\ \ \ \ \ \ \ \
| * | | | | | | | Execute PHP Parallel Linter on TravisLukas Reschke2016-03-162-0/+13
| |/ / / / / / /
* | | | | | | | Merge pull request #23189 from owncloud/require-at-least-libxml-2-7-0Thomas Müller2016-03-161-0/+8
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Require at least libxml 2.7.0Lukas Reschke2016-03-121-0/+8
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge pull request #23155 from owncloud/fed-unshare-withThomas Müller2016-03-162-1/+33
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |