le_gremz/prism-break
1
0
Fork 0
mirror of https://gitlab.com/prism-break/prism-break.git synced 2025-04-24 09:08:29 +00:00
Code Issues Projects Releases Wiki Activity
5,160 Commits 5 Branches 0 Tags
Commit Graph

5160 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Peng Zhong
7f24b9f60c Merge pull request #1352 from simonasd/master 
finish locale/zh-cn
 2015-06-23 22:59:23 +09:00
simonasd
f7dd9b4abc Update zh-CN.json 2015-06-23 16:56:00 +08:00
simonasd
eb5653bf75 Update zh-CN.json 2015-06-23 16:51:09 +08:00
Peng Zhong
270b9d22f0 fix problem 2015-06-22 20:57:44 +09:00
Peng Zhong
0ca78c6388 Merge branch 'simonasd-master' 2015-06-22 19:06:07 +09:00
Peng Zhong
1e6528966a fix conflict 2015-06-22 19:05:57 +09:00
simonasd
43101b6101 Update zh-CN.json 2015-06-22 14:17:01 +08:00
simonasd
0b42a7e164 Update zh-CN-projects.json 2015-06-22 13:25:34 +08:00
simonasd
139a7659c3 Update zh-CN-projects.json 2015-06-22 13:24:09 +08:00
simonasd
32116f0e0b Update zh-CN-projects.json 2015-06-22 13:22:31 +08:00
Peng Zhong
7c75b8d7b0 Merge pull request #1350 from vyp/bookie-sd 
Add notice about Bookie.io shutting down
 2015-06-22 01:47:34 +09:00
simonasd
b3028ed6be Update zh-CN-projects.json 2015-06-21 17:42:32 +08:00
rws
3f5b967b4e Add notice about Bookie.io shutting down 
Ref #1349.
 2015-06-21 05:43:33 +10:00
Peng Zhong
1b6f96569a Merge pull request #1348 from vyp/is-1237 
Add KeePassX to Password Managers subcategory
 2015-06-20 23:25:58 +09:00
rws
adff340f25 Add KeePassX to Password Managers subcategory 
Closes #1036 (because [1]).
Closes #1046 (because [2]).
Ref #1203.
Closes #1237.

[1]: https://github.com/nylira/prism-break/issues/1036#issuecomment-47071572
[2]: https://github.com/nylira/prism-break/issues/1237#issuecomment-75375311
 2015-06-20 22:43:21 +10:00
Peng Zhong
9a19ad03c7 Merge pull request #1347 from vyp/is-1346 
Replace LibreWRT with libreCMC
 2015-06-19 10:44:36 +09:00
rws
cada8fe396 Replace LibreWRT with libreCMC 
Because they "have joined forces" and "future work will be done under
the libreCMC name" [1].

libreCMC is also FSF-endorsed [2].

Closes #1346.

[1]: http://librewrt.org/index.php?title=Main_Page
[2]: http://www.fsf.org/news/fsf-adds-librecmc-to-endorsed-distros-list
 2015-06-19 11:17:40 +10:00
Martijn van der Ven
839962bb55 Merge pull request #1343 from vyp/is-1342 
Add Google Docs to Productivity subcategory
 2015-06-15 08:37:44 +02:00
rws
04a6545fac Add Google Docs to Productivity subcategory 
Ref #1342.
 2015-06-15 10:50:23 +10:00
Martijn van der Ven
a319355b8e Merge pull request #1340 from vyp/is-1322 
Remove experimental tag from DAVdroid
 2015-06-14 12:54:39 +02:00
rws
a343c95ea3 Remove experimental tag from DAVdroid 
Ref #1322.
 2015-06-14 11:20:05 +10:00
Peng Zhong
c4a3ecd344 Merge pull request #1339 from pierreozoux/patch-1 
Typo
 2015-06-14 00:14:51 +09:00
Pierre Ozoux
2ace76c1ff Typo 2015-06-13 16:09:24 +01:00
Peng Zhong
615fd9a3f4 Merge pull request #1338 from vyp/is-937 
Add Syncthing
 2015-06-13 18:36:32 +09:00
Peng Zhong
8724d92461 Merge pull request #1337 from vyp/is-1070 
Remove Lorea
 2015-06-13 18:36:23 +09:00
rws
75ad93c8e0 Add Syncthing 
Closes #937.
Ref #1104.
Closes #1131.
 2015-06-13 16:00:45 +10:00
rws
c39cebc871 Remove Lorea 
Closes #1070.
 2015-06-13 15:24:39 +10:00
Peng Zhong
7dd221aff3 Merge pull request #1334 from vyp/sidebar-ln 
Fix sidebar being too long for GNU/Linux and Windows categories
 2015-06-09 00:06:45 +09:00
vyp
b2b90de7b0 Fix sidebar being too long for GNU/Linux and Windows categories 2015-06-08 18:21:47 +10:00
Peng Zhong
abb4606a6a Merge pull request #1331 from vyp/sortdb 
Sort db json files by 'slug' key
 2015-06-08 01:01:53 +09:00
vyp
9492082676 Sort db json files by 'slug' key 2015-06-07 18:26:46 +10:00
Peng Zhong
e8020af955 Merge pull request #1330 from vyp/is-957 
Remove TorChat [1] and add Ricochet [2] in its place
 2015-06-07 11:00:40 +09:00
vyp
6cc52f8d46 Remove TorChat [1] and add Ricochet [2] in its place 
Closes #957.
Closes #1083.
Closes #1136.
Closes #1152.

[1]: https://github.com/prof7bit/TorChat
[2]: https://github.com/ricochet-im/ricochet
 2015-06-07 04:17:50 +10:00
Peng Zhong
cfc271189f Merge pull request #1329 from vyp/ru-ublock 
Fix uBlock link in source/db/ru-projects.json
 2015-06-07 01:02:10 +09:00
vyp
c09d6a8da7 Fix uBlock link in source/db/ru-projects.json 2015-06-07 01:45:40 +10:00
Peng Zhong
e74010c76c Merge pull request #1327 from vyp/is-496 
Add "Bookmark Sync" subcategory
 2015-06-06 21:50:35 +09:00
Peng Zhong
d587f5f850 Merge pull request #1328 from vyp/chmod-x 
Change some asset permissions from 755 to 644
 2015-06-06 21:50:19 +09:00
vyp
98c285786a Change some asset permissions from 755 to 644 2015-06-06 15:21:27 +10:00
vyp
02fc70171d Add "Bookmark Sync" subcategory 
Free software:

1. SemanticScuttle (Servers) [1]
2. wallabag (previously "poche") (Android, BSD, GNU/Linux, iOS, OS X,
   Servers, Windows) [2]
3. Bookie (Android, BSD, GNU/Linux, iOS, OS X, Servers, Windows) [3]
4. Shaarli (Android, iOS, Servers) [4]

Proprietary:

1. Instapaper (Android, iOS, Web Services) [5]
2. Xmarks (GNU/Linux, OS X, Web Services, Windows) [6]
3. Pocket (previously "Read It Later") (Android, iOS, OS X, Web
   Services) [7]

Ref #1215.
Ref #1313 -- Although it has a Github repository, SemanticScuttle still
seems to be hosted (partially?) on SourceForge.

Closes #496.

[1]: http://semanticscuttle.sourceforge.net/
[2]: https://www.wallabag.org/
[3]: https://bookie.io/
[4]: https://github.com/shaarli/Shaarli/
[5]: https://www.instapaper.com/
[6]: https://www.xmarks.com/
[7]: https://getpocket.com/
 2015-06-06 14:52:46 +10:00
Peng Zhong
97bf170609 Merge pull request #1324 from vyp/is-1260 
Fix some broken media links with archive.org backups
 2015-06-05 19:59:39 +09:00
Peng Zhong
41aeb7621c Merge pull request #1326 from vyp/is-1322 
Add DAVdroid to File Storage & Sync category
 2015-06-05 19:58:34 +09:00
vyp
7cb4bb9b08 Add DAVdroid to File Storage & Sync category 
Ref #1322.
 2015-06-05 20:37:17 +10:00
Peng Zhong
f58abd584b Merge pull request #1325 from vyp/is-1321 
Add note about the "pull request accepted" label in the README
 2015-06-05 18:09:58 +09:00
vyp
29ee86c03f Add note about the "pull request accepted" label in the README 
Ref #1321.
 2015-06-05 18:42:30 +10:00
Martijn van der Ven
8de13a580c Merge pull request #1321 from vyp/iss-988 
Add Privacy Badger
 2015-06-05 10:29:55 +02:00
vyp
bea8ac8894 Add Privacy Badger 
Closes #988.
 2015-06-05 18:22:15 +10:00
vyp
f987585094 Fix some broken media links with archive.org backups 
Ref #1260.
 2015-06-05 17:30:13 +10:00
Peng Zhong
b20bc156cf Merge pull request #1271 from sedrubal/orweb 
added Orweb
 2015-06-05 15:23:39 +09:00
Peng Zhong
1a720803e1 Merge pull request #1257 from hasufell/PR-gogs 
Add gogs for "File Storage & Sync"
 2015-06-05 15:23:12 +09:00
Peng Zhong
d7aa7a6730 Merge pull request #1272 from sedrubal/repository_improvements 
Repository improvements
 2015-06-05 15:22:36 +09:00