Skip to content

Conversation

@brianteeman
Copy link
Contributor

@brianteeman brianteeman commented Jul 25, 2016

Big batch of spelling and typos fixed according to style guide (99% are in comments and doc blocks)
https://joomla.github.io/user-interface-text/?user-interface-text/words2watch.md

@joomla-cms-bot joomla-cms-bot added Language Change This is for Translators PR-staging labels Jul 25, 2016
@jeckodevelopment
Copy link
Member

I have tested this item ✅ successfully on #11295
Good job @brianteeman

@jeckodevelopment jeckodevelopment added this to the Joomla 3.6.2 milestone Jul 25, 2016
@brianteeman brianteeman removed this from the Joomla 3.6.2 milestone Jul 25, 2016
@brianteeman
Copy link
Contributor Author

@jeckodevelopment Luca its best not to add the milestone until its marked RTC ;)

@RonakParmar
Copy link

I have tested this item ✅ successfully on 5302513


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

@alikon
Copy link
Contributor

alikon commented Jul 26, 2016

I have tested this item ✅ successfully on 5302513

code review


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

@brianteeman brianteeman added this to the Joomla 3.6.2 milestone Jul 26, 2016
@sonalitailored
Copy link

I have tested this item ✅ successfully on 5302513

I have tested this item successfully


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

@rdeutz
Copy link
Contributor

rdeutz commented Aug 13, 2016

@brianteeman could you have a look at the merge conflicts, thanks.

@brianteeman
Copy link
Contributor Author

@wilsonge @rdeutz i tried to resolve conflicts but i just made it worse and reverted my attempt

@rdeutz
Copy link
Contributor

rdeutz commented Aug 14, 2016

I tried to merge it but after fixing the conflicts I have seen that some changes recently made are overwritten e.G. travis.yml and the merge will delete the /tests/unit/unit.test.sh what is wrong. Maybe someone else can give it a try. One suggestion for future PR's, don't make PR's with 500+ files, when you can't be sure it gets merged very soon.

@brianteeman
Copy link
Contributor Author

brianteeman commented Aug 14, 2016 via email

@brianteeman
Copy link
Contributor Author

creating a new pr - should be quicker

Spelling merge conflict from @zero-24
@brianteeman
Copy link
Contributor Author

@zero-24 thanks for trying ;(

@zero-24
Copy link
Contributor

zero-24 commented Aug 14, 2016

please give me one more try.

@brianteeman
Copy link
Contributor Author

woohoo!!!

Thanks @zero-24

@rdeutz this should be ready to merge now

@andrepereiradasilva
Copy link
Contributor

722 files changed??

@brianteeman
Copy link
Contributor Author

Maybe I should continue with me redo of this PR - I am 50% there

@zero-24
Copy link
Contributor

zero-24 commented Aug 14, 2016

hmm sorry that it don't work @brianteeman :(

@brianteeman brianteeman mentioned this pull request Aug 14, 2016
@brianteeman
Copy link
Contributor Author

Closed - please try the redo #11604

@brianteeman brianteeman removed RTC This Pull Request is Ready To Commit Unit/System Tests labels Aug 14, 2016
@brianteeman brianteeman deleted the spelling branch August 14, 2016 16:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

9 participants