@dgt41 your last recommendation made Travis sad. I dont know the best way to make Travis happy again

Arrrg, the last edit exceeds the allowed characters per line. But don’t try to do anything I will make a PR here shortly to sort this out

I am not trying to do anything.

@brianteeman Brian check brianteeman#13

@dgt41 merged

I have tested this item successfully on 032f4f4

I have tested this item successfully on 032f4f4
It is common sense and looks SO MUCH BETTER in limited width environments (narrow windows, double column edit pages, mobile phones etc). +1 from me.

Thanks for testing - setting RTC

@dgt41 This PR conflicts with your other PR #7170 which is merged. Can you check how this relates to your PR and if it is still applicable? Thanks.

where is the conflict - github isnt showing it to me

Unless @dgt41 changed his PR then it should be fine as it was tested with it

@brianteeman The conflict is not shown here because the PR is against staging and I am going to merge it into the 3.5-dev branch. In the 3.5-dev branch another Tiny PR by @dgt41 has already been merged.

The conflict is here:
This PR:
https://github.com/joomla/joomla-cms/pull/7593/files#diff-d93fcfa294cc59e70963805efe9f303bR619

Other PR:
https://github.com/joomla/joomla-cms/pull/7170/files#diff-d93fcfa294cc59e70963805efe9f303bR625

same lines have been changed.

Ah ok - thanks checking against 3.5-dev now the patch is still needed but it does indeed conflict and revert the changes made by @dgt41 in #7170

Rebasing this PR is beyond my skillset (I never get it right) so can someone do a PR against my branch to update it - its a simple update - thanks

@brianteeman a rebase is not needed, if @dgt41 can do a PR against your branch we should be good to go. Thanks.

I meant have used the wrong terminology ;)

On 24 October 2015 at 12:09, RolandD notifications@github.com wrote:

@brianteeman https://github.com/brianteeman a rebase is not needed, if
@dgt41 https://github.com/dgt41 can do a PR against your branch we
should be good to go. Thanks.

—
Reply to this email directly or view it on GitHub
#7593 (comment).

Brian Teeman
Co-founder Joomla! and OpenSourceMatters Inc.
http://brian.teeman.net/

@brianteeman this pr is against staging the conflict comes with #7170 which is merged in 3.5-dev. I think if you rebadge this against 3.5-Dev then the conflict will be revealed

@dgt41 Brian doesn't know how to rebase against 3.5-dev. My question is, can you provide a PR against this branch that solves the conflicts?

Looks like the PR @dgt41 did on ym repo just broke it even more

Closing as we have a new PR here #8159