5160 Commits

Author SHA1 Message Date
Martijn van der Ven
7424bdfd30 Update Request Policy to link to the new repository. 2015-09-20 13:49:25 +02:00
Martijn van der Ven
c4b4441c25 Use correct SPDX short identifier. 2015-09-20 12:49:37 +02:00
Caleb Maclennan
0f724d4f59 Adopt a Code of Conduct for project participants
PRISM-Break is largely driven by community participation in discussions
surrounding the inclusion or exclusion of various solutions. Given that
user privacy is (by definition) a very personal matter and that the
security community in general tends to have strong opinions, my
observation is that many issues that come up are fairly highly changed
even before somebody looses their cool or makes a nasty remark.

I think it would behoove the project to officially adopt a Code of
Conduct document that can be considered binding on participants in
discussion. Getting this into the repository early before any particular
major issue between participants comes up gives everybody something to
reference and a relative standard by with to judge a situation. This
could potentially save some grief vs. the possibility of working out the
details of such a code in the middle of a disputed discussion.

The Open Code of Conduct seems like a likely candidate. I'm not a huge
fan of some of the items as worded but for this project I think it will
be fine. See http://todogroup.org/opencodeofconduct/ for details.
2015-09-16 11:06:13 +03:00
Peng Zhong
146cb6a1b5 Merge pull request #1394 from vyp/#1393
Synchronize added metadata from b32c856 (#1393) for Ixquick and
2015-09-10 22:58:12 +09:00
Peng Zhong
184de25aef Merge pull request #1396 from vyp/#1395
Update broken Enigmail license url
2015-09-05 14:57:43 +09:00
rws
34bad1874b Update broken Enigmail license url
Ref #1395.
2015-09-05 15:49:29 +10:00
Peng Zhong
cb03d39483 Merge pull request #1395 from vyp/#1313
Update some SourceForge links
2015-09-05 10:46:48 +09:00
rws
4a134d7990 Update some SourceForge links
Updated projects include:

- Mumble.
- Retroshare.
- Seeks.

Ref #1313.
2015-09-05 02:00:34 +10:00
rws
a7eb2c5b05 Synchronize added metadata from b32c856 (#1393) for Ixquick and
Startpage

This commit also changes "It also provides [...]" in the "notes" section
for Startpage to "Ixquick also provides [...]" so that there's less
confusion as to which project provides the service, despite the name of
the service giving it away anyway.

Ref #1376.
2015-09-05 00:39:08 +10:00
Peng Zhong
b32c856df2 Merge pull request #1393 from simonasd/patch-1
add some "notes" for zh-CN and en
2015-09-04 22:56:57 +09:00
simonasd
cdb0924a33 Merge pull request #1 from simonasd/patch-2
Update en-projects.json
2015-09-04 21:48:14 +08:00
simonasd
5b356a30a9 Update en-projects.json
add notes for Ixquick and Startpage.
2015-09-04 21:42:06 +08:00
simonasd
d4f03bfa90 Update zh-CN-projects.json
1. fix "notes" section of bookie and Ixquick
2. add "notes" for Tor. This section is china-specific, same as I2P.
2015-09-04 21:14:36 +08:00
Peng Zhong
8e4954591a Merge pull request #1390 from vyp/is-1388
AntiPrism should only be listed under the "Servers" category
2015-08-29 19:34:32 +09:00
rws
b0942d192c AntiPrism should only be listed under the "Servers" category
Ref #1388.
2015-08-29 20:28:24 +10:00
Peng Zhong
934e3faa98 Merge pull request #1388 from antiprismca/master
Added AntiPrism project reference
2015-08-29 19:18:27 +09:00
antiprismca
1133f650f8 Added AntiPrism project reference 2015-08-25 23:16:57 -04:00
Peng Zhong
c630f6d26b Merge pull request #1376 from vyp/sync-metadata
synchronize missing/unequal metadata across all locales
2015-07-29 16:25:52 +09:00
rws
bfe4d0c571 synchronize missing/unequal metadata across all locales
After this change, the only differences (I think) left are:

1. "fr-projects.json" has Wikipedia urls for the "Disconnect",
   "EtherCalc" and "Kamailio" projects, which no other locale has.

2. "zh-CN-projects.json" has translations for the "I2P" and "Ixquick"
   projects' "notes" section, which no other locale has, as introduced
   by b5495f7 from #932.

  - Notice that in the diff of b5495f7, the "notes" section for both
    these projects were empty before the change.

3. "fi-projects.json" has a translation for the "Off-the-Record
   Messaging" project's "notes" section, which no other locale has, as
   introduced by 1bd7801 from #1177.

  - Notice that in the diff of 1bd7801, the "notes" section for this
    project was empty before the change.

1 however should not be a problem because it does not look like there
are Wikipedia articles for these projects under any other language,
including English.

Note that this change does not actually check for *outdated*
translations (obviously). This change has only checked if a string type
key is empty when it should not be, or if an array type key (i.e.
"protocols" and "categories") is not equal to the rest of the keys from
all the other locales.
2015-07-28 16:45:06 +10:00
rws
efa61505cd fix incorrect Syncthing indentation as introduced in 75ad93c 2015-07-28 15:12:56 +10:00
Peng Zhong
6a6f0ae16b finish capitalizing #1371 2015-07-28 02:05:18 +09:00
Peng Zhong
896d3fda6c Merge pull request #1371 from Fend4self/patch-1
Update fr-projects.json
2015-07-28 02:03:59 +09:00
Fend4self
f2e307b250 Update fr-projects.json
Re-capitalized back subcategories' name.
2015-07-27 12:31:41 -04:00
Fend4self
9b13586082 Update fr-projects.json 2015-07-27 12:19:48 -04:00
Peng Zhong
333fffc7ea Merge pull request #1372 from vyp/#1368
add BitLocker to Servers category
2015-07-28 00:46:55 +09:00
Peng Zhong
a6b78d86dd Merge pull request #1373 from vyp/#1369
give experimental tag to arkOS
2015-07-28 00:21:53 +09:00
Peng Zhong
e62dc2b937 Merge pull request #1374 from vyp/movim-urls
update Movim urls for switch to Github
2015-07-28 00:21:46 +09:00
Peng Zhong
e9b6573385 Merge pull request #1375 from vyp/gs-urls
update GNU social urls for switch to gitlab.com from gitorious.org
2015-07-28 00:21:35 +09:00
rws
70ee4a5c93 update GNU social urls for switch to gitlab.com from gitorious.org
[Source] [1]

[1]: 5308e04e83:COPYING
2015-07-27 20:20:52 +10:00
rws
a85527ba62 update Movim urls for switch to Github
[Source] [1]

[1]: https://movim.eu/en/node/389
2015-07-27 20:00:19 +10:00
rws
ad85c79ffd give experimental tag to arkOS
Closes #1369.
2015-07-27 18:21:44 +10:00
rws
34ab382c0c add BitLocker to Servers category
Closes #1368.
2015-07-27 18:14:04 +10:00
Fend4self
2850abfd7e Update fr-projects.json
adblock-edge + adium  FR translaction correction+addition
2015-07-27 00:24:58 -04:00
Peng Zhong
79224c5d72 Merge pull request #1367 from vyp/ricochet-site
update Ricochet website url and logo images
2015-07-25 21:23:13 +09:00
rws
fe5a38a2cf update Ricochet website url and logo images
Source: [1]

[1]: https://twitter.com/jbrooks_/status/624650298657800192
2015-07-25 21:51:30 +10:00
Peng Zhong
60a3128839 fix merge conflict with tunnelblick license url 2015-07-23 14:43:26 +09:00
Peng Zhong
5456059c90 Merge branch 'vyp-is-1282' 2015-07-23 14:38:49 +09:00
Peng Zhong
82f2acdfef Merge pull request #1365 from alerque/issue-1364
update Tunnelblick URLs (fixes #1364)
2015-07-23 14:33:37 +09:00
Caleb Maclennan
0c27065a81 update Tunnelblick URLs (fixes #1364) 2015-07-23 07:53:28 +03:00
rws
7727de84e0 update Google Code repository links
Closes #1282.
Ref #1298.
Ref #1313.
Closes #1364.
2015-07-23 14:49:08 +10:00
Martijn van der Ven
07ecbdf3ad Merge pull request #1361 from gutobenn/master
Updates Tox website URL
2015-07-18 23:46:11 +02:00
Martijn van der Ven
acafe6eba7 Merge pull request #1362 from gutobenn/readme-link-fix
readme.md: fix link to contributing.md
2015-07-18 23:35:54 +02:00
Augusto Bennemann
8c144e275b readme.md: fix link to contributing.md 2015-07-18 18:02:14 -03:00
Augusto Bennemann
6b95237cf0 Updates Tox website URL 2015-07-18 17:56:11 -03:00
Martijn van der Ven
07c085a5e9 Merge pull request #1360 from vyp/bookie-sd
update notes for bookie about the bookie.io shut down
2015-07-18 11:48:37 +02:00
rws
2556ccc636 update notes for bookie about the bookie.io shut down 2015-07-18 18:57:36 +10:00
Peng Zhong
e7d201ad6f Merge pull request #1359 from vyp/is-1358
clarify that uBlock Origin is not a fork of Adblock Plus
2015-07-16 22:27:03 +09:00
rws
98499bff7e clarify that uBlock Origin is not a fork of Adblock Plus
Closes #1358.
2015-07-16 23:21:23 +10:00
Martijn van der Ven
00f60f1f92 Merge pull request #1357 from vyp/is-1291
Replace uBlock with uBlock Origin
2015-07-16 12:28:23 +02:00
rws
0ff52eecbe Replace uBlock with uBlock Origin
Ref #1285.
Closes #1291.
2015-07-16 20:23:45 +10:00