summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Remove generated avatar on displayname changeRoeland Jago Douma2017-12-193-1/+38
* Since we now always generate an avatar do not load the placeholderRoeland Jago Douma2017-12-191-5/+0
* Merge pull request #7576 from nextcloud/fix_7574blizzz2017-12-191-0/+1
|\
| * Use javascript to send the actual password resetRoeland Jago Douma2017-12-191-0/+1
* | Merge pull request #7566 from nextcloud/fix-opening-the-menu-in-a-share-pageRoeland Jago Douma2017-12-193-1/+99
|\ \ | |/ |/|
| * Fix opening the menu in a Share pageDaniel Calviño Sánchez2017-12-191-1/+4
| * Add acceptance test for opening the menu in a public shared linkDaniel Calviño Sánchez2017-12-192-0/+95
* | Merge pull request #7562 from nextcloud/fix-wrongly-cached-resultRoeland Jago Douma2017-12-192-4/+53
|\ \ | |/ |/|
| * Cache final result of update checkMorris Jobke2017-12-182-4/+53
* | Merge pull request #7556 from nextcloud/smb-stat-exceptionMorris Jobke2017-12-181-5/+7
|\ \
| * | handle exceptions in SMB::statRobin Appelman2017-12-181-5/+7
* | | Merge pull request #7517 from nextcloud/add-index-to-share-tableRoeland Jago Douma2017-12-185-0/+95
|\ \ \
| * | | update autoloaderBjoern Schiessle2017-12-182-0/+2
| * | | make occ command more genericBjoern Schiessle2017-12-182-8/+26
| * | | add index for share_with table for newly created tablesBjoern Schiessle2017-12-181-0/+1
| * | | add occ command to add a index to share_with at the share tableBjoern Schiessle2017-12-182-0/+74
* | | | Merge pull request #7531 from nextcloud/ldap/createdistributedRoeland Jago Douma2017-12-1820-23/+23
|\ \ \ \
| * | | | Fix testsRoeland Jago Douma2017-12-185-5/+5
| * | | | Also replace all other occurencesMorris Jobke2017-12-1814-17/+17
| * | | | don't use deprecated method for requesting memcacheArthur Schiwon2017-12-181-1/+1
* | | | | Merge pull request #7560 from nextcloud/fix_7309Roeland Jago Douma2017-12-181-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Use injected AppManagerRoeland Jago Douma2017-12-181-1/+1
| |/ / /
* | | | Merge pull request #7561 from nextcloud/fix_7548Roeland Jago Douma2017-12-181-10/+0
|\ \ \ \ | |/ / / |/| | |
| * | | Let DI handle the background jobRoeland Jago Douma2017-12-181-10/+0
|/ / /
* | | 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
| |/