Skip to content
This repository was archived by the owner on Nov 28, 2017. It is now read-only.

Conversation

@Ruchiranga
Copy link
Contributor

Pull Request for Issue 5 .

wojsmol and others added 30 commits May 16, 2016 17:39
* [plg_system_languagefilter]Code style

* new line
* [plg_system_debug]Code style

* cs
* [plg_search_tags]Code style

* more cs

* cs
* [plg_search_content]Code style

* [plg_search_newsfeeds]Code style

* Revert "[plg_search_content]Code style"

This reverts commit 41f564c8f944ff2bad36d0ef690b528ec47a8440.

* remove blank line
* [plg_content_pagenavigation]Code style

* XML CS

* options in one line

* indent
* [plg_content_pagebreak]Code style

* more XML CS

* options on one line + indent
* [plg_content_loadmodule]XML code style

* XML CS

* options in one line
* [plg_captcha_recaptcha]code style

* indent

* indent

* XML CS

* options in one line
* Improve select contact modal

* Add Edit contact modal + simplify and clean code

* Language string consistency: COM_CONTACT_EDIT_CONTACT

« Edit Contact » as for other components: com_content, com_categories…
…MPAT, 'UTF-8') (#10443)

* Update index.php

* Update login.php

* Update manager.php

* Update view.html.php

* Update blog.php

* Update default_items.php

* Update default.php
…MPAT, 'UTF-8') (#10417)

* Update mod_articles_archive.php

* Update mod_articles_latest.php

* Update mod_articles_news.php

* Update mod_articles_popular.php

* Update mod_languages.php

* Update mod_languages.php

* Update mod_stats.php

* Update modules.php

* Update helper.php
andrepereiradasilva and others added 17 commits June 16, 2016 00:24
…0737)

* do not hardcode link in warning message

* cs

* add " unless it is enabled."

* updated language description
….. (#10642)

* use real tabs for rendering tabs, not two spaces ...

* use PHP_TAB instead

* revert sorry
…ndards (#6956)

* first update and reordering

* finish ruleset rebuild

- Note: some new sniffs were added from the Joomla Coding standards (used standards rather than the Joomla sniffs since there is no difference from the source)

* Remove in favor of using the PSR2 standard and adjusting in the ruleset

* Remove in favor of using the Generic.PHP.LowerCaseConstant in the ruleset

* Remove in favor of using PEAR.WhiteSpace.ObjectOperatorIndent in the ruleset

* Remove in favor of using Squiz.WhiteSpace.CastSpacing in the ruleset

* Remove in favor of using Generic.WhiteSpace.DisallowSpaceIndent in the ruleset

* Remove in favor of using Squiz.WhiteSpace.MemberVarSpacing in the ruleset

* Remove in favor of using Squiz.WhiteSpace.SemicolonSpacing in the ruleset

* Remove in favor of using Squiz.WhiteSpace.OperatorSpacingSniff in the ruleset

* Remove in favor of using Squiz.WhiteSpace.SuperfluousWhitespace in ruleset.xml

* Remove Squiz.WhiteSpace.MemberVarSpacing

Removing Squiz.WhiteSpace.MemberVarSpacing since that standard requires an empty line after the opening class bracket `{` 

Add back the Joomla.WhiteSpace.MemberVarSpacing sniff

* Add back Joomla.WhiteSpace.MemberVarSpacing sniff

Needed due to the removal of Squiz.WhiteSpace.MemberVarSpacing sniff since that standard requires an empty line after the opening class bracket `{`

* Remove PEAR.WhiteSpace.ObjectOperatorIndent

PEAR.WhiteSpace.ObjectOperatorIndent is calculating the space oddly resulting in false positive errors

Replace by adding back Joomla.WhiteSpace.ObjectOperatorIndent

Reorder the Joomla standards list to alphabetical sniff ordering

* Adding back Joomla.WhiteSpace.ObjectOperatorIndent

Removed PEAR.WhiteSpace.ObjectOperatorIndent as it is calculating the space oddly resulting in false positive errors

* Add some exceptions for LineLength

exceptions added since we are catching the errors now. Expected temporary, possibly permanent.

* Add exceptions for EndFileNewline

Add exceptions for EndFileNewline since we are actually catching the errors now.
These exceptions are temporary for now, possibly permanent

* Remove Squiz.Commenting.DocCommentAlignment

Squiz.Commenting.DocCommentAlignment seems to be giving a lot of errors which seem to be false positives vs the Joomla Coding standards.
Assuming this is covered by the other commenting sniffs

* Remove Squiz.Commenting.DocCommentAlignment

Actually remove rather than just adding exclusions.
* fallback warning in test mail

* fix conflicts 1

* fix conflicts 2

* fix conflicts final

* message not success
* temporaly remove modules exception

* part 2

* Revert "part 2"

This reverts commit 7dd767caf2da4d8169dee198fac05563df0d079f.
No point in returning null in an else clause because the method will return null if it drops past the if statement anyway.
…Url screen

Remove typo of a single quote that is not needed on the Install From Url screen
Remove typo of a single quote that is not needed on the Install From …
@yvesh yvesh force-pushed the develop branch 3 times, most recently from 798055d to 6a7b519 Compare June 22, 2016 19:29
@yvesh
Copy link

yvesh commented Jun 26, 2016

Closing, merged manually to resolve conflicts. Thank you @Ruchiranga

@yvesh yvesh closed this Jun 26, 2016
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.