User tests: Successful: Unsuccessful:
Labels |
Added:
?
|
@smanzi is not only 5 bytes but also 1 string concatenation operation for php ;-) I do this. But i could create only PR for 1 file, the error.php. how can i add the index.php to the same? I use the github website's ui for making the pr.
This comment was created with the J!Tracker Application at issues.joomla.org/joomla-cms/5291.
I don't know... I've seen it: in error.php they use /index.php for home page... I guest it is not a big deal: it will work anyway, probably with just one more redirection, but I think it is OK to leave it as it is...
wrong title for this PR... error.php (protostar index.php)
no, title is correct, this pr did the error.php, next one does the index.php ... i have not found a way to do a pr for 2 files according to document "Using the Github UI to Make Pull Requests – Joomla! Documentation".
This comment was created with the J!Tracker Application at issues.joomla.org/joomla-cms/5291.
what? two PR for 2 files same issue?? noooo... just one PR!!!
sorry, too late ;-)
@richard67 You have a PR. marge it and index.php will show up
let me check...
Using the github UI to make a PR for more than one file is easy
1. Make the first edit. This automatically creates a fork under your account
2. Go to your fork and make the second edit and you will get a message on
completion to update the PR
3. all done
On 2 December 2014 at 22:23, Richard Fath notifications@github.com wrote:
no, title is correct, this pr did the error.php, next one does the
index.php ... i have not found a way to do a pr for 2 files according to
document "Using the Github UI to Make Pull Requests – Joomla!
Documentation".This comment was created with the J!Tracker Application
https://github.com/joomla/jissues at issues.joomla.org/joomla-cms/5291
http://issues.joomla.org/tracker/joomla-cms/5291.—
Reply to this email directly or view it on GitHub
#5291 (comment).
Brian Teeman
Co-founder Joomla! and OpenSourceMatters Inc.
http://brian.teeman.net/
I'll kill #5292 and make changes in this one... is that possible @brianteeman using GitHub UI?
Sorry, meanwhile we have 2 PRs and so 2 new tracker items ... those would have to be closed, too ... really sorry for that.
no problem Richard, you can close the PR yourself and then give it a second try....
do you have skype and teamviewer?
skype yes, but not started normally, and no teamviewer. i see that there are 2 branches on my repository: the one automatically created when i first edited error.php - this i renamed then to staging - and there i wanted to edit index.php, for which automatically another branch patch-3 was created. my first problem is to navigate to a certain branch in the github ui. and when you say i shall close the 2nd pr, shall i do this on github or in the tracker?
OK...
first of all, close the PR you wish here!
You said that you renamed one of the branch "staging"? BAD choice (and I don't even know how you could have done that...)! Forget that branch and close the PR associated to that branch here, in GitHub (you should see a close button or "comment and close")
Then go to the other branch: you chose branch by going to your main repo in GitHub and select correct branch from the drop down:
then... whatever is the file you already edited in that branch... leave it alone. Modify the other file, save, it... done!
Title |
|
Perfect, now this is the good one...
You can close the other (if you don't have already done that)
you made it, OK!
oops... mad=made!!! sorry!!!
hmm, no, not made all ... the branch of this good one is still the one called staging ... but everything else seems to be ok.
If Travis has nothing to complain about (I don't think so...) you're all set. Just remember of not closing/modifying the branch in your repo where you made this changes...
no problem... leave it alone: just don't make any further mods to YOUR 'staging' until this PR has been merged...
ok ... long story small change ;-)
we all have to learn... it's OK!
but... my advice is to install GitHub in your PC and work there! Win or Mac?
(but don't do anything until this has been merged. soon we all hope...)
Well, I'll do nothing on this branch and this repository until merged, and then I will clean it up. And as soon as I find a bit time I'll set up my windows 7 PC for a testing workstation. There is good documentation on this on the developers doc site.
This comment was created with the J!Tracker Application at issues.joomla.org/joomla-cms/5291.
OK... Travis seems to be quite busy at this time, but don't worry...
Tomorrow or later tonight I'll test your PR... be confident!
AH, OK! Travis too is happy!!!
just travis has finished - so welcome to testing
Sorry no time for testing right now... later!
oh, i see it is late ... 00.28 CET ... have holiday here so did not keep an eye on it ... of course testing can wait until tomorrow ;-) good night
This comment was created with the J!Tracker Application at issues.joomla.org/joomla-cms/5291.
holiday? where in the world?
Germany, but not a public holiday ... only one of these 30 days annual leave we have, and I have to take all before year ends.
'night!
@test success
URLs for site title in protostar (tested in article view) are:
Without this PR
SEF: <a class="brand pull-left" href="/">
NON SEF: <a class="brand pull-left" href=""> <--- ERROR!
With this PR
SEF: <a class="brand pull-left" href="/">
NON SEF: <a class="brand pull-left" href="/"> <--- OK!
congrats @richard67
@test Issue confirmed and fix resolves it
This comment was created with the J!Tracker Application at issues.joomla.org/joomla-cms/5291.
Status | Pending | ⇒ | Ready to Commit |
Setting RTC
This comment was created with the J!Tracker Application at issues.joomla.org/joomla-cms/5291.
Labels |
Added:
?
|
Status | Ready to Commit | ⇒ | Closed |
Closed_Date | 0000-00-00 00:00:00 | ⇒ | 2014-12-05 09:01:42 |
@richard67 Congrats! You can now start tinkering with your forked repo and GitHub for Windows! ping me on skype (sergiomanzi) if you need help: I'm no expert, but I managed to have it do what is needed here...
@infograf768 and @richard67 I'm afraid there are big issues with this merged PR
The PR should have been a modification to index.php and error.php in Protostar template (and at a moment it was....)
Unhappily later-on (after testing!) @richard67 made what I think is a big mistake and merged the branch he was working on ('staging' in is forked repo) with upstream staging. The effect has been that the two modifications he originally made and were tested have been reverted.
Strange thing is that I see the mods here in the diff, but after having synced my forked repo with upstream I don't see them and I don't see them even in current codebase:
https://github.com/joomla/joomla-cms/blob/staging/templates/protostar/index.php
https://github.com/joomla/joomla-cms/blob/staging/templates/protostar/error.php
WARNING! In my forked repo I also see that several other unrelated files are affected... !!
This PR has been deleted by @richard67 in his other PR as he used the same branch and updated it to staging by mistake.
Nothing broken. But this PR has to be recreated.
OK, I'm going to take care of that: will post new PR number here when ready...
@infograf768 New PR is #5328, ready to merge if you want...
@smanzi @infograf768 Thanks for realizing and fixing my mistake (blush). I thought I did synch with joomla:staging in the right way, but seems i didn't. But what was strange: The PR still looked ok, so I thought merging from upstream was the right way. How do you keep your personal repository fork up to date / in synch?
Labels |
Removed:
?
|
... if you want to spare 5 bytes you can do
href="<?php echo $this->baseurl ?>/"
...