idk/i2p.plugins.firefox
1
0
Fork 0
Code Issues 5 Pull Requests Actions Packages Projects Releases Wiki Activity

fix merge conflicts

Browse Source
This commit is contained in:
idk
2023-07-06 15:12:11 -04:00
parent fffba3dd6d 7cdf84bb26
commit aa95cab914
26 changed files with 135 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
docs/BUILD.html
View File

@ -542,8 +542,13 @@ if (i2pIsRunning()) {
</span>
<ul>
<li>
<<<<<<< HEAD
<a href="https://i2pgit.org/idk/i2p.plugins.firefox">
Source Repository: (https://i2pgit.org/idk/i2p.plugins.firefox)
=======
<a href="https://github.com/eyedeekay/i2p.plugins.firefox">
Source Repository: (https://github.com/eyedeekay/i2p.plugins.firefox)
>>>>>>> 7cdf84bb265e7fda5b98d2386dab1855de8383eb
</a>
</li>
</ul>

5
docs/I2PBrowser.html
View File

@ -1191,8 +1191,13 @@
</span>
<ul>
<li>
<<<<<<< HEAD
<a href="https://i2pgit.org/idk/i2p.plugins.firefox">
Source Repository: (https://i2pgit.org/idk/i2p.plugins.firefox)
=======
<a href="https://github.com/eyedeekay/i2p.plugins.firefox">
Source Repository: (https://github.com/eyedeekay/i2p.plugins.firefox)
>>>>>>> 7cdf84bb265e7fda5b98d2386dab1855de8383eb
</a>
</li>
</ul>

5
docs/I2PChromium.html
View File

@ -1041,8 +1041,13 @@
</span>
<ul>
<li>
<<<<<<< HEAD
<a href="https://i2pgit.org/idk/i2p.plugins.firefox">
Source Repository: (https://i2pgit.org/idk/i2p.plugins.firefox)
=======
<a href="https://github.com/eyedeekay/i2p.plugins.firefox">
Source Repository: (https://github.com/eyedeekay/i2p.plugins.firefox)
>>>>>>> 7cdf84bb265e7fda5b98d2386dab1855de8383eb
</a>
</li>
</ul>

5
docs/I2PChromiumProfileBuilder.html
View File

@ -375,8 +375,13 @@
</span>
<ul>
<li>
<<<<<<< HEAD
<a href="https://i2pgit.org/idk/i2p.plugins.firefox">
Source Repository: (https://i2pgit.org/idk/i2p.plugins.firefox)
=======
<a href="https://github.com/eyedeekay/i2p.plugins.firefox">
Source Repository: (https://github.com/eyedeekay/i2p.plugins.firefox)
>>>>>>> 7cdf84bb265e7fda5b98d2386dab1855de8383eb
</a>
</li>
</ul>

5
docs/I2PChromiumProfileChecker.html
View File

@ -348,8 +348,13 @@
</span>
<ul>
<li>
<<<<<<< HEAD
<a href="https://i2pgit.org/idk/i2p.plugins.firefox">
Source Repository: (https://i2pgit.org/idk/i2p.plugins.firefox)
=======
<a href="https://github.com/eyedeekay/i2p.plugins.firefox">
Source Repository: (https://github.com/eyedeekay/i2p.plugins.firefox)
>>>>>>> 7cdf84bb265e7fda5b98d2386dab1855de8383eb
</a>
</li>
</ul>

5
docs/I2PChromiumProfileUnpacker.html
View File

@ -266,8 +266,13 @@
</span>
<ul>
<li>
<<<<<<< HEAD
<a href="https://i2pgit.org/idk/i2p.plugins.firefox">
Source Repository: (https://i2pgit.org/idk/i2p.plugins.firefox)
=======
<a href="https://github.com/eyedeekay/i2p.plugins.firefox">
Source Repository: (https://github.com/eyedeekay/i2p.plugins.firefox)
>>>>>>> 7cdf84bb265e7fda5b98d2386dab1855de8383eb
</a>
</li>
</ul>

5
docs/I2PCommonBrowser.html
View File

@ -960,8 +960,13 @@
</span>
<ul>
<li>
<<<<<<< HEAD
<a href="https://i2pgit.org/idk/i2p.plugins.firefox">
Source Repository: (https://i2pgit.org/idk/i2p.plugins.firefox)
=======
<a href="https://github.com/eyedeekay/i2p.plugins.firefox">
Source Repository: (https://github.com/eyedeekay/i2p.plugins.firefox)
>>>>>>> 7cdf84bb265e7fda5b98d2386dab1855de8383eb
</a>
</li>
</ul>

5
docs/I2PFirefox.html
View File

@ -1132,8 +1132,13 @@
</span>
<ul>
<li>
<<<<<<< HEAD
<a href="https://i2pgit.org/idk/i2p.plugins.firefox">
Source Repository: (https://i2pgit.org/idk/i2p.plugins.firefox)
=======
<a href="https://github.com/eyedeekay/i2p.plugins.firefox">
Source Repository: (https://github.com/eyedeekay/i2p.plugins.firefox)
>>>>>>> 7cdf84bb265e7fda5b98d2386dab1855de8383eb
</a>
</li>
</ul>

5
docs/I2PFirefoxProfileBuilder.html
View File

@ -473,8 +473,13 @@
</span>
<ul>
<li>
<<<<<<< HEAD
<a href="https://i2pgit.org/idk/i2p.plugins.firefox">
Source Repository: (https://i2pgit.org/idk/i2p.plugins.firefox)
=======
<a href="https://github.com/eyedeekay/i2p.plugins.firefox">
Source Repository: (https://github.com/eyedeekay/i2p.plugins.firefox)
>>>>>>> 7cdf84bb265e7fda5b98d2386dab1855de8383eb
</a>
</li>
</ul>

5
docs/I2PFirefoxProfileChecker.html
View File

@ -480,8 +480,13 @@
</span>
<ul>
<li>
<<<<<<< HEAD
<a href="https://i2pgit.org/idk/i2p.plugins.firefox">
Source Repository: (https://i2pgit.org/idk/i2p.plugins.firefox)
=======
<a href="https://github.com/eyedeekay/i2p.plugins.firefox">
Source Repository: (https://github.com/eyedeekay/i2p.plugins.firefox)
>>>>>>> 7cdf84bb265e7fda5b98d2386dab1855de8383eb
</a>
</li>
</ul>

5
docs/I2PFirefoxProfileUnpacker.html
View File

@ -270,8 +270,13 @@
</span>
<ul>
<li>
<<<<<<< HEAD
<a href="https://i2pgit.org/idk/i2p.plugins.firefox">
Source Repository: (https://i2pgit.org/idk/i2p.plugins.firefox)
=======
<a href="https://github.com/eyedeekay/i2p.plugins.firefox">
Source Repository: (https://github.com/eyedeekay/i2p.plugins.firefox)
>>>>>>> 7cdf84bb265e7fda5b98d2386dab1855de8383eb
</a>
</li>
</ul>

5
docs/I2PGenericUnsafeBrowser.html
View File

@ -669,8 +669,13 @@
</span>
<ul>
<li>
<<<<<<< HEAD
<a href="https://i2pgit.org/idk/i2p.plugins.firefox">
Source Repository: (https://i2pgit.org/idk/i2p.plugins.firefox)
=======
<a href="https://github.com/eyedeekay/i2p.plugins.firefox">
Source Repository: (https://github.com/eyedeekay/i2p.plugins.firefox)
>>>>>>> 7cdf84bb265e7fda5b98d2386dab1855de8383eb
</a>
</li>
</ul>

9
docs/LINUX.html
View File

@ -166,7 +166,11 @@
</code>
</h4>
<pre><code class="language-sh">mkdir ~/tmp-i2pbrowser &amp;&amp; cd ~/tmp-i2pbrowser
<<<<<<< HEAD
wget https://github.com/eyedeekay/i2p.plugins.firefox/releases/download/1.0.9/i2pbrowser.tar.gz
=======
wget https://github.com/eyedeekay/i2p.plugins.firefox/releases/download/1.1.0/i2pbrowser.tar.gz
>>>>>>> 7cdf84bb265e7fda5b98d2386dab1855de8383eb
tar xvzf i2pbrowser.tar.gz &amp;&amp; cd i2pbrowser
## THIS STEP IS OPTIONAL but it will force the system to use Tor Browser from within the i2pbrowser directory.
# This probably offers better security than vanilla Firefox.
@ -256,8 +260,13 @@ tar xvzf i2pbrowser.tar.gz &amp;&amp; cd i2pbrowser
</span>
<ul>
<li>
<<<<<<< HEAD
<a href="https://i2pgit.org/idk/i2p.plugins.firefox">
Source Repository: (https://i2pgit.org/idk/i2p.plugins.firefox)
=======
<a href="https://github.com/eyedeekay/i2p.plugins.firefox">
Source Repository: (https://github.com/eyedeekay/i2p.plugins.firefox)
>>>>>>> 7cdf84bb265e7fda5b98d2386dab1855de8383eb
</a>
</li>
</ul>

2
docs/LINUX.md
View File

@ -7,7 +7,7 @@ Linux. These packages are for the **`amd64`** architecture.
```sh
mkdir ~/tmp-i2pbrowser && cd ~/tmp-i2pbrowser
wget https://github.com/eyedeekay/i2p.plugins.firefox/releases/download/1.0.9/i2pbrowser.tar.gz
wget https://github.com/eyedeekay/i2p.plugins.firefox/releases/download/1.1.0/i2pbrowser.tar.gz
tar xvzf i2pbrowser.tar.gz && cd i2pbrowser
## THIS STEP IS OPTIONAL but it will force the system to use Tor Browser from within the i2pbrowser directory.
# This probably offers better security than vanilla Firefox.

9
docs/OSX.html
View File

@ -159,7 +159,11 @@
file with any Java greater than Java 8.
</p>
<pre><code class="language-sh">mkdir ~/tmp-i2pfirefox &amp;&amp; cd ~/tmp-i2pfirefox
<<<<<<< HEAD
wget https://github.com/eyedeekay/i2p.plugins.firefox/releases/download/1.0.9/i2pfirefox.zip
=======
wget https://github.com/eyedeekay/i2p.plugins.firefox/releases/download/1.1.0/i2pfirefox.zip
>>>>>>> 7cdf84bb265e7fda5b98d2386dab1855de8383eb
unzip i2pfirefox.zip
./cmd/i2pfirefox.cmd
@ -205,8 +209,13 @@ export JAVA_HOME=`/usr/libexec/java_home -v 17`
</span>
<ul>
<li>
<<<<<<< HEAD
<a href="https://i2pgit.org/idk/i2p.plugins.firefox">
Source Repository: (https://i2pgit.org/idk/i2p.plugins.firefox)
=======
<a href="https://github.com/eyedeekay/i2p.plugins.firefox">
Source Repository: (https://github.com/eyedeekay/i2p.plugins.firefox)
>>>>>>> 7cdf84bb265e7fda5b98d2386dab1855de8383eb
</a>
</li>
</ul>

2
docs/OSX.md
View File

@ -7,7 +7,7 @@ packages. You can use the `.jar` file with any Java greater than Java 8.
```sh
mkdir ~/tmp-i2pfirefox && cd ~/tmp-i2pfirefox
wget https://github.com/eyedeekay/i2p.plugins.firefox/releases/download/1.0.9/i2pfirefox.zip
wget https://github.com/eyedeekay/i2p.plugins.firefox/releases/download/1.1.0/i2pfirefox.zip
unzip i2pfirefox.zip
./cmd/i2pfirefox.cmd

5
docs/WINDOWS.html
View File

@ -278,8 +278,13 @@
</span>
<ul>
<li>
<<<<<<< HEAD
<a href="https://i2pgit.org/idk/i2p.plugins.firefox">
Source Repository: (https://i2pgit.org/idk/i2p.plugins.firefox)
=======
<a href="https://github.com/eyedeekay/i2p.plugins.firefox">
Source Repository: (https://github.com/eyedeekay/i2p.plugins.firefox)
>>>>>>> 7cdf84bb265e7fda5b98d2386dab1855de8383eb
</a>
</li>
</ul>