summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Nextcloud 13 is not compatible with newer than php 7.2Roeland Jago Douma2017-12-129-21/+31
| | | | | | | | | | | Just to avoid users from trying this with a to new (untested) php version * Moved the check logic to 1 place * All directly callable scripts just require this on top * exit hard (-1) so we know scripts won't continue * Return status 500 so no sync clients will try fancy stuff Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* Merge pull request #7458 from nextcloud/fix-calendar-manager-unit-testsblizzz2017-12-122-3/+14
|\ | | | | Fix unit tests for CalendarManager
| * Fix unit tests for CalendarManagerMorris Jobke2017-12-122-3/+14
|/ | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* Merge pull request #6884 from ↵Morris Jobke2017-12-1226-35/+1204
|\ | | | | | | | | nextcloud/feature/3003/opt_out_of_birthday_calendar Opt out of birthday calendar
| * generate birthday calendars in a background job after admin enabled themGeorg Ehrke2017-11-117-4/+277
| | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
| * create a user's birthday calendar right after they requested itGeorg Ehrke2017-11-113-4/+30
| | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
| * update autoloadersGeorg Ehrke2017-11-112-0/+4
| | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
| * respect admin / user choice about birthday calendars in corresponding hooksGeorg Ehrke2017-11-112-7/+160
| | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
| * disallow users to create calendars with reserved namesGeorg Ehrke2017-11-112-0/+96
| | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
| * adapt occ 'dav:sync-birthday-calendar commandGeorg Ehrke2017-11-111-1/+33
| | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
| * add CalDAV interface that allows users to re-enable their birthday calendarGeorg Ehrke2017-11-113-0/+304
| | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
| * remember when a user deleted their contact birthdays calendarGeorg Ehrke2017-11-108-27/+104
| | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
| * Add admin checkbox to disable birthday calendarsGeorg Ehrke2017-11-096-0/+204
| | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
* | 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>