wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
41704 commits 157 branches 562 tags 714 MiB
Commit graph

41704 commits

This branch
This branch
All branches
Author SHA1 Message Date
Morris Jobke
5a95260bf3
Show tha copy share link button properly inline 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-12-13 10:32:13 +01:00
Roeland Jago Douma
f55dd96c08
Merge pull request #7470 from nextcloud/guest-flex-fix 
Fixed firefox guest header height
 2017-12-12 21:49:29 +01:00
Roeland Jago Douma
e17315954f
Merge pull request #7472 from nextcloud/move-comment-user-displaynameresolver-to-server 
The user displayNameResolver is specific to users, not the comments app
 2017-12-12 21:48:12 +01:00
Arthur Schiwon
099a340bf5
The user displayNameResolver is specific to users, not the comments app 
Other apps like spreed rely on it, and only can resolver per type can
be registered anyhow.

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-12-12 17:36:31 +01:00
John Molakvoæ (skjnldsv)
21fbcba68d
Removed unwanted and unused spacer 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-12-12 16:45:56 +01:00
John Molakvoæ (skjnldsv)
133cbd16e4
Fixed firefox guest header height 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-12-12 16:10:32 +01:00
Morris Jobke
2943b54f98
Merge pull request #7466 from nextcloud/fix-php7.2-session-init 
Fix error log on PHP 7.2
 2017-12-12 15:45:25 +01:00
Morris Jobke
175e1a5442
Merge pull request #7465 from nextcloud/filename-typo 
Fix filename typo
 2017-12-12 15:12:20 +01:00
Björn Schießle
acb395cade
Merge pull request #7462 from nextcloud/update-user-agent-regex 
allow 'Nextcloud' in the user agent string of Android
 2017-12-12 14:37:46 +01:00
Morris Jobke
b19fae2629
Fix error log on PHP 7.2 
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>
 2017-12-12 14:33:30 +01:00
Robin Appelman
1066faa8ba
Fix filename typo 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-12-12 14:18:49 +01:00
Bjoern Schiessle
caff52decd
fix dav unit tests 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-12-12 13:59:52 +01:00
Morris Jobke
14c83e415c
Merge pull request #7425 from nextcloud/13.0.0beta2-prep 
13.0.0 beta 2
 2017-12-12 12:35:55 +01:00
Morris Jobke
7ad746ad70
Merge pull request #7461 from nextcloud/fix_6821 
Set autocomplete on share password input
 2017-12-12 12:32:16 +01:00
Bjoern Schiessle
f0202245ee
allow 'Nextcloud' in the user agent string of Android 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-12-12 12:16:01 +01:00
Roeland Jago Douma
45772473a9
Set autocomplete on share password input 
Fixes #6821

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-12-12 11:33:12 +01:00
Morris Jobke
c1517f4ac1
13.0.0 beta 2 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-12-12 11:27:38 +01:00
Morris Jobke
134bd51fe6
Merge pull request #6830 from nextcloud/nc13_no_later_72 
Nextcloud 13 is not compatible with newer than php 7.2
 2017-12-12 11:27:10 +01:00
Roeland Jago Douma
b8af7ee9bc
Nextcloud 13 is not compatible with newer than php 7.2 
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>
 2017-12-12 10:55:09 +01:00
blizzz
115e7e29cf
Merge pull request #7458 from nextcloud/fix-calendar-manager-unit-tests 
Fix unit tests for CalendarManager
 2017-12-12 10:00:26 +01:00
Morris Jobke
1ceeab9229
Fix unit tests for CalendarManager 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-12-12 09:33:52 +01:00
Morris Jobke
d98dea1eb1
Merge pull request #6884 from nextcloud/feature/3003/opt_out_of_birthday_calendar 
Opt out of birthday calendar
 2017-12-12 08:29:26 +01:00
Roeland Jago Douma
e1740c9242
Merge pull request #7453 from nextcloud/txt_fopen_error 
Properly detect if fopen fails for txt previews
 2017-12-11 21:30:19 +01:00
Roeland Jago Douma
53400a1972
Properly detect if fopen fails for txt previews 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-12-11 20:37:18 +01:00
Roeland Jago Douma
179be8d95c
Merge pull request #6637 from nextcloud/contactsstore_public_api 
Make ContactsStore a public API
 2017-12-11 20:04:28 +01:00
Roeland Jago Douma
bd80795d59
Merge pull request #7431 from nextcloud/app-content-list-fixes 
App content list fixes
 2017-12-11 20:02:36 +01:00
Roeland Jago Douma
f18ac08c20
Merge pull request #7450 from nextcloud/log_correct_self_signed 
Catch the errors related to untrusted self signed certificates for federation
 2017-12-11 19:15:31 +01:00
John Molakvoæ (skjnldsv)
bb04e10651
Fixed width on app details 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-12-11 18:22:21 +01:00
Tobia De Koninck
cecfc28ebd
Register ContactsStore using alias + run autoloaderchecker.sh 
Signed-off-by: Tobia De Koninck <tobia@ledfan.be>
 2017-12-11 18:19:24 +01:00
Tobia De Koninck
78049af02c
Add @since annotation and add missing new line 
Signed-off-by: Tobia De Koninck <tobia@ledfan.be>
 2017-12-11 18:18:58 +01:00
Tobia De Koninck
f6ef779f97
Make ContactsStore a public API 
Signed-off-by: Tobia De Koninck <tobia@ledfan.be>
 2017-12-11 18:18:58 +01:00
Morris Jobke
45971879f5
Merge pull request #6668 from nextcloud/fix_6621 
Remove avatar on user deletion
 2017-12-11 18:16:14 +01:00
Roeland Jago Douma
2c2e1c4c7a
Catch the errors related to untrusted self signed certificates for federation 
* Added tests

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-12-11 18:14:01 +01:00
John Molakvoæ (skjnldsv)
a1b4869774
Fixed scrolling in app list 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-12-11 17:26:43 +01:00
John Molakvoæ (skjnldsv)
d3c324cc9b
Fixed popover menu in entry 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-12-11 17:26:43 +01:00
Morris Jobke
ba3c608a00
Merge pull request #6590 from nextcloud/dav-create-activities-for-publishing 
Create activities for (un)publishing calendar events
 2017-12-11 17:13:11 +01:00
blizzz
4fc8984d89
Merge pull request #6079 from nextcloud/fix-antivirus 
Parse Sabre Exception in OC.Files.Client and file-upload
 2017-12-11 17:12:02 +01:00
Robin Appelman
05d2f61a59
handle not found mounts when cleaning avatars 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-12-11 16:56:10 +01:00
Morris Jobke
d0ec0ce71c
Merge pull request #6715 from go2sh/fix-freebusy 
Fix the FreeBusy request handling for proper scheduling support
 2017-12-11 16:51:15 +01:00
Roeland Jago Douma
effde616eb
Fix tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-12-11 16:34:28 +01:00
Morris Jobke
c76c7a96fc
Update wording 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-12-11 16:28:40 +01:00
Thomas Citharel
4c32de22bb
Create activities for (un)publishing calendar events 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2017-12-11 16:28:40 +01:00
Roeland Jago Douma
10aa287463
Remove avatar on user deletion 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-12-11 16:07:06 +01:00
Roeland Jago Douma
949fc50cc5
Dispatch event on User predelete 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-12-11 16:05:38 +01:00
Georg Ehrke
728248bd8d
updated autoloaders for dav 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2017-12-11 16:04:55 +01:00
Georg Ehrke
6802e2b59a
Principal search: Take sharing settings into account 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2017-12-11 16:04:55 +01:00
Georg Ehrke
f543039858
exclude shared calendars from freeBusy 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2017-12-11 16:04:55 +01:00
Christoph Seitz
787e3d51b4
Fix functions to search for principals in the backend. 
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>
 2017-12-11 16:04:55 +01:00
blizzz
80b27fdb93
Merge pull request #7342 from nextcloud/fix_carddav_converter 
CardDAV convertor check should not be to wide
 2017-12-11 16:03:07 +01:00
Morris Jobke
07e6387b31
Merge pull request #7449 from nextcloud/fix-setup 
Fix 500 on setup page
 2017-12-11 16:00:11 +01:00