Commit Graph

1208 Commits (74765c1f260bfbe5f9f995b9ab08e844f25a7dcb)

Author SHA1 Message Date
Edward D 74765c1f26 Add Medusa
Resolves merge conflict in #659.
2016-08-29 17:52:29 -04:00
nodiscc 8ca3279e0b Merge pull request #734 from n8225/Fix-FeedReaders
Fix feed readers
2016-08-29 21:24:06 +02:00
nrew225 886af293e5 syntax error 2016-08-28 13:33:59 -07:00
nrew225 80807fb84b Merge remote-tracking branch 'refs/remotes/Kickball/master' into Fix-FeedReaders 2016-08-28 13:30:12 -07:00
nrew225 7d27b53a7a Fix Feed Readers
Updated licenses, languages, and links.
Removed unmaintained: Readr and RSSminer (last commits 3 years ago)
2016-08-28 13:28:14 -07:00
Andrew Rylatt 5e1d4c0afe Merge pull request #728 from n8225/k42b3-master
K42b3 master
2016-08-28 14:05:57 +01:00
Andrew Rylatt 8a5b510d55 Merge pull request #731 from vincent-clipet/feature/add_redmine_info
ADD :: Demo & source URL for 'Redmine'
2016-08-28 14:03:55 +01:00
vincent-clipet 8d923d869e ADD :: Demo & source URL for Redmine 2016-08-28 04:23:32 +02:00
Edward D ca5583e384 Join Chat Button Fix 2016-08-27 20:58:34 -04:00
Edward D 5e39d5047e Add chat button (#730)
* Add Join Chat Button

* Add Button Link in README

Currently broken

* Fix button link
2016-08-28 02:55:35 +02:00
nrew225 105b0465b4 Merge remote-tracking branch 'refs/remotes/Kickball/master' into k42b3-master 2016-08-27 15:03:07 -07:00
nrew225 182a09e658 fixed 2016-08-27 14:59:11 -07:00
n8225 193b5f9fa5 Merge pull request #726 from Kickball/external-links-chat
Add Awesome Selfhosted Chat to external links
2016-08-27 09:22:32 -07:00
nodiscc 6918a55e90 Merge pull request #727 from thekvs/p1
add microproxy
2016-08-27 18:12:57 +02:00
n8225 b2102fe202 Fix communications (#723)
* Fix/Add missing license and language in Communications section

Fixes/updates to Communications.
I also moved Kontalk to XMPP Servers as it looks to be a fork of Tigase
and an android app for the client.  I didnt see a web client listed on
the site or in the repo.

* Fix Sendmail, add Sendmail to list of licenses

* added language kontalk

* alphabetize subs of Synapse

* Alphabetize some more

* more fixes

* fixes
2016-08-27 17:07:09 +02:00
Konstantin Sorokin 076c6b98a8 add microproxy 2016-08-27 17:51:40 +03:00
nrew225 6bfc37a0df resolve conflict 2016-08-27 07:34:36 -07:00
nrew225 442876aaca Merge branch 'k42b3-master' 2016-08-27 07:25:36 -07:00
nrew225 180ee7ab71 Merge branch 'master' of https://github.com/k42b3/awesome-selfhosted into k42b3-master 2016-08-27 07:25:10 -07:00
Edward D 1a77d8ffc6 Add Awesome Selfhosted Chat to external links 2016-08-27 09:07:15 -04:00
n8225 7ef74f80ce Fix bookmarks (#724)
* Fix Firefox

* add zlib to list of licenses

* Fix Shaarli

* Remove Bookie broken link
2016-08-27 14:58:03 +02:00
Moritz Kröger 92eb788fd3 Updated link to contribution guidelines (#722) 2016-08-27 00:46:59 +02:00
nodiscc cc17b2a5e8 Merge pull request #720 from Kickball/add-easybook
Add EasyBook
2016-08-26 17:48:23 +02:00
nodiscc 0b190bbbc0 Merge pull request #721 from Kickball/remove-static-site-generator-duplicates
Remove Static Site Generator Duplicates
2016-08-26 17:48:02 +02:00
Edward D 3f59c6cbd0 Remove Static Site Generator Duplicates
Remove the static site generator duplicates identified in #506.

* Remove Bolt (CMS)
* Remove Grav (CMS)
* Remove Codex (Wikis)
2016-08-26 07:32:33 -04:00
Edward D b1e20beb69 Add EasyBook
Add EasyBook to misc/other category.
2016-08-26 07:11:11 -04:00
Girish Ramakrishnan 94e2e520e4 Add Cloudron.io (#714) 2016-08-26 13:03:13 +02:00
Rodolfo Berrios 8244a5cb30 Added Chevereto in Photo and Video Galleries (#712) 2016-08-26 12:57:08 +02:00
David Ng fb7c67ab19 Add Skygear (#715)
* Add Skygear

* Move Skygear to Misc/Other category

* Update Skygear license to `Apache`
2016-08-26 12:56:26 +02:00
Rodolfo Berrios 3505e481a7 Added Chevereto 2.X (Open Source) to Photo and Video Galleries (#717) 2016-08-26 12:56:01 +02:00
Edward D e0b1ac2d5f Project Reoganisation (#718)
* Create AUTHORS

* Populate AUTHORS

* Create and populate CONTRIBUTING.md

* Update README sections

Update README sections to reflect new files.

* Minor Grammar Fix

* Create and populate PULL_REQUEST_TEMPLATE.md

Create the automated issue template for the repo. ([more info](https://help.github.com/articles/creating-a-pull-request-template-for-your-repository))

* Move CONTRIBUTING.md to .github/

* Add chat link to CONTRIBUTING.md

* Update Formatting Guidelines

* Update Formatting Guidelines

* Remove example from PULL_REQUEST_TEMPLATE guidelines

* Remove example from CONTRIBUTING guidelines
2016-08-26 12:54:17 +02:00
nrew225 260d549747 Merge remote-tracking branch 'refs/remotes/Kickball/master' 2016-08-25 21:18:58 -07:00
nodiscc 1b213a91a0 Merge pull request #716 from bibich/master
Add Thelia
2016-08-26 02:12:24 +02:00
Christoph Kappestein 3e0738bc52 add fusio 2016-08-25 22:54:36 +02:00
Julien c234fd0006 Add Thelia
Add Thelia in e-commerce solutions.
2016-08-25 15:22:54 +02:00
nodiscc 87601411c0 Merge pull request #713 from n8225/postleaf
Add Postleaf to Blogging Platforms
2016-08-25 11:23:50 +02:00
Andrew Rylatt e5da616db8 Merge pull request #700 from kohenkatz/patch-1
Add MailHog and Dada Mail; Merge Mailing Lists and Newsletters
2016-08-25 07:08:23 +01:00
nrew225 8e10257b89 Add Postleaf to Blogging Platforms 2016-08-24 19:03:00 -07:00
MK 9026f95b44 Fix TOC 2016-08-24 21:17:34 -04:00
gseva 628fb0a4b1 Add Node Red (#698)
* Add Node Red

* Node.js -> Nodejs

* Apache 2.0 -> Apache
2016-08-25 01:23:04 +02:00
Spencer McIntyre c5539d2a42 Add King Phisher (#707)
* Add King Phisher to the misc category

* Remove additional period

* Fix a double space after a period
2016-08-25 01:15:58 +02:00
MK af74448ad8 Remove parenthtical 2016-08-24 15:56:10 -04:00
Andrew Rylatt 7d5fd24edf Merge pull request #706 from remram44/feed-readers_language-tags
Add language tags on Feed Readers
2016-08-24 20:33:38 +01:00
Andrew Rylatt 7c8f53c884 Merge pull request #693 from arikfr/patch-1
Add Redash to Analytics/BI
2016-08-24 20:27:48 +01:00
Andrew Rylatt fe33423833 Merge pull request #689 from duyetdev/master
Add saveto
2016-08-24 20:27:10 +01:00
Andrew Rylatt 3b2377e9cc Merge pull request #688 from cjcjameson/master
Add Concourse CI
2016-08-24 20:26:46 +01:00
Andrew Rylatt e68a778953 Merge pull request #671 from arastu/patch-1
add Deskulu, opensource helpdesk and ticketing system
2016-08-24 20:20:14 +01:00
Edward D 17d18709ae Remove ikiwiki
As per #506.
2016-08-24 12:49:13 -04:00
MK d594317a1f merge mailing lists and newsletters 2016-08-24 12:24:10 -04:00
C.J. Jameson e3ea14c0cf Add Concourse CI 2016-08-24 00:28:04 -07:00