Commit Graph

1180 Commits (6bfc37a0df8116a52f045e109ac27716fca929c4)

Author SHA1 Message Date
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
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
Alex Bogdanovski 254f0065b3 Add Para (#692)
* Add Para

I've added a new category because it didn't fit in any of the other ones.

* Moved Para to Misc/Other
2016-08-24 08:40:55 +02:00
evitalis 6117e7bc66 Add flaskbb (#685)
* Add flaskbb

* Remove excess tag
2016-08-24 08:29:21 +02:00
timbe16 9211dec466 adding Minio (#705)
* adding Minio

* Update README.md

* Update README.md
2016-08-24 08:25:51 +02:00
Thorsten Rinne 7fe6c800f1 Added Sylius (#696)
* Added Sylius

* Added missing demo and missing full stop.
2016-08-24 08:23:13 +02:00
Sahin Boydas 7ba06744c1 Adding koding (#701) 2016-08-24 08:22:33 +02:00
Touhid Arastu bc7d6ac9a3 add demo for deskulu 2016-08-24 10:25:05 +04:30
Touhid Arastu ae8f876c9f add demo for deskulu 2016-08-24 10:24:17 +04:30
Remi Rampin eb1c5e3461 Add language tags on Feed Readers 2016-08-23 14:55:25 -04:00
nodiscc 9a114fade3 Merge pull request #694 from thewhitetulip/patch-1
Add Tasks
2016-08-23 20:33:08 +02:00
Touhid Arastu 01fd321b52 order alphabetically, remove the double space. 2016-08-23 22:55:49 +04:30
MK bf9b896d27 Add MailHog and Dada Mail 2016-08-23 12:09:05 -04:00
Suraj Patil 1fd3133df4 changed order 2016-08-23 21:08:43 +05:30
gseva 5c75a78363 Added SchoolTool (#699) 2016-08-23 16:59:54 +02:00
nodiscc b3082ab647 Merge pull request #697 from t1st3/patch-1
fix typo
2016-08-23 15:45:55 +02:00
t1st3 82f5a97d5c fix typo
NodeHub => NoteHub
2016-08-23 15:25:22 +02:00
Ben 90b08fe6a6 Added Directus Headless CMS (#687) 2016-08-23 14:47:08 +02:00
Arik Fraimovich 6e405cff2e Fixed Redash listing according to contribution format. 2016-08-23 14:36:16 +03:00
Edward D f61c4c3410 Fix WordPress capitalization
Resolves #675.
2016-08-23 07:33:59 -04:00
Damir Gainetdinov 3d24e34a41 Add ExMoney (#691) 2016-08-23 13:23:45 +02:00
Suraj Patil b8102c4d93 added new project 2016-08-23 16:28:20 +05:30
Arik Fraimovich 3d4e606f38 Added Redash to Analytics/BI 2016-08-23 13:50:18 +03:00
Van-Duyet Le aa52459bbc Sort alphabetically 2016-08-23 14:01:06 +07:00
Van-Duyet Le 5fe2d95eda Update README.md 2016-08-23 11:19:12 +07:00
Touhid Arastu 302240a6de update description of deskulu 2016-08-23 06:53:57 +04:30
Touhid Arastu 7780591107 add missing title, language and licence of deskulu 2016-08-23 06:51:58 +04:30
Eric Moon 39dfa61903 Add PartKeepr (#684)
* Add PartKeepr

electronic parts inventory managment

* PartKeepr

fixed
2016-08-22 22:13:58 +02:00
ilsi 2205606cf8 Add FreeIPA to "Federated Identity/Authentication" (#664)
* Add FreeIPA to "Federated Identity/Authentication"

* Licences changed to "Multiple"
2016-08-22 19:23:45 +02:00
Edward D 106dd0edb1 Update DPlatform website
Fixes #680.
2016-08-22 11:05:14 -04:00