Commit Graph

4753 Commits (f4fa23acfb28d6385be7f90d998316ed41c507b8)

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
Edward D a9f76b4a97 Merge pull request #135 from sputnik27/add-osiam
Add OSIAM (Federated Identity/Authentication)
2015-08-03 14:07:00 +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
nodiscc 856844b8c7 Merge remote-tracking branch 'kickball/pr/112' into next 2015-08-03 14:12:17 +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
Edward D 49ba303b39 Merge pull request #125 from mertinop/master
Remove Pinry's (Bookmarks & Link Sharing) Dead Demo Link
2015-08-03 11:46:28 +01:00
tomc3 a0471fee74 Shifted ArtVenue to non-free list 2015-08-03 16:14:48 +05:30
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
Edward D adc93b065d Merge pull request #116 from nodiscc/separate-nonfree
Separated Free and Paid Software
2015-08-03 00:21:40 +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
Edward D 82831b07ab Merge pull request #115 from Kickball/awesome-button
Added Awesome Button
2015-08-03 00:10:21 +01:00
Kickball 0c28abed69 Added Awesome Button
For more information see #114.
2015-08-03 00:09:07 +01:00
Edward D 125ef35d75 Merge pull request #113 from myfreeweb/patch-1
Added Known, ZNC (IRC), Privoxy (Proxy), Known (Blogging Platforms), Matrix (Communication systems), IndieAuth (Federated Identity/Authentication)
2015-08-02 22:26:50 +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
Edward D ee854bfd06 Merge pull request #111 from carlwolff/monitoring-prometheus
Added Prometheus (Monitoring)
2015-08-02 19:51:33 +01:00
Calle Wolff 762b37a9ca Add Prometheus monitoring tool 2015-08-02 20:03:07 +02:00
tomc3 53b35d3ff4 Added ArtVenue
Added ArtVenue one the most powerful self-hosted script for photographers, built on Laravel framework.
2015-08-02 23:32:59 +05:30
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