Commit Graph
100 Commits
Author SHA1 Message Date
Edward D d449afcac6 Merge pull request #355 from jeanmenezes/jeanmenezes-patch-1
Added Textpattern to the CMS section.
2015-12-07 19:55:42 +00:00
Edward D 60ba52e592 Merge pull request #337 from joubertredrat/rhodecode
Add RhodeCode (non-free)
2015-11-09 09:40:51 +00:00
Edward D 91ab737bf7 Merge pull request #334 from kthibodeaux/kthibodeaux-add-zulip
Add Zulip
2015-11-09 09:39:55 +00:00
Edward D 4d008c89e0 Merge pull request #310 from redaxmedia/master
Redaxscript Updated and General Syntax Fixes
2015-10-15 00:20:38 +01:00
Edward D da19f8a7cc Merge pull request #268 from privacytoolsIO/patch-1
Added description for privacytools.io
2015-09-29 01:35:46 +01:00
Edward D 464e4898c1 Merge pull request #272 from mapio/patch-1
Added No Fuss Bookmarks
2015-09-29 01:35:36 +01:00
Edward D 3af1ace77d Merge pull request #281 from albertca/master
Add Tryton
2015-09-29 01:35:11 +01:00
Edward D 1006d97814 Merge pull request #228 from sc0repi0/master
Remove Movable Type (CMS)
2015-08-25 20:34:30 +01:00
Edward D f998843855 Merge pull request #209 from brettex/patch-1
Add Drive Virtual
2015-08-17 13:58:29 +01:00
Edward D 7ae563691a Merge pull request #212 from joubertredrat/patch-3
Add Axigen
2015-08-17 13:57:42 +01:00
Edward D f67589d70b Merge pull request #213 from joubertredrat/patch-4
Add Mailcow (Formelly Fufix)
2015-08-17 13:55:53 +01:00
Edward D d10a1cd601 Merge pull request #201 from p3k/patch-1
Add Antville (Blogging Platforms)
2015-08-16 11:06:05 +01:00
Edward D b38b664ff9 Merge pull request #207 from florianl/patch-1
Add sabre/dav
2015-08-15 22:05:03 +01:00
Edward D a39b8816b4 Merge pull request #206 from joubertredrat/patch-2
Add Modoboa
2015-08-15 22:04:50 +01:00
Edward D 9521173592 Merge pull request #191 from edouerd/patch-1
Added Piratebox to Groupware/File Sharing and Sync
2015-08-13 20:01:15 +01:00
Edward D 27e5d01849 Merge pull request #203 from leogaggl/master
Added 2 more selfhosted education systems
2015-08-13 20:00:45 +01:00
Edward D bbb276899a Merge pull request #204 from CraigyDavi/master
Fix Table of Contents Links
2015-08-13 20:00:15 +01:00
Edward D 817b66dfc2 Merge pull request #199 from d3th/master
Fix Gogs Link
2015-08-12 13:50:46 +01:00
Edward D 776fdb076a Merge pull request #198 from trockenasche/patch-1
Added PHPOffice
2015-08-12 13:49:31 +01:00
Edward D 642126e1ee Merge pull request #194 from koppor/quasselirc
Add Quassel IRC
2015-08-11 15:09:11 +01:00
Edward D a600a06e2e Merge pull request #190 from pguth/patch-4
Add Let's Chat
2015-08-10 21:01:19 +01:00
Edward D 4814853c80 Merge pull request #189 from corygibbons/additions
Add Pancake (non-free) & FusionInvoice (non-free)
2015-08-09 11:15:27 +01:00
Edward D fa22616149 Merge pull request #185 from angvp/master
Add Wagtail (CMS)
2015-08-09 11:14:44 +01:00
Edward D d2603cbeff Merge pull request #187 from littleguga/patch-1
Add OpenCart (E-commerce), WooCommerce (E-commerce)
2015-08-09 11:14:20 +01:00
Edward D 359ecef37a Merge pull request #188 from radarhere/patch-1
Fixed egroupware (Groupware) Typo
2015-08-09 11:13:44 +01:00
Edward D ae32b2e764 Merge pull request #174 from leogaggl/master
Additional Anahita (Social Networks and Forums), Oxwall (Social Networks and Forums)
2015-08-09 11:13:18 +01:00
Edward D c0fc3daaaf Merge pull request #184 from Kickball/readthedocs
Add Read the Docs (Wiki)
2015-08-09 11:11:20 +01:00
Edward D 1304962fa4 Merge pull request #181 from babolivier/patch-1
Add Cozy Cloud (Groupware)
2015-08-07 00:37:04 +01:00
Edward D 4c5ed0d8c0 Merge pull request #175 from ryzhovau/linux-dash-demo
Update linux-dash Demo URL
2015-08-07 00:10:12 +01:00
Edward D 9fcfeaca91 Merge pull request #176 from ryzhovau/subsonic-demo
Add Subsonic Demo
2015-08-07 00:09:40 +01:00
Edward D 6453abca70 Merge pull request #179 from pguth/patch-1
Add Documentation Generator Section, Add Flatdoc (Document Generator), Move: daux.io, Docstore, markdown-tree, MdWiki to Document Generator Section
2015-08-07 00:08:48 +01:00
Edward D 380d304fd2 Merge pull request #182 from Kickball/link-groupware
Link file sync section to Groupware, Fixes #162
2015-08-07 00:03:21 +01:00
Edward D b853296137 Merge pull request #180 from Kickball/mapbbcodeshare
Add MapBBCodeShare (Maps & GPS)
2015-08-06 23:56:01 +01:00
Edward D 358a3f4ea6 Merge pull request #170 from ChrisMissal/patch-1
Add HuBoard (Bug and Task Trackers), Add ⚠ (3rd Party Dependency)
2015-08-05 23:11:29 +01:00
Edward D f142d7a7ca Merge pull request #171 from Kickball/import-ash
Add Mailpile (Email), Fixes #141
2015-08-05 23:01:12 +01:00
Edward D 4b9e91b150 Merge pull request #168 from dpfaffenbauer/master
Add Pimcore (CMS), Remove Keepass (Password Managers)
2015-08-05 14:58:04 +01:00
Kickball 54db47853e Removed ipMagnet (File Sharing and Synchronization) 2015-08-05 12:39:05 +01:00
Kickball f89717bd66 Add Snowplow (Analytics) 2015-08-05 11:48:18 +01:00
Kickball 3397cc1d1f Updated Sogo (Groupware) Description 2015-08-05 11:40:59 +01:00
Kickball 22ba7370c5 Add Sogo (Groupware) 2015-08-05 11:38:44 +01:00
Kickball 98d1ccc411 Moved ownCloud to Groupware, Fixed Zimbra Collaboration (Groupware) Formatting 2015-08-05 11:29:47 +01:00
Kickball 10e0f29e16 Add Seafile (File Sharing and Synchronization) Demo 2015-08-05 11:27:38 +01:00
Edward D d4148aaaec Merge pull request #155 from DrAzraelTod/master
Add Webalizer (Analytics), RSS2EMail (Feed Readers), CherryMusic (Music Streaming)
2015-08-05 11:05:40 +01:00
Edward D d5023866ed Merge pull request #165 from B3QL/master
Add Phabricator (Project Management)
2015-08-05 11:03:09 +01:00
Edward D 43b1073f90 Merge pull request #160 from ethanal/master
Add Nimbus (File Sharing and Synchronization)
2015-08-04 18:13:45 +01:00
Edward D 9a044f1af7 Merge pull request #163 from redaxmedia/master
Move Redaxscript from Wiki to CMS section
2015-08-04 18:12:22 +01:00
Edward D 9b351c1d06 Merge pull request #158 from mikesteele/master
Fixed Broken Link for Baikal (Calendar and Address Books)
2015-08-04 15:39:22 +01:00
Edward D 40d2178125 Merge pull request #157 from ry167/patch-1
Tox (Communication systems - Custom) Domain Change
2015-08-04 15:08:19 +01:00
Edward D 7b62b16bb9 Merge pull request #151 from MorrisJobke/patch-1
Update Licences and Language of ownCloud (File Sharing and Synchronization), Syncany (File Sharing and Synchronization) and Syncthing (File Sharing and Synchronization)
2015-08-04 14:24:02 +01:00
Edward D fcff9013f7 Merge pull request #154 from neo22s/patch-2
Open Classifieds (E-commerce) and Open eShop (E-commerce)
2015-08-04 14:22:45 +01:00
Edward D bc407e1368 Merge pull request #156 from kylestetz/patch-1
Add Apostrophe 2 (CMS)
2015-08-04 14:21:42 +01:00
Edward D 06f922fd67 Merge pull request #130 from marcpicaud/master
Add PrestaShop (E-Commerce)
2015-08-03 19:31:10 +01:00
Edward D 4f2f5140f7 Merge pull request #142 from Waterloo/patch-1
Added Bugzilla (Bug and Task Trackers)
2015-08-03 19:00:49 +01:00
Kickball c90062d7e7 Add Teampass (Password Managers) 2015-08-03 19:00:14 +01:00
Edward D 208e6f78f5 Merge pull request #144 from Kickball/revert-143-patch-1
Revert "Add Teampass"
2015-08-03 18:57:56 +01:00
Edward D 821d30bc5c Revert "Add Teampass" 2015-08-03 18:57:49 +01:00
Edward D 13035b558f Merge pull request #143 from joubertredrat/patch-1
Add Teampass
2015-08-03 18:57:47 +01:00
Edward D 91f5320a16 Merge pull request #136 from gorkem-cetin/countly-patch-1
Add Countly (Analytics)
2015-08-03 14:23:05 +01:00
Edward D 968062bac5 Merge pull request #133 from nodiscc/next
Fix and Merge Pending Pull Requests
2015-08-03 14:22:05 +01: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
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
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
Edward D adc93b065d Merge pull request #116 from nodiscc/separate-nonfree
Separated Free and Paid Software
2015-08-03 00:21:40 +01: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
Edward D ee854bfd06 Merge pull request #111 from carlwolff/monitoring-prometheus
Added Prometheus (Monitoring)
2015-08-02 19:51:33 +01: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
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
Edward D fe5c165a81 Merge pull request #102 from spekulatius/spekulatius-patch-1
Added Silverstripe (CMS)
2015-08-01 23:44:44 +01:00
Kickball eec7978509 Added Reddit (Social Networks and Forums) 2015-08-01 22:16:17 +01:00
Kickball 99ea5d9717 Added ImpressPages CMS (CMS) 2015-08-01 21:59:52 +01: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
Edward D 84439ccc44 Merge pull request #96 from MatFluor/patch-2
Added Crepido (Bug and Task Trackers)
2015-08-01 12:52:52 +01:00
Edward D 8dedb2e8eb Merge pull request #92 from jnv/patch-2
Added Sandstorm (Self-hosting Solutions)
2015-08-01 10:21:15 +01:00
Edward D 1f88fa9e81 Merge pull request #87 from marcusramberg/patch-1
Added Convos (IRC Clients)
2015-07-31 23:20:18 +01:00
Edward D ff66f3a399 Merge pull request #75 from atstp/patch-1
Add BigTree CMS (CMS)
2015-07-31 21:29:21 +01: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
Edward D c2cee30432 Merge pull request #86 from stvnjacobs/fix-url-typo
Fix staticsitegenerators URL Misspelling
2015-07-31 21:07:09 +01: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
Edward D 5b39edc4fa Merge pull request #85 from jungle-boogie/patch-11
Licenses and Language Additions
2015-07-31 20:49:34 +01:00