summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #7553 from nextcloud/scssphp-0.7.2Roeland Jago Douma2017-12-181-0/+0
|\
| * Upgrade leafo/scssphp to 0.7.2Morris Jobke2017-12-181-0/+0
* | Merge pull request #7554 from nextcloud/fix-7546Morris Jobke2017-12-181-2/+2
|\ \
| * | Fix default parameter of OC_DB::executeAudited()Morris Jobke2017-12-181-2/+2
| |/
* | Merge pull request #7555 from nextcloud/smb-copy-rename-logRobin Appelman2017-12-182-0/+5
|\ \
| * | additional debug logging on smb copy/rename failuresRobin Appelman2017-12-182-0/+5
* | | Merge pull request #7490 from nextcloud/fix_7428Morris Jobke2017-12-182-2/+167
|\ \ \
| * | | Fix and tests for MailPluginTobia De Koninck2017-12-161-1/+138
| * | | Don't show users which e-mail address match if they belong to a group we may ...Tobia De Koninck2017-12-151-1/+29
| | |/ | |/|
* | | Merge pull request #7505 from nextcloud/do-not-update-if-app-comes-from-gitMorris Jobke2017-12-181-0/+20
|\ \ \ | |/ / |/| |
| * | Up checkJohn Molakvoæ (skjnldsv)2017-12-141-4/+4
| * | Do not update apps if it comes from gitJohn Molakvoæ (skjnldsv)2017-12-141-0/+20
* | | Merge pull request #7527 from nextcloud/fix-drag-shadow-not-visible-when-drag...Morris Jobke2017-12-153-1/+6
|\ \ \
| * | | Fix drag shadow not visible when dragging a file on a narrow screenDaniel Calviño Sánchez2017-12-143-1/+6
* | | | Merge pull request #7523 from nextcloud/check_empty_content_lengthMorris Jobke2017-12-151-0/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | Also check for empty content lenthRoeland Jago Douma2017-12-141-0/+1
|/ / /
* | | Merge pull request #7504 from nextcloud/shorter-css-prefixesMorris Jobke2017-12-142-7/+7
|\ \ \
| * | | Test fixes 2John Molakvoæ (skjnldsv)2017-12-141-3/+3
| * | | Test fixesJohn Molakvoæ (skjnldsv)2017-12-141-2/+2
| * | | Reduce length of md5 in scss cachingJohn Molakvoæ (skjnldsv)2017-12-141-2/+2
|/ / /
* | | Merge pull request #7506 from nextcloud/fix-app-cacheMorris Jobke2017-12-142-2/+3
|\ \ \
| * | | Use cached app listMorris Jobke2017-12-142-2/+3
| | |/ | |/|
* | | Merge pull request #7502 from nextcloud/authorative_classmaps_for_appsRoeland Jago Douma2017-12-1438-209/+38
|\ \ \ | |/ / |/| |
| * | Use proper authorative-autoloader for app autoloadersRoeland Jago Douma2017-12-1438-209/+38
|/ /
* | Merge pull request #7485 from nextcloud/fix_7001Roeland Jago Douma2017-12-142-3/+2
|\ \
| * | Also cache invalid DiscoveryService responseRoeland Jago Douma2017-12-132-3/+2
| |/
* | Merge pull request #7480 from nextcloud/fix_7454Morris Jobke2017-12-134-10/+73
|\ \
| * | Add testsRoeland Jago Douma2017-12-132-10/+55
| * | Add warning regarding freetype supportRoeland Jago Douma2017-12-132-0/+18
| |/
* | Merge pull request #7475 from nextcloud/13beta3v13.0.0beta3Morris Jobke2017-12-131-2/+2
|\ \
| * | 13.0.0 beta3Morris Jobke2017-12-131-2/+2
|/ /
* | Merge pull request #7479 from nextcloud/fix-7400Morris Jobke2017-12-131-5/+7
|\ \
| * | Fixes hex2bin() in LDAPMorris Jobke2017-12-131-5/+7
|/ /
* | Merge pull request #7476 from nextcloud/fix-copy-share-link-designJohn Molakvoæ2017-12-131-2/+0
|\ \
| * | Show tha copy share link button properly inlineMorris Jobke2017-12-131-2/+0
|/ /
* | Merge pull request #7470 from nextcloud/guest-flex-fixRoeland Jago Douma2017-12-122-4/+2
|\ \
| * | Removed unwanted and unused spacerJohn Molakvoæ (skjnldsv)2017-12-122-3/+1
| * | Fixed firefox guest header heightJohn Molakvoæ (skjnldsv)2017-12-121-1/+1
* | | Merge pull request #7472 from nextcloud/move-comment-user-displaynameresolver...Roeland Jago Douma2017-12-122-12/+15
|\ \ \ | |_|/ |/| |
| * | The user displayNameResolver is specific to users, not the comments appArthur Schiwon2017-12-122-12/+15
|/ /
* | Merge pull request #7466 from nextcloud/fix-php7.2-session-initMorris Jobke2017-12-121-3/+4
|\ \ | |/ |/|
| * Fix error log on PHP 7.2Morris Jobke2017-12-121-3/+4
* | Merge pull request #7465 from nextcloud/filename-typoMorris Jobke2017-12-123-2/+2
|\ \
| * | Fix filename typoRobin Appelman2017-12-123-2/+2
| |/
* | Merge pull request #7462 from nextcloud/update-user-agent-regexBjörn Schießle2017-12-123-4/+18
|\ \ | |/ |/|
| * fix dav unit testsBjoern Schiessle2017-12-121-3/+3
| * allow 'Nextcloud' in the user agent string of AndroidBjoern Schiessle2017-12-122-1/+15
* | Merge pull request #7425 from nextcloud/13.0.0beta2-prepv13.0.0beta2Morris Jobke2017-12-121-2/+2
|\ \
| * | 13.0.0 beta 2Morris Jobke2017-12-121-2/+2
| |/
* | Merge pull request #7461 from nextcloud/fix_6821Morris Jobke2017-12-121-2/+2
|\ \ | |/ |/|