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
nrew225
266f842fbf
Fix
2016-08-26 23:55:04 -07:00
nrew225
1c22bd1f40
Fix CMS
2016-08-26 23:47:24 -07: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
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
