Rebrand candidate files #263

Jaifroid · 2017-06-21T19:58:30Z

Implements #262

mossroy

There are a few "-html5" strings that we can not modify for now (see review details). I would advise to rename what we can for now, and create new issues for what should be done later

mossroy · 2017-06-21T21:25:15Z

manifest.json

@@ -29,7 +29,7 @@

    "applications": {
        "gecko": {
-            "id": "kiwix-html5[email protected]"
+            "id": "kiwix-js[email protected]"


At least for now, we need to keep this id untouched, else Firefox will probably consider the new versions as a different addon, and will probably won't do the upgrade for end-users

mossroy · 2017-06-21T21:26:37Z

scripts/package_firefox_extension.sh

@@ -53,7 +53,7 @@ if [ "${TAG}zz" == "zz" ]; then
 else
    # When packaging a public version, we need to prepare a 'listed' extension package to submit to Mozilla
    echo "Replacing the Firefox 'unlisted' extension id by the 'listed' one to be accepted by Mozilla"
-    sed -i -e "s/kiwix-html5[email protected]/kiwix-html5[email protected]/" manifest.json
+    sed -i -e "s/kiwix-js[email protected]/kiwix-js[email protected]/" manifest.json


This needs to be kept as it is for now (see previous comment on the Firefox addon id)

mossroy · 2017-06-21T21:30:17Z

scripts/package_chrome_extension.sh

@@ -18,7 +18,7 @@ cd ..
 if [ "${TAG}zz" == "zz" ]; then
    # Package the extension with Chromium, if we're not packaging a public version
    echo "Signing the extension for Chrome with a local Chromium, version $VERSION"
-    chromium-browser --no-sandbox --pack-extension=tmp --pack-extension-key=./scripts/kiwix-html5.pem
+    chromium-browser --no-sandbox --pack-extension=tmp --pack-extension-key=./scripts/kiwix-js.pem


This one will be more complicated to change, because it involves a "secret" file (kiwix-html5.pem), which is not commited, and included (for Travis) in an encrypted form inside secret_files.tar.gz.enc.

mossroy · 2017-06-21T21:33:37Z

README.md

@@ -1,4 +1,4 @@
-kiwix-html5
+kiwix-JS


Maybe with an uppercase on the K, to follow #248 (comment)

Jaifroid · 2017-06-22T05:50:05Z

OK, I've reverted those changes. @mossroy please double check.

mossroy

There is still one occurrence of the string "-html5" that we need to keep

mossroy · 2017-06-22T07:27:39Z

scripts/package_firefox_extension.sh

@@ -53,7 +53,7 @@ if [ "${TAG}zz" == "zz" ]; then
 else
    # When packaging a public version, we need to prepare a 'listed' extension package to submit to Mozilla
    echo "Replacing the Firefox 'unlisted' extension id by the 'listed' one to be accepted by Mozilla"
-    sed -i -e "s/[email protected]/kiwix-html5[email protected]/" manifest.json
+    sed -i -e "s/[email protected]/kiwix-js[email protected]/" manifest.json


This should not be modified either, as "[email protected]" is the id known by Mozilla to distribute the addon

mossroy · 2017-06-22T19:24:55Z

This looks good to me.
One extra "HTML5" string can be replaced by "JS" in the subject of the mailto: link, line 137 of index.html, but it's minor.
In any case, I think this PR is a great candidate for you to practice squashing all the commits into a single one :-)

Implements #262

…wix-js into Rebrand-candidate-files

Jaifroid · 2017-06-23T08:34:05Z

Well, I did the "rebase -i master" command on my local machine, changed the commits to "f" (other than the first, which I kept as "p"), saved, got the response "Successfully rebased and updated refs/heads/Rebrand-candidate-files", then pushed to the server. But it doesn't look any different here. How do I know that the rebase and squash worked? Is it just that some of the earlier commits now have "Show outdated" next to them? Also, is there any advantage in squashing locally rather than using the "squash and merge" command here (down arrow next to "Merge pull request" button)?

mossroy · 2017-06-23T19:45:48Z

The file changes are OK for me, but the commits are not squashed.
If they were, the PR on github would display the same file changes, but in only one commit.
The "outdated" parts are the discussions we had on parts of the code that have been modified since then. They are outdated because you did the changes I asked.

Locally on your computer, if you type "git log", do you still see the "revert" commits you did?
If you don't see them any more, it's only a matter of pushing. Try again to push with "--force" option, which is required after rebase or squash.
If you still see them, it means you did not squash properly on your computer (but the steps you mentioned seem ok to me).

Doing the squash from github would work in this case. It means the squash will only be done on github, not in your local branch (which should not be an issue in this case).
If you don't manage to do the squash, I can do that if you prefer, no problem.

Doing the squash locally have a few advantages in my opinion :

it separates squashing (which should be done by the developer, who chooses the right way to "merge" the commit messages) and merging (which should be done by the reviewer)
it enables squashing and rebasing at the same time (it does not seem to be possible to do both in github interface)
it makes people learn a way that will work with any git repo (not necessarily github)

Jaifroid · 2017-06-24T12:06:58Z

I think I must have messed something up. They're squashed on my local machine, but "git push --force Rebrand-candidate files" results in:

fatal: You are not currently on a branch.
To push the history leading to the current (detached HEAD)
state now, use

    git push Rebrand-candidate-files HEAD:<name-of-remote-branch>

The suggested command (with substituted branch name) results in:

fatal: 'Rebrand-candidate-files' does not appear to be a git repository
fatal: Could not read from remote repository.

Please make sure you have the correct access rights
and the repository exists.

I can't retrace what I did the first time I attempted this, and clearly my local repository is in a strange state now. So to avoid doing something catastrophic, I'm going to squash and merge these changes, and re-clone my repo in a clean state! Will try again next time... Thanks for your help.

mossroy · 2017-06-24T14:16:18Z

All right, no problem

mossroy · 2017-06-24T14:17:01Z

You also can delete the branch, with the button github provides here

Jaifroid · 2017-06-24T14:33:56Z

Ah yes, sorry I forgot. Done now.

Rebrand candidate files

dca18b0

Implements #262

Jaifroid mentioned this pull request Jun 21, 2017

Rebrand the app as "Kiwix JS" #262

Closed

Jaifroid requested a review from mossroy June 21, 2017 20:28

Jaifroid added the enhancement label Jun 21, 2017

mossroy suggested changes Jun 21, 2017

View reviewed changes

Reverted some refs to kiwix-html5

c185348

mossroy suggested changes Jun 22, 2017

View reviewed changes

Revert email for FFOS

3f5a086

Jaifroid added 3 commits June 23, 2017 08:23

Changed HTML5 in email header

78a815a

Rebrand candidate files

122d3ff

Implements #262

Merge branch 'Rebrand-candidate-files' of https://github.com/kiwix/ki…

ef0a8ac

…wix-js into Rebrand-candidate-files

Jaifroid merged commit f038c49 into master Jun 24, 2017

Jaifroid deleted the Rebrand-candidate-files branch June 24, 2017 14:33

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rebrand candidate files #263

Rebrand candidate files #263

Jaifroid commented Jun 21, 2017

mossroy left a comment

mossroy Jun 21, 2017

mossroy Jun 21, 2017

mossroy Jun 21, 2017

mossroy Jun 21, 2017

Jaifroid commented Jun 22, 2017

mossroy left a comment

mossroy Jun 22, 2017

Jaifroid Jun 22, 2017

mossroy commented Jun 22, 2017

Jaifroid commented Jun 23, 2017

mossroy commented Jun 23, 2017

Jaifroid commented Jun 24, 2017 •

edited

Loading

mossroy commented Jun 24, 2017

mossroy commented Jun 24, 2017

Jaifroid commented Jun 24, 2017

		@@ -1,4 +1,4 @@
		kiwix-html5
		kiwix-JS

Rebrand candidate files #263

Rebrand candidate files #263

Conversation

Jaifroid commented Jun 21, 2017

mossroy left a comment

Choose a reason for hiding this comment

mossroy Jun 21, 2017

Choose a reason for hiding this comment

mossroy Jun 21, 2017

Choose a reason for hiding this comment

mossroy Jun 21, 2017

Choose a reason for hiding this comment

mossroy Jun 21, 2017

Choose a reason for hiding this comment

Jaifroid commented Jun 22, 2017

mossroy left a comment

Choose a reason for hiding this comment

mossroy Jun 22, 2017

Choose a reason for hiding this comment

Jaifroid Jun 22, 2017

Choose a reason for hiding this comment

mossroy commented Jun 22, 2017

Jaifroid commented Jun 23, 2017

mossroy commented Jun 23, 2017

Jaifroid commented Jun 24, 2017 • edited Loading

mossroy commented Jun 24, 2017

mossroy commented Jun 24, 2017

Jaifroid commented Jun 24, 2017

Jaifroid commented Jun 24, 2017 •

edited

Loading