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

[stable12] Improve text: 'you have now' -> 'you now have' #6464

Merged
merged 2 commits into from
Nov 10, 2017
Merged

[stable12] Improve text: 'you have now' -> 'you now have' #6464

merged 2 commits into from
Nov 10, 2017

Conversation

leonklingele-work
Copy link

No description provided.

Improve text: 'you have now' -> 'you now have'
33ae6a4 
Signed-off-by: Leon Klingele <leon@struktur.de>
@leonklingele-work
Copy link
Author

This backports #6417

@MorrisJobke fyi

@codecov
Copy link

codecov bot commented Sep 12, 2017 •
edited
Loading

Codecov Report

Merging #6464 into stable12 will increase coverage by <.01%.
The diff coverage is 100%.

@@              Coverage Diff               @@
##             stable12    #6464      +/-   ##
==============================================
+ Coverage       53.77%   53.77%   +<.01%     
  Complexity      22526    22526              
==============================================
  Files            1383     1383              
  Lines           86496    86496              
  Branches         1328     1328              
==============================================
+ Hits            46510    46513       +3     
+ Misses          39986    39983       -3
Impacted Files Coverage Δ Complexity Δ
settings/Mailer/NewUserMailHelper.php 75.71% <100%> (ø) 8 <0> (ø) ⬇️
lib/private/Files/Cache/Propagator.php 94.93% <0%> (-1.27%) 16% <0%> (ø)
lib/private/Security/CertificateManager.php 91.08% <0%> (-1%) 39% <0%> (ø)
apps/files_trashbin/lib/Trashbin.php 72.28% <0%> (-0.25%) 136% <0%> (ø)
lib/private/Server.php 84.8% <0%> (+0.12%) 121% <0%> (ø) ⬇️
core/js/js.js 61.83% <0%> (+0.55%) 0% <0%> (ø) ⬇️

@LukasReschke LukasReschke added this to the Nextcloud 12.0.4 milestone Sep 12, 2017
@MorrisJobke MorrisJobke added the 3. to review Waiting for reviews label Sep 13, 2017
@MorrisJobke MorrisJobke changed the title Improve text: 'you have now' -> 'you now have' [stable12] Improve text: 'you have now' -> 'you now have' Sep 13, 2017
@MorrisJobke MorrisJobke added 2. developing Work in progress and removed 3. to review Waiting for reviews labels Sep 13, 2017
@MorrisJobke
Copy link
Member

Blocked until #6417 (comment) is in.

@MorrisJobke
Fix welcome text for better grammar in themed instances
d8cf19b 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
@MorrisJobke
Copy link
Member

MorrisJobke commented Nov 9, 2017 •
edited
Loading

Blocked until #6417 (comment) is in.

Fixed in #7117

@MorrisJobke MorrisJobke added 3. to review Waiting for reviews and removed 2. developing Work in progress labels Nov 9, 2017
@MorrisJobke MorrisJobke mentioned this pull request Nov 9, 2017
Merged
@blizzz blizzz merged commit 14986e0 into stable12 Nov 10, 2017
@blizzz blizzz deleted the proper-english-nowhave-backport-stable12 branch November 10, 2017 14:48
@MorrisJobke MorrisJobke mentioned this pull request Nov 20, 2017
Merged
1 task
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@MorrisJobke MorrisJobke MorrisJobke approved these changes

@blizzz blizzz blizzz approved these changes

@rullzer rullzer Awaiting requested review from rullzer

@nickvergessen nickvergessen Awaiting requested review from nickvergessen

@LukasReschke LukasReschke Awaiting requested review from LukasReschke

@jancborchardt jancborchardt Awaiting requested review from jancborchardt

@skjnldsv skjnldsv Awaiting requested review from skjnldsv

Assignees
No one assigned
Labels
3. to review Waiting for reviews
Projects
None yet
Milestone
Nextcloud 12.0.4
Development

Successfully merging this pull request may close these issues.
4 participants
@leonklingele-work @MorrisJobke @blizzz @LukasReschke