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

[Code Style] Changes in tag standards: Libraries/joomla #4617

Closed

Conversation

javigomez
Copy link
Contributor

This pull should fix the issue detailed here: joomla/coding-standards#80

I have broken in parts this original pull #4590 to make it easy for review. This pull is contains only the libraries/joomla changes.
The components/, modules/, ... are going to be sent in different pulls.

This pull is related to #4603

Note for reviewer: I was going to break this into several pulls but I found easier to do it in different commints, so you can see the changes per commit at https://github.com/joomla/joomla-cms/pull/4617/commits.

@nicksavov
Copy link
Contributor

Looks like there are some merge conflicts. Could you update to latest staging?

@javigomez
Copy link
Contributor Author

Updated ^_^

Conflicts:
	libraries/joomla/database/exporter/postgresql.php
	libraries/joomla/github/package/data.php
@nicksavov
Copy link
Contributor

Thanks!

@nicksavov nicksavov removed the PBF14 label Oct 17, 2014
@javigomez
Copy link
Contributor Author

mmm seems that Travis fails due to the same error as I have fixed in the last update on #4625

I think to avoid conflicts I'm going to wait for #4625 to be merged and then I'll update the present pull.

@javigomez javigomez closed this in ac589fd Oct 20, 2014
@Bakual
Copy link
Contributor

Bakual commented Oct 20, 2014

Merged into staging. Thanks!

@Bakual Bakual added this to the Joomla! 3.3.7 milestone Oct 20, 2014
@mbabker mbabker modified the milestones: Joomla! 3.3.7, Joomla! 3.4.0 Nov 22, 2014
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.

None yet

5 participants