Commit Graph

458 Commits

Author SHA1 Message Date
arcadius3d
2087293035 Resolved conflict in index.html by combining both explanations 2017-06-15 22:01:24 -03:00
arcadius3d
912c21cc2c Fixed merge conflicts 2017-06-15 21:51:07 -03:00
Samuel Shifterovich
99f1c80f0b Merge pull request #229 from LizMcIntyre/patch-1
Change StartMail "Accepted" Bitcoin color from blue to green
2017-06-06 16:37:11 +02:00
Liz McIntyre
d14f3a9fd1 Update index.html
Edit to line 1178 - changed "primary" to "success" in order to change color of term "Accepted" to green. It shouldn't be blue.
2017-06-05 22:58:28 -05:00
Samuel Shifterovich
7f406471be Merge pull request #227 from LizMcIntyre/master
StartMail and Ixquick.eu update
2017-06-05 15:55:44 +02:00
Liz McIntyre
a148fdbca7 StartMail and Ixquick.eu update
Email section: StartMail now accepts Bitcoin. Changed to "Accepted"

Search Engine section, worth mentioning:

Ixquick.eu is based in the Netherlands only. Not the US. (Ixquick
originated in the US, but was acquired by Surfboard Holding B.V, a
privately held Dutch corporation, in 2000. It is based in the
Netherlands, outside of US jurisdiction.)
2017-06-01 19:44:59 -05:00
Victorhck
49cfc30a88 Merge branch 'master' of https://github.com/privacytoolsIO/privacytools.io 2017-06-01 18:05:20 +02:00
Samuel Shifterovich
de039f6fa5 Merge pull request #225 from b-harper/update-VeraCrypt-url
update VeraCrypt url
2017-05-28 21:48:02 +02:00
b-harper
02cae541ac update VeraCrypt url
CodePlex is shutting down and the VeraCrypt project is moving to veracrypt.fr.
2017-05-28 12:37:37 -05:00
Samuel Shifterovich
2029720489 Merge pull request #222 from mobitar/master
Added Standard Notes to Digital Notebooks
2017-05-25 23:28:13 +02:00
Mo Bitar
f7a160b042
Added Standard Notes to Digital Notebooks 2017-05-25 15:41:42 -05:00
Samuel Shifterovich
5d01c4b9f4 Replace CyanogenMod with Lineage OS 2017-05-21 14:30:46 +02:00
Victorhck
6c1f3e2976 Merge branch 'master' of https://github.com/privacytoolsIO/privacytools.io 2017-05-08 17:10:10 +02:00
arcadius3d
220bc7149b Add files via upload 2017-05-01 23:18:56 -03:00
arcadius3d
cef7459c91 Delete LineageOS.png 2017-05-01 23:18:14 -03:00
arcadius3d
31e210ff31 Merge pull request #1 from arcadius3d/patch-1
Patch 1
2017-05-01 23:05:58 -03:00
arcadius3d
4593165c4a Add files via upload 2017-05-01 22:58:46 -03:00
arcadius3d
c3988d42ad Delete CyanogenMod.png 2017-05-01 22:58:32 -03:00
arcadius3d
0e45c4a6ba Delete CyanogenMod.png 2017-05-01 22:55:25 -03:00
arcadius3d
e0fc4bf088 Add files via upload 2017-05-01 22:54:55 -03:00
arcadius3d
19981dfb43 Delete tmp_2599-LineageOS2094440467.png 2017-05-01 22:54:21 -03:00
arcadius3d
33bcbae5a9 Add files via upload 2017-05-01 22:50:52 -03:00
arcadius3d
11b4820c6e Update index.html 2017-05-01 22:33:08 -03:00
Samuel Shifterovich
cfd33cea73 Merge pull request #217 from Shifterovich/remove-doublehop
Remove doublehop.me
2017-04-15 16:04:34 +02:00
Samuel Shifterovich
dad648a470 Remove doublehop.me 2017-04-15 16:01:07 +02:00
Samuel Shifterovich
cb2a100df7 Merge pull request #213 from mpcsh/master
Update Wire entries to reflect Linux support
2017-04-11 20:36:41 +02:00
Mark Cohen
3350c91f7a Oops, there were two entries! 2017-04-11 12:04:44 -05:00
Mark Cohen
90774b5d13 Update Wire's OS line to reflect Linux support 2017-04-11 11:58:54 -05:00
Samuel Shifterovich
fca267e7cc Merge pull request #210 from mat1th/fix/readme
fix headings in the readme.md
2017-04-07 21:31:44 +02:00
Samuel Shifterovich
a00904fa2a Merge pull request #211 from NinebitX/patch-2
Fixed button colors
2017-04-07 21:30:53 +02:00
NinebitX
e9b3a142b9 Fixed button colors
Some button colors got mixed up as a result of an earlier reordering.
2017-04-07 21:26:54 +02:00
mat1th
e2a2d461c0 fix headings in the readme.md
The headings in the readme.md didn't show properly on GitHub. So I've fixed that.
2017-04-07 21:05:26 +02:00
Samuel Shifterovich
763fe23e2b Merge pull request #205 from NinebitX/master
Update Signal logo and entries w/ APK link
2017-04-07 21:03:55 +02:00
NinebitX
0e359a7fb1 Less chaotic sentences 2017-04-07 19:28:19 +02:00
Samuel Shifterovich
dd1f2c4fe7 Merge pull request #192 from mat1th/feature/add-wire
Add wire to the chat apps;
2017-04-07 15:09:14 +02:00
Kewde
64926864d9 Fix language nnit
a -> an
2017-04-07 11:24:24 +00:00
privacytoolsIO
47e255ca3f fixed link 2017-04-07 07:22:31 +08:00
Samuel Shifterovich
e4d86d6699 Merge pull request #204 from WildYorkies/patch-1
Remove Encryptr
2017-04-06 14:51:58 +02:00
Samuel Shifterovich
9a21e69d08 Merge pull request #181 from ymhuang0808/add-tw-flag
Add Taiwan flag
2017-04-04 18:01:00 +02:00
Samuel Shifterovich
06028a3616 Merge pull request #208 from louiswolfers/patch-1
Fixed broken link
2017-03-27 22:37:12 +02:00
Louis Wolfers
00892acb36 Fixed broken link
The "How Unique Is Your Web Browser?" was broken.
2017-03-27 20:35:31 +02:00
NinebitX
9f443c7d23 Made the description a bit more compact 2017-03-24 00:28:53 +01:00
Samuel Shifterovich
60df0d90df Update link to Tor mirror 2017-03-23 15:39:11 +01:00
NinebitX
87e0fcd43d Update Signal entries and add APK link
The titles and descriptions in the Signal entries were inconsistent with each other. It's also cleaner and more consistent with the other entries to only display one download link. I added a link to the Signal APK download site to the Related Information sections, because PrivacytoolsIO recommends operating systems that don't include Google Play, and the Signal APK download site isn't linked to directly from the signal.org front page.
2017-03-23 15:37:41 +01:00
Cale
cc1dad8a93 Remove Encryptr
Per https://github.com/privacytoolsIO/privacytools.io/issues/203
2017-03-23 10:32:35 -04:00
NinebitX
82ae8a358f Updated Open-Whisper-Systems.png 2017-03-23 15:19:06 +01:00
Samuel Shifterovich
b7fadc47b7 Fix I2P address helper 2017-03-22 18:02:50 +01:00
Victorhck
308f6c3ae5 Merge remote-tracking branch 'origin/master' 2017-03-22 18:00:38 +01:00
privacytoolsIO
29e69f4d52 Removed Piwik Code 2017-03-21 00:49:25 +08:00
Burung Hantu
c291a55e5c Merge pull request #200 from mitchellcash/pr_template
Add a Pull Request template
2017-03-21 00:31:11 +08:00