Commit Graph

312 Commits

Author SHA1 Message Date
Edward D
968062bac5 Merge pull request #133 from nodiscc/next
Fix and Merge Pending Pull Requests
2015-08-03 14:22:05 +01:00
Görkem Çetin
0cc25d1f84 Update README.md 2015-08-03 16:17:34 +03:00
Görkem Çetin
efddda0a50 Update README.md 2015-08-03 16:16:21 +03:00
Edward D
3c77bb1605 Merge pull request #134 from cbdevnet/master
Add ipMagnet (File Sharing and Synchronization)
2015-08-03 14:07:54 +01:00
Florian Wilhelm
de0a577825 Add OSIAM (osiam.org) to the list. 2015-08-03 15:01:28 +02:00
cbdev
dc2d51044f Add ipMagnet to Filesharing tools 2015-08-03 14:47:52 +02:00
nodiscc
c16e2a31fb Merge remote-tracking branch 'kickball/pr/132' into next 2015-08-03 14:33:58 +02:00
nodiscc
2e8328543f move mail-in-a-box to selfhosting solutions, add license, remove "secure"
curl -s https://mailinabox.email/bootstrap.sh | sudo bash is not secure
2015-08-03 14:31:47 +02:00
nodiscc
571b0b7f79 update contributors list 2015-08-03 14:28:48 +02:00
nodiscc
c31b42bc14 Merge remote-tracking branch 'kickball/pr/131' into next 2015-08-03 14:25:08 +02:00
nodiscc
12f8e071c6 Merge remote-tracking branch 'kickball/pr/129' into next 2015-08-03 14:24:57 +02:00
Kovah
92d5533759 Updated contributors list 2015-08-03 14:23:25 +02:00
Kovah
0df443abe5 Added Learning & Courses
Added Moodle, Chamilo and Sakai to the Learning and Courses category
2015-08-03 14:23:11 +02:00
Kovah
578cd138c0 Various source optimizations, added MODX (CSM), updated links for InvoicePlane 2015-08-03 14:22:57 +02:00
nodiscc
784cc0fc0f Merge remote-tracking branch 'kickball/pr/124' into next
fix missing description
2015-08-03 14:19:27 +02:00
nodiscc
80c30451ea Merge remote-tracking branch 'kickball/pr/119' into next 2015-08-03 14:17:37 +02:00
nodiscc
4271f94749 Merge remote-tracking branch 'kickball/pr/117' into next 2015-08-03 14:13:58 +02:00
Eren Hatırnaz
0899473f05 Added FilePizza. 2015-08-03 15:11:44 +03:00
nodiscc
a192a7cb65 Merge remote-tracking branch 'kickball/pr/105' into next 2015-08-03 14:09:21 +02:00
nodiscc
3d6adeb720 Merge remote-tracking branch 'kickball/pr/62' into next 2015-08-03 14:07:08 +02:00
nodiscc
dbd62b5e8e add flumotion and readymedia (formerly MiniDLNA), remove lik to alternativeto
since it was imported as of #42
2015-08-03 13:57:38 +02:00
Marc Picaud
fb19e8f981 add PrestaShop (self hosted e-commerce solution) into CMS section 2015-08-03 13:55:02 +02:00
Dirk Krause
08790b804e Added the social network PPnet. Now with Source and Licence. 2015-08-03 13:42:26 +02:00
Edward D
63e51040f5 Merge pull request #120 from Kickball/Persona
MPLv2 License Addition, FreeSWITCH Changes, BrowserID/Mozilla Persona Changes
2015-08-03 11:46:56 +01:00
mertinop
7fe93d4d7e Remove dead link
Pinry Demo
2015-08-03 05:24:19 -03:00
Jean Elchinger
22084f46b4 License added 2015-08-03 07:34:59 +02:00
jungle-boogie
ad38e7a38b weechat
add weechat to irc
2015-08-02 20:14:04 -07:00
Kickball
bca2576a1e MPLv2 License Addition, FreeSWITCH Changes, BrowserID/Mozilla Persona Changes 2015-08-03 01:48:17 +01:00
Kickball
d0b803d8e7 Contributing Changes (Description Limit) 2015-08-03 01:09:27 +01:00
Kickball
6d5300410b Formatting Fixes & Alphabetical Ordering 2015-08-03 01:04:27 +01:00
nodiscc
9bcb5fb1a7 add unmaintained project removal rule from #63, update contributors list 2015-08-03 01:35:49 +02:00
benmaynard11
16e036d81b Update README.md
Added Mail-in-a-Box
2015-08-03 00:23:01 +01:00
nodiscc
f2f50ab2f3 indentation fixes 2015-08-03 01:17:14 +02:00
nodiscc
55a5fbd00f glorious Freedom takes a capital F 2015-08-03 01:16:06 +02:00
nodiscc
276ad54cbb separate Free and non-Free software pages 2015-08-03 01:16:06 +02:00
Kickball
0c28abed69 Added Awesome Button
For more information see #114.
2015-08-03 00:09:07 +01:00
Greg V
c34896b622 Fix IndieAuth and Matrix 2015-08-03 00:19:45 +03:00
Greg V
2b037d43e6 Add some links 2015-08-02 23:33:30 +03:00
Calle Wolff
762b37a9ca Add Prometheus monitoring tool 2015-08-02 20:03:07 +02:00
Edward D
8bd255bb7a Merge pull request #98 from motiko/master
Added Zimbra Collaboration (Groupware)
2015-08-02 17:09:21 +01:00
Edward D
eb48a9aa0f Merge pull request #106 from fourtonfish/patch-1
Added ThinkUp (Analytics)
2015-08-02 17:08:41 +01:00
Moti Korets
f621044c68 Moving to Groupware 2015-08-02 14:26:18 +03:00
Stefan Bohacek
6666d02cad Switched the links. 2015-08-02 07:22:12 -04:00
Edward D
b364dd85be Merge pull request #110 from Kickball/CPALv1
Added CPALv1 (License)
2015-08-02 12:02:00 +01:00
Kickball
a2c8971bd0 Added CPALv1 (License) 2015-08-02 12:01:24 +01:00
Edward D
7c67b7685d Merge pull request #109 from Kickball/Artistic-License
Added ARTv2 (License)
2015-08-02 11:58:55 +01:00
Kickball
ea26967d25 Added ARTv2 (License) 2015-08-02 11:56:28 +01:00
Edward D
e0fc1fa437 Merge pull request #103 from Kickball/Add-Reddit
Added Reddit (Social Networks and Forums)
2015-08-02 11:47:54 +01:00
Edward D
e7b18836ef Merge pull request #101 from Kickball/ImpressPages-CMS
Added ImpressPages CMS (CMS)
2015-08-02 11:47:19 +01:00
Edward D
75b8925e25 Merge pull request #107 from jcalado/patch-1
Added Flarum (Social Networks and Forums)
2015-08-02 11:44:57 +01:00
Edward D
8cb10e8b28 Merge pull request #94 from dentarg/patch-1
Added Camlistore (File Sharing and Synchronization)
2015-08-02 11:40:27 +01:00
Patrik Ragnarsson
eab408d874 Demo need to be live demo 2015-08-02 11:24:38 +02:00
Joel Calado
3f5577bf90 Add Flarum to forums
Add open source Flarum forum system.
2015-08-02 08:58:45 +01:00
Stefan Bohacek
c39dff7838 Added ThinkUp. 2015-08-01 23:00:36 -04:00
Alys
54ed40de9f HabitRPG is now called Habitica, URLs have changed
Changes the name and URL of HabitRPG to Habitica (habitica.com), and updates the GitHub link.
2015-08-02 08:53:26 +10:00
Peter Thaleikis
6265f3eba8 Update README.md
adding language and some more links
2015-08-02 09:27:26 +12:00
Kickball
eec7978509 Added Reddit (Social Networks and Forums) 2015-08-01 22:16:17 +01:00
Peter Thaleikis
1b7b337896 adding silverstripe to cms list 2015-08-02 09:16:05 +12:00
Kickball
99ea5d9717 Added ImpressPages CMS (CMS) 2015-08-01 21:59:52 +01:00
Moti Korets
e6139278a3 Removing spaces 2015-08-01 22:55:41 +03:00
Edward D
db408cd219 Merge pull request #97 from dhenson02/master
Added Remy's JS Bin (IDE/Tools)
2015-08-01 20:51:52 +01:00
Edward D
bc5c548915 Merge pull request #82 from yelinaung/master
Added NodeBB (Social Networks and Forums), Renamed Social Networks to Social Networks and Forums
2015-08-01 20:50:35 +01:00
Edward D
41a9b485e4 Merge pull request #90 from Poorchop/patch-1
Added Droppy (File Sharing and Synchronization)
2015-08-01 20:49:47 +01:00
Edward D
73e9cf71de Merge pull request #91 from jnv/patch-1
Added Mint Web Analytics (Analytics)
2015-08-01 20:49:11 +01:00
Edward D
a9d7d60c45 Merge pull request #93 from jnv/patch-3
Add RainLoop (Email)
2015-08-01 20:48:47 +01:00
Edward D
cca51b335b Merge pull request #95 from sabas/patch-1
Add HumHub (Social Network)
2015-08-01 20:48:16 +01:00
Moti Korets
9742c77d28 Fix link 2 2015-08-01 22:19:14 +03:00
Moti Korets
393e4e09d8 Fix link 2015-08-01 22:17:17 +03:00
Moti Korets
72d4803fb9 Added Zimbra Collaboration
To Email section
2015-08-01 22:14:52 +03:00
Deryck
58cac84715 Update README.md 2015-08-01 12:32:34 -05:00
Deryck
1cdb8aa43a Added Remy's JS Bin 2015-08-01 10:01:52 -05:00
Stefano
920c16be21 Fix HumHub 2015-08-01 15:49:12 +02:00
MatFluor
f98ff79c9f Added Crepido (flat-file kanban) 2015-08-01 13:33:55 +02:00
Stefano
e98036a457 Add HumHub 2015-08-01 13:19:01 +02:00
Patrik Ragnarsson
7d4c9b69c5 Add Camlistore 2015-08-01 13:18:55 +02:00
Jan Vlnas
d564016a3c Add RainLoop webmail 2015-08-01 11:20:57 +02:00
Jan Vlnas
67f50e60ba Add Sandstorm 2015-08-01 11:01:55 +02:00
Ye Lin Aung
e3964ca631 Removed the space and put Node.js at the end. 2015-08-01 15:28:23 +06:30
Jan Vlnas
d7d90a4a14 Add Mint web analytics 2015-08-01 10:50:15 +02:00
Poorchop
aff1b113b0 Add droppy 2015-08-01 01:53:13 -04:00
Ye Lin Aung
5bf74371dd Social Networks to Social Networks and Forums
Updated the title and TOC of Social Networks to Social Networks and Forums
2015-08-01 08:53:33 +06:30
Marcus Ramberg
9916953175 Added Convos to IRC clients 2015-08-01 00:01:39 +02:00
Dan
a24e340ab6 add BigTree CMS 2015-07-31 13:24:13 -07:00
Edward D
d247ed01c4 Merge pull request #74 from Poorchop/patch-1
Add Turtl (Note-taking & Editors)
2015-07-31 21:09:36 +01:00
Edward D
1a9cc63ceb Merge pull request #80 from skarphet/patch-1
Fix monitor misspelling.
2015-07-31 21:07:27 +01:00
Poorchop
a25a81bf99 Add Turtl 2015-07-31 16:06:46 -04:00
steven jacobs
08fa4c96a7 Fix URL typo
The link for https://staticsitegenerators.net was missing a letter.
2015-07-31 15:59:10 -04:00
Edward D
675073b43c Merge pull request #84 from jungle-boogie/patch-10
Fixed Kandan
2015-07-31 20:50:45 +01:00
Edward D
cd8ceb792c Merge pull request #83 from yuche/patch-1
Added KeystoneJS (CMS)
2015-07-31 20:50:18 +01:00
yuche
4919b46878 add nodejs 2015-08-01 03:01:23 +08:00
jungle-boogie
404ba64094 some cleanup
did some clean up--nothing new added.
2015-07-31 11:30:07 -07:00
jungle-boogie
862bad936f correct Kandan
Kandan was duplicated and had bad formatting.
2015-07-31 11:05:33 -07:00
yuche
4a7a1cabd4 add KeystoneJS 2015-08-01 01:42:53 +08:00
Ye Lin Aung
73ce06de29 Added NodeBB
Added NodeBB link, source code link and license
2015-08-01 00:05:56 +06:30
skarphet
087be0776e onitor -> monitor 2015-07-31 18:54:17 +02:00
nodiscc
92ca362bb0 Merge remote-tracking branch 'kickball/pr/73' 2015-07-31 18:42:16 +02:00
nodiscc
08314e55a1 Merge remote-tracking branch 'kickball/pr/78'
Conflicts:
	README.md
2015-07-31 18:41:18 +02:00
nodiscc
ad39805c27 Merge remote-tracking branch 'kickball/pr/77'
Conflicts:
	README.md
2015-07-31 18:38:28 +02:00
nodiscc
8e34c25520 Merge remote-tracking branch 'kickball/pr/76' 2015-07-31 18:36:50 +02:00
Martin Gontovnikas
98e8bc01e3 Updated link and language 2015-07-31 13:17:02 -03:00