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.

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

Copyright fix, changed vue settings output name and fixes template name #9834

Merged
merged 3 commits into from
Jun 12, 2018

Conversation

skjnldsv
Copy link
Member

@skjnldsv skjnldsv commented Jun 12, 2018

Simple copyright update I did not ad on my previous big pr...
I also changed the filename of the scripts for the vue settings from main to settings-vue which is far more understandable (cc @juliushaertl )

Same for the vue template :)

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
@skjnldsv skjnldsv self-assigned this Jun 12, 2018
@skjnldsv skjnldsv requested a review from blizzz June 12, 2018 08:28
@skjnldsv skjnldsv added the 3. to review Waiting for reviews label Jun 12, 2018
@skjnldsv skjnldsv added this to the Nextcloud 14 milestone Jun 12, 2018
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
@codecov
Copy link

codecov bot commented Jun 12, 2018

Codecov Report

Merging #9834 into master will decrease coverage by <.01%.
The diff coverage is 20%.

@@             Coverage Diff              @@
##             master    #9834      +/-   ##
============================================
- Coverage     51.92%   51.92%   -0.01%     
- Complexity    25770    25771       +1     
============================================
  Files          1635     1635              
  Lines         95439    95441       +2     
  Branches       1308     1308              
============================================
  Hits          49554    49554              
- Misses        45885    45887       +2
Impacted Files Coverage Δ Complexity Δ
settings/templates/settings-vue.php 0% <0%> (ø) 0 <0> (?)
settings/Controller/UsersController.php 42.92% <0%> (ø) 39 <0> (ø) ⬇️
settings/Controller/AppSettingsController.php 19.54% <100%> (ø) 79 <0> (ø) ⬇️
apps/files_trashbin/lib/Expiration.php 90.32% <0%> (-1.62%) 29% <0%> (ø)
...ib/private/Files/ObjectStore/S3ConnectionTrait.php 52.38% <0%> (-0.08%) 29% <0%> (+1%)

@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 Jun 12, 2018
@skjnldsv skjnldsv merged commit ed25fc3 into master Jun 12, 2018
@skjnldsv skjnldsv deleted the copy-fix branch June 12, 2018 09:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
4. to release Ready to be released and/or waiting for tests to finish
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants