New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[stable13] Show group display names #8779

Merged
merged 5 commits into from Apr 6, 2018

Conversation

@nickvergessen
Member

nickvergessen commented Mar 12, 2018

Only backporting the user facing easy stuff from #8255

nickvergessen and others added some commits Jan 24, 2018

Show the displayname in the users group list
Signed-off-by: Joas Schilling <coding@schilljs.com>
Correctly return the group name
Signed-off-by: Joas Schilling <coding@schilljs.com>
Fix group displaynames in activity
Signed-off-by: Joas Schilling <coding@schilljs.com>
Fixed caldav tests and metadata 2
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
@blizzz

This comment has been minimized.

Member

blizzz commented Mar 15, 2018

CI is unhappy

Fix unit tests
Signed-off-by: Joas Schilling <coding@schilljs.com>
@nickvergessen

This comment has been minimized.

Member

nickvergessen commented Mar 16, 2018

fixed

@codecov

This comment has been minimized.

codecov bot commented Mar 16, 2018

Codecov Report

Merging #8779 into stable13 will decrease coverage by 0.02%.
The diff coverage is 45.83%.

@@              Coverage Diff               @@
##             stable13    #8779      +/-   ##
==============================================
- Coverage       51.33%   51.31%   -0.03%     
- Complexity      25022    25038      +16     
==============================================
  Files            1609     1609              
  Lines           95290    95530     +240     
  Branches         1376     1376              
==============================================
+ Hits            48919    49017      +98     
- Misses          46371    46513     +142
Impacted Files Coverage Δ Complexity Δ
lib/private/Settings/Personal/PersonalInfo.php 0% <0%> (ø) 29 <0> (ø) ⬇️
apps/dav/lib/CalDAV/Activity/Provider/Event.php 0% <0%> (ø) 25 <1> (ø) ⬇️
apps/dav/lib/CalDAV/Activity/Provider/Calendar.php 0% <0%> (ø) 65 <1> (ø) ⬇️
...ps/files_sharing/lib/Activity/Providers/Groups.php 0% <0%> (ø) 22 <5> (+5) ⬆️
lib/private/Group/MetaData.php 68.91% <100%> (ø) 19 <0> (ø) ⬇️
settings/Controller/GroupsController.php 68.33% <100%> (+3.71%) 9 <0> (ø) ⬇️
apps/dav/lib/CalDAV/Activity/Provider/Base.php 79.36% <85%> (+2.57%) 19 <7> (+3) ⬆️
lib/private/Server.php 80.55% <0%> (-0.12%) 134% <0%> (ø)
apps/user_ldap/lib/Access.php 36.92% <0%> (+0.73%) 327% <0%> (+8%) ⬆️
lib/private/Security/CertificateManager.php 92.07% <0%> (+0.99%) 39% <0%> (ø) ⬇️
... and 1 more
@rullzer

rullzer approved these changes Apr 6, 2018

fine by me

@skjnldsv skjnldsv merged commit d45a889 into stable13 Apr 6, 2018

1 of 3 checks passed

codecov/patch 45.83% of diff hit (target 51.33%)
Details
codecov/project 51.31% (-0.03%) compared to 161a0f2
Details
continuous-integration/drone/pr the build was successful
Details

@skjnldsv skjnldsv deleted the backport/8255/show-group-display-names branch Apr 6, 2018

@skjnldsv skjnldsv added 4. to release and removed 3. to review labels Apr 6, 2018

@MorrisJobke MorrisJobke referenced this pull request Apr 18, 2018

Merged

13.0.2 RC 1 #9228

8 of 11 tasks complete
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment