summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #7453 from nextcloud/txt_fopen_errorRoeland Jago Douma2017-12-111-0/+5
|\ | | | | Properly detect if fopen fails for txt previews
| * Properly detect if fopen fails for txt previewsRoeland Jago Douma2017-12-111-0/+5
|/ | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* Merge pull request #6637 from nextcloud/contactsstore_public_apiRoeland Jago Douma2017-12-118-1/+67
|\ | | | | Make ContactsStore a public API
| * Register ContactsStore using alias + run autoloaderchecker.shTobia De Koninck2017-12-113-1/+5
| | | | | | | | Signed-off-by: Tobia De Koninck <tobia@ledfan.be>
| * Add @since annotation and add missing new lineTobia De Koninck2017-12-111-1/+6
| | | | | | | | Signed-off-by: Tobia De Koninck <tobia@ledfan.be>
| * Make ContactsStore a public APITobia De Koninck2017-12-116-1/+58
| | | | | | | | Signed-off-by: Tobia De Koninck <tobia@ledfan.be>
* | Merge pull request #7431 from nextcloud/app-content-list-fixesRoeland Jago Douma2017-12-111-29/+54
|\ \ | | | | | | App content list fixes
| * | Fixed width on app detailsJohn Molakvoæ (skjnldsv)2017-12-111-1/+2
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | Fixed scrolling in app listJohn Molakvoæ (skjnldsv)2017-12-111-3/+12
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | Fixed popover menu in entryJohn Molakvoæ (skjnldsv)2017-12-111-25/+40
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | Merge pull request #7450 from nextcloud/log_correct_self_signedRoeland Jago Douma2017-12-114-2/+88
|\ \ \ | |_|/ |/| | Catch the errors related to untrusted self signed certificates for federation
| * | Catch the errors related to untrusted self signed certificates for federationRoeland Jago Douma2017-12-114-2/+88
| |/ | | | | | | | | | | * Added tests Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #6668 from nextcloud/fix_6621Morris Jobke2017-12-112-1/+37
|\ \ | |/ |/| Remove avatar on user deletion
| * handle not found mounts when cleaning avatarsRobin Appelman2017-12-112-0/+9
| | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * Remove avatar on user deletionRoeland Jago Douma2017-12-111-0/+23
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * Dispatch event on User predeleteRoeland Jago Douma2017-12-111-1/+5
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #6590 from nextcloud/dav-create-activities-for-publishingMorris Jobke2017-12-115-0/+57
|\ \ | | | | | | Create activities for (un)publishing calendar events
| * | Fix testsRoeland Jago Douma2017-12-111-0/+2
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | Update wordingMorris Jobke2017-12-111-2/+2
| | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | Create activities for (un)publishing calendar eventsThomas Citharel2017-12-115-0/+55
| | | | | | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr>
* | | Merge pull request #6079 from nextcloud/fix-antivirusblizzz2017-12-113-18/+82
|\ \ \ | | | | | | | | Parse Sabre Exception in OC.Files.Client and file-upload
| * | | Parse Sabre Exception in OC.Files.Client and file-uploadVincent Petry2017-11-133-18/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In case of error, instead of a generic error message, an upload will display whichever message is returned in the Sabre Exception, if applicable. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | | | Merge pull request #6715 from go2sh/fix-freebusyMorris Jobke2017-12-1111-25/+420
|\ \ \ \ | |_|/ / |/| | | Fix the FreeBusy request handling for proper scheduling support
| * | | updated autoloaders for davGeorg Ehrke2017-12-112-0/+4
| | | | | | | | | | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
| * | | Principal search: Take sharing settings into accountGeorg Ehrke2017-12-116-35/+275
| | | | | | | | | | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
| * | | exclude shared calendars from freeBusyGeorg Ehrke2017-12-111-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
| * | | Fix functions to search for principals in the backend.Christoph Seitz2017-12-114-6/+157
|/ / / | | | | | | | | | | | | | | | | | | Add a "searchPrincipals" function to the NC principal backend. Fix the "findByUri" function to respect the prefixPath. Signed-off-by: Christoph Seitz <christoph.seitz@posteo.de>
* | | Merge pull request #7342 from nextcloud/fix_carddav_converterblizzz2017-12-111-2/+5
|\ \ \ | | | | | | | | CardDAV convertor check should not be to wide
| * | | CardDAV convertor check should not be to wideRoeland Jago Douma2017-12-111-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Case: email is set to null, but the avatar is set. In the old case the email would set $emptyValue but $noImage would still be false. This we would set the empty string as email. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | Merge pull request #7449 from nextcloud/fix-setupMorris Jobke2017-12-111-10/+15
|\ \ \ \ | |_|_|/ |/| | | Fix 500 on setup page
| * | | Fix 500 on setup pageMorris Jobke2017-12-111-10/+15
| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | Merge pull request #7249 from nextcloud/guest-flexMorris Jobke2017-12-111-10/+12
|\ \ \ \ | | | | | | | | | | Guest flex instead of absolute
| * | | | Fixed topJohn Molakvoæ (skjnldsv)2017-11-231-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | Fixed heigh resizeJohn Molakvoæ (skjnldsv)2017-11-221-2/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | Use flex for guest full screen alignmentJohn Molakvoæ (skjnldsv)2017-11-221-8/+9
| | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | | | Merge pull request #7418 from nextcloud/ldap-fix-cache-retrieved-userMorris Jobke2017-12-113-12/+143
|\ \ \ \ \ | | | | | | | | | | | | ensure that users are cached when they are retrieved
| * | | | | don't cache user, if no internal user id was retrieved/assignedArthur Schiwon2017-12-072-7/+17
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | | | | ensure that users are cached when they are retrievedArthur Schiwon2017-12-073-7/+128
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | | | | Merge pull request #6651 from nextcloud/remote-cloud-clientRoeland Jago Douma2017-12-1129-1/+1706
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add api clients for talking to remote clouds
| * | | | | | Add some more tests for ocs remote apiRobin Appelman2017-12-085-59/+259
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | | | refuse to use http if we know a remote has httpsRobin Appelman2017-12-082-0/+135
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | | | validate user responseRobin Appelman2017-12-081-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | | | add more typehintsRobin Appelman2017-12-086-1/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | | | Add public api for remote apiRobin Appelman2017-12-0820-9/+623
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | | | Some tests for the remote cloud apiRobin Appelman2017-12-087-4/+232
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | | | Add api clients for talking to remote cloudsRobin Appelman2017-12-088-0/+505
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | | | 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…
| * | | | | | | Fallback to filename based detection if the remote dav server doesn't know ↵Robin Appelman2017-09-282-10/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the mimetype Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | | | | Merge pull request #7324 from nextcloud/no-sorters-no-instancesRoeland Jago Douma2017-12-112-46/+106
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | don't create sorter instances when none was requested
| * | | | | | | | don't create sorter instances when none was requestedArthur Schiwon2017-11-282-46/+106
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>