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

LICENSE.txt #16317

Merged
merged 2 commits into from
May 29, 2017
Merged

LICENSE.txt #16317

merged 2 commits into from
May 29, 2017

Conversation

brianteeman
Copy link
Contributor

@brianteeman brianteeman commented May 29, 2017

The licence file we include is named LICENSE.txt but 748 files referred to just LICENSE

NB I excluded vendor supplied files obviously AND fof and libraries/joomla
as my understanding that any changes for these should be made upstream. If that is wrong I can always update this PR

The licence file we include is named LICENSE.txt but 748 files referred to just LICENSE

NB I excluded vendor supplied files obviously AND fof and libraries/joomla
as my understanding that any changes for these should be made upstream. If that is wrong I can always update this PR
@zero-24
Copy link
Contributor

zero-24 commented May 29, 2017

The licence file we include is named LICENSE.txt but 748 files referred to just LICENSE

https://github.com/joomla/joomla-cms/blob/staging/installation/LICENSES ?

Isn't it the other way?

@brianteeman
Copy link
Contributor Author

@zero-24 installation is a different issue see #14296

The license file referred to is https://github.com/joomla/joomla-cms/blob/staging/LICENSE.txt

@zero-24
Copy link
Contributor

zero-24 commented May 29, 2017

Ah. Sorry looks like i overlooked this file.

@Quy
Copy link
Contributor

Quy commented May 29, 2017

I have tested this item ✅ successfully on 33c0cf9

Code review


This comment was created with the J!Tracker Application at issues.joomla.org/tracker/joomla-cms/16317.

@tonypartridge
Copy link
Contributor

I have tested this item ✅ successfully on 33c0cf9

On Code review.


This comment was created with the J!Tracker Application at issues.joomla.org/tracker/joomla-cms/16317.

@ghost
Copy link

ghost commented May 29, 2017

RTC after two successful tests.

@joomla-cms-bot joomla-cms-bot added the RTC This Pull Request is Ready To Commit label May 29, 2017
@wilsonge wilsonge merged commit 16d5a29 into joomla:staging May 29, 2017
@joomla-cms-bot joomla-cms-bot removed the RTC This Pull Request is Ready To Commit label May 29, 2017
@wilsonge wilsonge added this to the Joomla 3.7.3 milestone May 29, 2017
@wilsonge
Copy link
Contributor

Thanks Brian!

@brianteeman
Copy link
Contributor Author

thanks

@brianteeman brianteeman deleted the license_txt branch May 29, 2017 15:36
izharaazmi added a commit to izharaazmi/joomla-cms that referenced this pull request May 31, 2017
* staging: (1779 commits)
  Deprecate modules correction (joomla#16362)
  Removed unnecessary code in com_content (joomla#14628)
  Stop installation if minimum requirement isn't met. (joomla#15890)
  Deprecate parts of com_modules (joomla#16152)
  LICENSE.txt (joomla#16317)
  [a11y] [com_fields] icons in modals (joomla#15047)
  Load jQuery in associations edit layout (joomla#16240)
  HHVM was removed. Remove from travis conditionals (joomla#16281)
  Fix Stylesheet Mime type keeping b/c (joomla#16284)
  re-merge joomla#15068 and joomla#16256
  Add showon attribute to add mailto link parameter (joomla#16282)
  Fix notices on Contact form (joomla#16279)
  Updating dutch TinyMCE files
  Media upload form margin (joomla#16253)
  Changes to display atom feeds correctly (joomla#16105)
  admin mod_latest (joomla#16277)
  Add truncate class and implement in popular articles module (joomla#16257)
  Using the "Special:MyLanguage" tag for links pointing to docs.joomla.org (joomla#15858)
  Change email notification to use site from address (Fix joomla#9261) (joomla#13518)
  Fix double encode ampersand in contact select list value (joomla#16268)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants