summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Make ContactsStore a public APITobia De Koninck2017-12-116-1/+58
* Merge pull request #6668 from nextcloud/fix_6621Morris Jobke2017-12-112-1/+37
|\
| * handle not found mounts when cleaning avatarsRobin Appelman2017-12-112-0/+9
| * Remove avatar on user deletionRoeland Jago Douma2017-12-111-0/+23
| * Dispatch event on User predeleteRoeland Jago Douma2017-12-111-1/+5
* | Merge pull request #6590 from nextcloud/dav-create-activities-for-publishingMorris Jobke2017-12-115-0/+57
|\ \
| * | Fix testsRoeland Jago Douma2017-12-111-0/+2
| * | Update wordingMorris Jobke2017-12-111-2/+2
| * | Create activities for (un)publishing calendar eventsThomas Citharel2017-12-115-0/+55
* | | Merge pull request #6079 from nextcloud/fix-antivirusblizzz2017-12-113-18/+82
|\ \ \
| * | | Parse Sabre Exception in OC.Files.Client and file-uploadVincent Petry2017-11-133-18/+82
* | | | Merge pull request #6715 from go2sh/fix-freebusyMorris Jobke2017-12-1111-25/+420
|\ \ \ \ | |_|/ / |/| | |
| * | | updated autoloaders for davGeorg Ehrke2017-12-112-0/+4
| * | | Principal search: Take sharing settings into accountGeorg Ehrke2017-12-116-35/+275
| * | | exclude shared calendars from freeBusyGeorg Ehrke2017-12-111-1/+1
| * | | Fix functions to search for principals in the backend.Christoph Seitz2017-12-114-6/+157
|/ / /
* | | Merge pull request #7342 from nextcloud/fix_carddav_converterblizzz2017-12-111-2/+5
|\ \ \
| * | | CardDAV convertor check should not be to wideRoeland Jago Douma2017-12-111-2/+5
* | | | Merge pull request #7449 from nextcloud/fix-setupMorris Jobke2017-12-111-10/+15
|\ \ \ \ | |_|_|/ |/| | |
| * | | Fix 500 on setup pageMorris Jobke2017-12-111-10/+15
* | | | Merge pull request #7249 from nextcloud/guest-flexMorris Jobke2017-12-111-10/+12
|\ \ \ \
| * | | | Fixed topJohn Molakvoæ (skjnldsv)2017-11-231-1/+1
| * | | | Fixed heigh resizeJohn Molakvoæ (skjnldsv)2017-11-221-2/+3
| * | | | Use flex for guest full screen alignmentJohn Molakvoæ (skjnldsv)2017-11-221-8/+9
* | | | | Merge pull request #7418 from nextcloud/ldap-fix-cache-retrieved-userMorris Jobke2017-12-113-12/+143
|\ \ \ \ \
| * | | | | don't cache user, if no internal user id was retrieved/assignedArthur Schiwon2017-12-072-7/+17
| * | | | | ensure that users are cached when they are retrievedArthur Schiwon2017-12-073-7/+128
* | | | | | Merge pull request #6651 from nextcloud/remote-cloud-clientRoeland Jago Douma2017-12-1129-1/+1706
|\ \ \ \ \ \
| * | | | | | Add some more tests for ocs remote apiRobin Appelman2017-12-085-59/+259
| * | | | | | refuse to use http if we know a remote has httpsRobin Appelman2017-12-082-0/+135
| * | | | | | validate user responseRobin Appelman2017-12-081-1/+8
| * | | | | | add more typehintsRobin Appelman2017-12-086-1/+17
| * | | | | | Add public api for remote apiRobin Appelman2017-12-0820-9/+623
| * | | | | | Some tests for the remote cloud apiRobin Appelman2017-12-087-4/+232
| * | | | | | Add api clients for talking to remote cloudsRobin Appelman2017-12-088-0/+505
* | | | | | | Merge pull request #6682 from nextcloud/dav-mimetype-fallbackRoeland Jago Douma2017-12-112-10/+29
|\ \ \ \ \ \ \
| * | | | | | | Fallback to filename based detection if the remote dav server doesn't know th...Robin Appelman2017-09-282-10/+29
* | | | | | | | Merge pull request #7324 from nextcloud/no-sorters-no-instancesRoeland Jago Douma2017-12-112-46/+106
|\ \ \ \ \ \ \ \
| * | | | | | | | don't create sorter instances when none was requestedArthur Schiwon2017-11-282-46/+106
* | | | | | | | | Merge pull request #7427 from nextcloud/fix-white-color-in-emailsMorris Jobke2017-12-1111-22/+74
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix email buttons for white themeMorris Jobke2017-12-1111-22/+74
* | | | | | | | | | Merge pull request #7313 from nextcloud/ensure-that-x-oc-mtime-header-is-an-i...Morris Jobke2017-12-112-18/+187
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | | |
| * | | | | | | | | Reject X-OC-MTime header if given as a string with hexadecimal notationDaniel Calviño Sánchez2017-11-282-2/+6
| * | | | | | | | | Don't use runInSeparateProcessThomas Müller2017-11-272-7/+11
| * | | | | | | | | Add tests for X-OC-MTime header handlingDaniel Calviño Sánchez2017-11-271-0/+133
| * | | | | | | | | Make possible to provide a specific HTTP request object to FileDaniel Calviño Sánchez2017-11-272-12/+35
| * | | | | | | | | Ensure that X-OC-MTime header is an integer also with chunked uploadsDaniel Calviño Sánchez2017-11-271-6/+11
* | | | | | | | | | Merge pull request #7244 from nextcloud/css-file-suffix-with-apps-versionsMorris Jobke2017-12-111-5/+46
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | |
| * | | | | | | | | Fix syntax errorMorris Jobke2017-12-111-1/+1
| * | | | | | | | | Fixed phpdoc and function typeJohn Molakvoæ (skjnldsv)2017-12-111-2/+8