Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add tests | Roeland Jago Douma | 2017-12-13 | 2 | -10/+55 |
| | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
* | Add warning regarding freetype support | Roeland Jago Douma | 2017-12-13 | 2 | -0/+18 |
| | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
* | Merge pull request #7466 from nextcloud/fix-php7.2-session-init | Morris Jobke | 2017-12-12 | 1 | -3/+4 |
|\ | | | | | Fix error log on PHP 7.2 | ||||
| * | Fix error log on PHP 7.2 | Morris Jobke | 2017-12-12 | 1 | -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-typo | Morris Jobke | 2017-12-12 | 3 | -2/+2 |
|\ \ | | | | | | | Fix filename typo | ||||
| * | | Fix filename typo | Robin Appelman | 2017-12-12 | 3 | -2/+2 |
| |/ | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl> | ||||
* | | Merge pull request #7462 from nextcloud/update-user-agent-regex | Björn Schießle | 2017-12-12 | 3 | -4/+18 |
|\ \ | |/ |/| | allow 'Nextcloud' in the user agent string of Android | ||||
| * | fix dav unit tests | Bjoern Schiessle | 2017-12-12 | 1 | -3/+3 |
| | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org> | ||||
| * | allow 'Nextcloud' in the user agent string of Android | Bjoern Schiessle | 2017-12-12 | 2 | -1/+15 |
| | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org> | ||||
* | | Merge pull request #7425 from nextcloud/13.0.0beta2-prepv13.0.0beta2 | Morris Jobke | 2017-12-12 | 1 | -2/+2 |
|\ \ | | | | | | | 13.0.0 beta 2 | ||||
| * | | 13.0.0 beta 2 | Morris Jobke | 2017-12-12 | 1 | -2/+2 |
| |/ | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de> | ||||
* | | Merge pull request #7461 from nextcloud/fix_6821 | Morris Jobke | 2017-12-12 | 1 | -2/+2 |
|\ \ | |/ |/| | Set autocomplete on share password input | ||||
| * | Set autocomplete on share password input | Roeland Jago Douma | 2017-12-12 | 1 | -2/+2 |
| | | | | | | | | | | | | Fixes #6821 Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
* | | Merge pull request #6830 from nextcloud/nc13_no_later_72 | Morris Jobke | 2017-12-12 | 9 | -21/+31 |
|\ \ | |/ |/| | Nextcloud 13 is not compatible with newer than php 7.2 | ||||
| * | Nextcloud 13 is not compatible with newer than php 7.2 | Roeland Jago Douma | 2017-12-12 | 9 | -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-tests | blizzz | 2017-12-12 | 2 | -3/+14 |
|\ | | | | | Fix unit tests for CalendarManager | ||||
| * | Fix unit tests for CalendarManager | Morris Jobke | 2017-12-12 | 2 | -3/+14 |
|/ | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de> | ||||
* | Merge pull request #6884 from ↵ | Morris Jobke | 2017-12-12 | 26 | -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 them | Georg Ehrke | 2017-11-11 | 7 | -4/+277 |
| | | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com> | ||||
| * | create a user's birthday calendar right after they requested it | Georg Ehrke | 2017-11-11 | 3 | -4/+30 |
| | | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com> | ||||
| * | update autoloaders | Georg Ehrke | 2017-11-11 | 2 | -0/+4 |
| | | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com> | ||||
| * | respect admin / user choice about birthday calendars in corresponding hooks | Georg Ehrke | 2017-11-11 | 2 | -7/+160 |
| | | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com> | ||||
| * | disallow users to create calendars with reserved names | Georg Ehrke | 2017-11-11 | 2 | -0/+96 |
| | | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com> | ||||
| * | adapt occ 'dav:sync-birthday-calendar command | Georg Ehrke | 2017-11-11 | 1 | -1/+33 |
| | | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com> | ||||
| * | add CalDAV interface that allows users to re-enable their birthday calendar | Georg Ehrke | 2017-11-11 | 3 | -0/+304 |
| | | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com> | ||||
| * | remember when a user deleted their contact birthdays calendar | Georg Ehrke | 2017-11-10 | 8 | -27/+104 |
| | | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com> | ||||
| * | Add admin checkbox to disable birthday calendars | Georg Ehrke | 2017-11-09 | 6 | -0/+204 |
| | | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com> | ||||
* | | Merge pull request #7453 from nextcloud/txt_fopen_error | Roeland Jago Douma | 2017-12-11 | 1 | -0/+5 |
|\ \ | | | | | | | Properly detect if fopen fails for txt previews | ||||
| * | | Properly detect if fopen fails for txt previews | Roeland Jago Douma | 2017-12-11 | 1 | -0/+5 |
|/ / | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
* | | Merge pull request #6637 from nextcloud/contactsstore_public_api | Roeland Jago Douma | 2017-12-11 | 8 | -1/+67 |
|\ \ | | | | | | | Make ContactsStore a public API | ||||
| * | | Register ContactsStore using alias + run autoloaderchecker.sh | Tobia De Koninck | 2017-12-11 | 3 | -1/+5 |
| | | | | | | | | | | | | Signed-off-by: Tobia De Koninck <tobia@ledfan.be> | ||||
| * | | Add @since annotation and add missing new line | Tobia De Koninck | 2017-12-11 | 1 | -1/+6 |
| | | | | | | | | | | | | Signed-off-by: Tobia De Koninck <tobia@ledfan.be> | ||||
| * | | Make ContactsStore a public API | Tobia De Koninck | 2017-12-11 | 6 | -1/+58 |
| | | | | | | | | | | | | Signed-off-by: Tobia De Koninck <tobia@ledfan.be> | ||||
* | | | Merge pull request #7431 from nextcloud/app-content-list-fixes | Roeland Jago Douma | 2017-12-11 | 1 | -29/+54 |
|\ \ \ | | | | | | | | | App content list fixes | ||||
| * | | | Fixed width on app details | John Molakvoæ (skjnldsv) | 2017-12-11 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | ||||
| * | | | Fixed scrolling in app list | John Molakvoæ (skjnldsv) | 2017-12-11 | 1 | -3/+12 |
| | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | ||||
| * | | | Fixed popover menu in entry | John Molakvoæ (skjnldsv) | 2017-12-11 | 1 | -25/+40 |
| | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | ||||
* | | | | Merge pull request #7450 from nextcloud/log_correct_self_signed | Roeland Jago Douma | 2017-12-11 | 4 | -2/+88 |
|\ \ \ \ | |_|/ / |/| | | | Catch the errors related to untrusted self signed certificates for federation | ||||
| * | | | Catch the errors related to untrusted self signed certificates for federation | Roeland Jago Douma | 2017-12-11 | 4 | -2/+88 |
| |/ / | | | | | | | | | | | | | | | | * Added tests Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
* | | | Merge pull request #6668 from nextcloud/fix_6621 | Morris Jobke | 2017-12-11 | 2 | -1/+37 |
|\ \ \ | |/ / |/| | | Remove avatar on user deletion | ||||
| * | | handle not found mounts when cleaning avatars | Robin Appelman | 2017-12-11 | 2 | -0/+9 |
| | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl> | ||||
| * | | Remove avatar on user deletion | Roeland Jago Douma | 2017-12-11 | 1 | -0/+23 |
| | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
| * | | Dispatch event on User predelete | Roeland Jago Douma | 2017-12-11 | 1 | -1/+5 |
| | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
* | | | Merge pull request #6590 from nextcloud/dav-create-activities-for-publishing | Morris Jobke | 2017-12-11 | 5 | -0/+57 |
|\ \ \ | | | | | | | | | Create activities for (un)publishing calendar events | ||||
| * | | | Fix tests | Roeland Jago Douma | 2017-12-11 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
| * | | | Update wording | Morris Jobke | 2017-12-11 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de> | ||||
| * | | | Create activities for (un)publishing calendar events | Thomas Citharel | 2017-12-11 | 5 | -0/+55 |
| | | | | | | | | | | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr> | ||||
* | | | | Merge pull request #6079 from nextcloud/fix-antivirus | blizzz | 2017-12-11 | 3 | -18/+82 |
|\ \ \ \ | | | | | | | | | | | Parse Sabre Exception in OC.Files.Client and file-upload | ||||
| * | | | | Parse Sabre Exception in OC.Files.Client and file-upload | Vincent Petry | 2017-11-13 | 3 | -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-freebusy | Morris Jobke | 2017-12-11 | 11 | -25/+420 |
|\ \ \ \ \ | |_|/ / / |/| | | | | Fix the FreeBusy request handling for proper scheduling support |