aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add testsRoeland Jago Douma2017-12-132-10/+55
| | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* Add warning regarding freetype supportRoeland Jago Douma2017-12-132-0/+18
| | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* Merge pull request #7466 from nextcloud/fix-php7.2-session-initMorris Jobke2017-12-121-3/+4
|\ | | | | Fix error log on PHP 7.2
| * Fix error log on PHP 7.2Morris Jobke2017-12-121-3/+4
| | | | | | | | | | | | Fixes following error in the logs: "ini_set(): A session is active. You cannot change the session module's ini settings at this time" Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #7465 from nextcloud/filename-typoMorris Jobke2017-12-123-2/+2
|\ \ | | | | | | Fix filename typo
| * | Fix filename typoRobin Appelman2017-12-123-2/+2
| |/ | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | Merge pull request #7462 from nextcloud/update-user-agent-regexBjörn Schießle2017-12-123-4/+18
|\ \ | |/ |/| allow 'Nextcloud' in the user agent string of Android
| * fix dav unit testsBjoern Schiessle2017-12-121-3/+3
| | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * allow 'Nextcloud' in the user agent string of AndroidBjoern Schiessle2017-12-122-1/+15
| | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | Merge pull request #7425 from nextcloud/13.0.0beta2-prepv13.0.0beta2Morris Jobke2017-12-121-2/+2
|\ \ | | | | | | 13.0.0 beta 2
| * | 13.0.0 beta 2Morris Jobke2017-12-121-2/+2
| |/ | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #7461 from nextcloud/fix_6821Morris Jobke2017-12-121-2/+2
|\ \ | |/ |/| Set autocomplete on share password input
| * Set autocomplete on share password inputRoeland Jago Douma2017-12-121-2/+2
| | | | | | | | | | | | Fixes #6821 Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #6830 from nextcloud/nc13_no_later_72Morris Jobke2017-12-129-21/+31
|\ \ | |/ |/| Nextcloud 13 is not compatible with newer than php 7.2
| * 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