Skip to content
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.

Sign up for GitHub

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

Jump to bottom

[stable13] Show group display names #8779

Merged
merged 5 commits into from
Apr 6, 2018
Merged

[stable13] Show group display names #8779

merged 5 commits into from
Apr 6, 2018

Conversation

nickvergessen
Copy link
Member

Only backporting the user facing easy stuff from #8255

nickvergessen and others added 4 commits March 12, 2018 12:00
@nickvergessen
Show the displayname in the users group list
97dbaa2 
Signed-off-by: Joas Schilling <coding@schilljs.com>
@nickvergessen
Correctly return the group name
6308982 
Signed-off-by: Joas Schilling <coding@schilljs.com>
@nickvergessen
Fix group displaynames in activity
2609b30 
Signed-off-by: Joas Schilling <coding@schilljs.com>
@skjnldsv @nickvergessen
Fixed caldav tests and metadata 2
ae369e8 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
@nickvergessen nickvergessen added this to the Nextcloud 13.0.2 milestone Mar 12, 2018
@nickvergessen nickvergessen mentioned this pull request Mar 12, 2018
Merged
6 tasks
@blizzz
Copy link
Member

blizzz commented Mar 15, 2018

CI is unhappy

@nickvergessen
Fix unit tests
5e15c76 
Signed-off-by: Joas Schilling <coding@schilljs.com>
@nickvergessen nickvergessen force-pushed the backport/8255/show-group-display-names branch from b9926ec to 5e15c76 Compare March 16, 2018 09:50
@nickvergessen
Copy link
Member Author

fixed

@codecov
Copy link

codecov bot commented Mar 16, 2018 •
edited
Loading

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
View reviewed changes
Copy link
Member

@rullzer rullzer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fine by me

@skjnldsv skjnldsv merged commit d45a889 into stable13 Apr 6, 2018
@skjnldsv skjnldsv deleted the backport/8255/show-group-display-names branch April 6, 2018 13:14
@skjnldsv skjnldsv added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Apr 6, 2018
@MorrisJobke MorrisJobke mentioned this pull request Apr 18, 2018
Merged
11 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rullzer rullzer rullzer approved these changes

@skjnldsv skjnldsv skjnldsv approved these changes

@MorrisJobke MorrisJobke Awaiting requested review from MorrisJobke

@blizzz blizzz Awaiting requested review from blizzz

Assignees
No one assigned
Labels
4. to release Ready to be released and/or waiting for tests to finish bug feature: activity and notification
Projects
None yet
Milestone
Nextcloud 13.0.2
Development

Successfully merging this pull request may close these issues.
4 participants
@nickvergessen @blizzz @rullzer @skjnldsv