Commit graph

1678 commits

Author SHA1 Message Date
n8225
d318a15804 Merge pull request #860 from Zeniic/patch-1
Add Shout-IRC
2016-11-22 15:09:37 -06:00
Zeniic
c9d74804a4 Update README.md 2016-11-22 18:13:05 +00:00
Johannes Zellner
37aa78c22e Add surfer 2016-11-22 13:42:40 +01:00
Miguel Piedrafita
5c2df7cf56 Format 2016-11-22 12:53:19 +01:00
Miguel Piedrafita
5e62570d1a Format 2016-11-22 12:52:21 +01:00
Miguel Piedrafita
04e688dfe0 License 2016-11-22 11:47:00 +01:00
Miguel Piedrafita
9fcaa6d011 Add LicAPI 2016-11-22 11:45:16 +01:00
Miguel Piedrafita
d44e6e877d Add Hexo 2016-11-22 11:32:10 +01:00
Zeniic
58eddd87e4 Added Shout-IRC
Added a new IRC to the list.
2016-11-22 02:12:48 +00:00
Edward D
68ca90f5a8 Added anchr.io and http2-serverpush-proxy
Replaces #855.
2016-11-20 23:38:39 +00:00
Miguel Piedrafita
02b062a28d Fix Tasks link 2016-11-18 18:24:05 +01:00
Andrew Rylatt
988886f7fb Merge pull request #852 from buremba/patch-1
Add Rakam Analytics
2016-11-16 06:49:13 +00:00
Andrew Rylatt
564e3a0692 Merge pull request #851 from Kickball/AddVisualCaptcha
Add Visual Captcha #788
2016-11-15 08:57:22 +00:00
Andrew Rylatt
fa13a9d9d4 Merge pull request #850 from thetomester13/add-homepage-thetomester13
Added 'Homepage'
2016-11-15 08:53:53 +00:00
Burak Emre Kabakcı
e7bbb32396 Update README.md 2016-11-15 08:16:35 +03:00
nrew225
1f391c4f33 Fix top contributing link 2016-11-14 16:12:56 -06:00
Burak Emre Kabakcı
af8db17f1a Update README.md 2016-11-14 18:06:47 +03:00
Burak Emre Kabakcı
886150249a Add Rakam Analytics 2016-11-14 18:04:01 +03:00
Tomer
77a4b3443b Removed 'Source Code' link 2016-11-13 19:55:30 -05:00
nrew225
450d9f2768 Add Visual Captcha #788 2016-11-13 16:41:59 -08:00
Tomer
da6ba934da Added 'Homepage' 2016-11-12 17:52:25 -05:00
n8225
eff99a5f0d Merge pull request #833 from uggrock/master
Adding TagSpaces
2016-11-11 08:21:33 -06:00
Johannes Zellner
e795888674 Add PHPGet
Fixes #818
2016-11-10 11:47:28 +01:00
n8225
04633d2362 Merge pull request #845 from rodolfoberrios/patch-3
Added "Chevereto Free"
2016-11-09 08:10:30 -06:00
Ilian
1367ae847d Updating entry for TagSpaces 2016-11-08 21:27:21 +01:00
Rodolfo Berrios
c8f61d8f42 Update README.md 2016-11-08 14:37:58 -03:00
Rodolfo Berrios
748824b743 Update README.md 2016-11-08 14:27:48 -03:00
Ilian
dd6eb0d35b Updating the entry for TagSpaces 2016-11-07 21:36:17 +01:00
nodiscc
5086fab2db Merge pull request #847 from JC5/patch-1
Updated Firefly III
2016-11-07 10:15:05 +01:00
Edward D
1d60cee61d Minor Text Fixes 2016-11-07 01:21:10 +00:00
Edward D
cb71a0dcfe Add Firefly Source Code and Demo 2016-11-07 01:04:09 +00:00
hebbet
88620380b3 add Tasks, fixes #839 (#840)
* add Tasks, fixes #839

* update urls

* change label
2016-11-07 01:01:09 +00:00
Edward D
5c5fbbbe4f Add Pushjet (#834)
* Add Pushjet

Add pushjet to misc/other and custom communication.

* Remove Misc/Other Pushjet

* Update Source Code URL
2016-11-07 01:00:57 +00:00
moba
b093b6e618 New section: conference management tools (#836)
* New section: conference management tools

* Fix Problems

Fix the problems highlighted by @AndyR207.
2016-11-07 01:00:52 +00:00
nodiscc
cce3e981f1 Merge pull request #838 from m1guelpiedrafita/patch-1
Add Ulterius
2016-11-07 01:03:13 +01:00
nodiscc
720220931f Merge pull request #837 from Kickball/gallery-css
Add Gallery-CSS
2016-11-07 01:02:48 +01:00
James Cole
3ab4945b86 Updated Firefly III
I have updated Firefly III: there is a link to the new website as well as an updated license (Creative Commons Attribution-ShareAlike 4.0 International).

To be able to include the license I have updated the list at the bottom.
2016-11-06 21:12:30 +01:00
Rodolfo Berrios
bc917bb826 Update README.md
Added Chevereto Free to Photo and Video Galleries
2016-11-05 23:27:45 -03:00
Alexey Strokach
d15143d4eb Add django-wiki (#844)
* Add django-wiki

* Remove full stop after Demo link.
2016-11-04 10:59:48 +00:00
Greg Chetcuti
8191db5285 Add DomainMOD to the Misc/Other section (#843) 2016-11-04 10:58:29 +00:00
Edward D
016c0032d9 Fix Demo URL 2016-10-31 16:39:08 +00:00
Miguel Piedrafita
9f9301ad5c Fix 2016-10-31 16:38:59 +01:00
Miguel Piedrafita
ae2d173484 Format 2016-10-31 16:36:38 +01:00
Miguel Piedrafita
d129979bc4 Format 2016-10-31 10:09:19 +01:00
Miguel Piedrafita
607813fed0 License 2016-10-31 00:26:05 +01:00
Miguel Piedrafita
ad01d04aa1 Syntax 2016-10-31 00:24:37 +01:00
Miguel Piedrafita
f9fd7ea342 Add Ulterius 2016-10-31 00:22:10 +01:00
Edward D
d511c113ee Add Gallery-CSS
Add Gallery-CSS
2016-10-30 23:04:57 +00:00
Ilian
a6e9295112 Update README.md 2016-10-26 15:51:25 +02:00
Ilian
93b4c726a7 Adding TagSpaces to the note taking section 2016-10-25 15:22:40 +02:00
nodiscc
eb80d75ee1 Merge pull request #827 from Kickball/Addtomisc
Add COPS & CrushPaper
2016-10-24 21:19:54 +02:00
n8225
876e0bad9a Remove extra space in Crushpaper 2016-10-24 09:45:40 -07:00
nrew225
9210f18c01 Fix descriptions 2016-10-24 08:57:49 -07:00
nrew225
274c914e28 Fix E-commerce
Add 2 spaces before every entry in E-commerce to match the rest of the file.
Update Shoop to Shuup, updated Demo to the demo lpage listed on the site with provided admin credentials.
2016-10-23 09:30:38 -07:00
n8225
652204196d Fix Ubos (#828)
Added missing space between description and license.
2016-10-23 14:49:35 +01:00
nrew225
46b58af415 Add to Misc/Other
Add COPS #566
Add CrushPaper #312
2016-10-22 14:08:43 -07:00
n8225
a85cfaab90 Merge pull request #824 from fegul/master
Adding Brimir, an open-source ticketing system to the Ticketing category
2016-10-22 08:37:59 -07:00
n8225
6cd2cf66c8 Add oneye & OS.js (#826)
Add oneye #820 & #242
Add OS.js #821 &#242
2016-10-22 16:18:37 +01:00
Andrew Rylatt
33b60930df Add 'Source Code' link, changed homepage URL to HTTPS and fixed 'open-source' spelling. 2016-10-20 20:42:04 +01:00
Feleg
495604d559 Removed extra slash in Brimir link 2016-10-20 17:44:30 +03:00
Feleg
c61961e82b Added Brimir
Added Brimir to Tickting
2016-10-20 17:42:01 +03:00
Andrew Rylatt
14e5673119 Grammar fix 2016-10-19 06:39:25 +01:00
Danja Vasiliev
00786cd7d1 Update README.md
https and typo fixes
2016-10-18 13:47:21 -04:00
Danja Vasiliev
959fcecad2 Update README.md
Added Hotglue.me CMS
2016-10-18 09:59:44 -04:00
Danja Vasiliev
57a188ad4a Update README.md 2016-10-18 09:14:32 -04:00
Andrew Rylatt
fde0a17d8a Merge pull request #810 from andreipoe/add/flox
Add Flox.
2016-10-17 13:23:57 +01:00
Andrew Rylatt
043a28a045 Remove Source Code URL 2016-10-17 11:09:52 +01:00
Andrew Rylatt
c3a583606f Merge pull request #814 from Kickball/Fix_BlogoText
Fix BlogoText
2016-10-17 00:50:19 +01:00
Andrew Rylatt
4c71b0e574 Merge pull request #815 from Kickball/Add_PHP-proxy
Add PHP-proxy-app
2016-10-17 00:49:50 +01:00
Andrew Rylatt
ee06eb1a7b Merge pull request #816 from Kickball/Add_Comms
Add Custom Communications
2016-10-17 00:49:10 +01:00
nrew225
e7ebaeb823 Custom Communications
#254 Ring
#356 MiAOU chat
#278 Scrollback
#275 Hack.Chat
#251 Niltalk
2016-10-16 14:54:34 -07:00
nrew225
2c2d7ba88c Add to project management
#314 Git WebUI
#269 Gitblit
#267 Bonobo Git Server
#266 SCM Manager
2016-10-16 13:08:22 -07:00
nrew225
5f68f149c4 Add PHP-proxy-app
Issue #790
2016-10-16 11:27:53 -07:00
nrew225
66eec83baa Fix BlogoText
Issue #806
2016-10-16 11:10:45 -07:00
Pierre Tinard
803d7066b1 Update README.md 2016-10-16 15:53:01 +02:00
Pierre Tinard
fad2ec7632 Add EdPaste to Pastebin
I've written a Laravel/PHP-driven Pastebin name EdPaste, demo at https://paste.edraens.net, and source code at https://github.com/Edraens/EdPaste
2016-10-16 15:48:29 +02:00
Andrei Poenaru
e2bcc47030 Merge changes from upstream. 2016-10-15 22:45:37 +01:00
n8225
5d21ba9171 Merge pull request #804 from Pe46dro/master
Some additions
2016-10-15 14:30:10 -07:00
Andrei Poenaru
d0455dd765 Add Flox. 2016-10-10 21:05:55 +03:00
Pe46dro
bd74c3f905 MailyHerald description and Mailchinp trademark 2016-10-08 22:56:08 +02:00
Pe46dro
6061dbb944 Fix 2016-10-08 21:02:23 +02:00
Salvatore Gentile
82b25cbd62 Add CoderVault 2016-10-07 14:57:56 +02:00
Pe46dro
2e4905fc8d Fix 2016-10-05 20:45:41 +02:00
Pe46dro
4ed33932df Merge branch 'master' of https://github.com/Pe46dro/awesome-selfhosted 2016-10-04 21:05:27 +02:00
Pe46dro
9f0f7e4121 New Category
Add Syncloud
Ass OpenMediaVault
Add Telescope
Add MailyHerald
Add DreamFactory
2016-10-04 21:05:22 +02:00
nodiscc
67d067b0d4 Merge pull request #796 from Kickball/rm-distributedfs
Remove distributed filesystems
2016-10-03 21:02:08 +02:00
Pau Kiat Wee
c9191928cc Add BudgetApp.io (#802)
* Add BudgetApp.io

* Removed extra bracket after Demo link
2016-10-02 17:53:14 +01:00
n8225
5a2d138eca Merge pull request #797 from Kickball/rm-glpi-127
remove GLPI, link to https://github.com/n1trux/awesome-sysadmin#it-asset-management
2016-10-01 09:59:37 -07:00
Johannes Zellner
31f237b775 Add Guacamoly project (#799) 2016-09-28 19:20:51 +01:00
nodiscc
c4d4ee9224 remove GLPI
Add link to https://github.com/n1trux/awesome-sysadmin#it-asset-management in Money, Budgeting and Management
GLPI is already listed there
Ref #127
2016-09-27 15:05:13 +02:00
nodiscc
4528f66f24 Remove distributed filesystems
link to awesome-sysadmin
Ref https://github.com/Kickball/awesome-selfhosted/issues/127
Wait for https://github.com/n1trux/awesome-sysadmin/pull/185 https://github.com/n1trux/awesome-sysadmin/pull/186 https://github.com/n1trux/awesome-sysadmin/pull/187 https://github.com/n1trux/awesome-sysadmin/pull/188
2016-09-27 14:57:35 +02:00
Andrew Rylatt
a6d6a0e86b Merge pull request #792 from Kickball/Add-DotLedger
Add multiple items
2016-09-24 17:11:35 +01:00
Andrew Rylatt
ebed06c06a Merge pull request #793 from Kickball/Add-RSSPBRRY
Add rsspbrry and wheatbin
2016-09-24 17:10:50 +01:00
Christophe Hamerling
8917b5533e Add hublin link 2016-09-20 08:26:42 +02:00
nrew225
6fd2e1bfda add etherdraw #565 2016-09-18 19:48:23 -07:00
nrew225
91bd5231ea add mistserver #482 2016-09-18 19:38:05 -07:00
nrew225
371d97cd69 add open food network #486 2016-09-18 19:37:07 -07:00
nrew225
ec321a2e5e add rartracker #524 2016-09-18 19:35:19 -07:00
nrew225
fccb11f525 add musical artifacts #561 2016-09-18 19:34:05 -07:00
nrew225
afc83acb82 add home assistant #656 2016-09-18 19:32:52 -07:00
nrew225
fe5760cc74 add wheatbin #658 2016-09-18 19:28:29 -07:00
nrew225
ebe258ad1e Add Rsspbrry #658 2016-09-17 11:13:13 -07:00
nrew225
f2b196c02f Add Dot Ledger #518 2016-09-17 11:06:21 -07:00
nodiscc
2d9eb81697 add back to top link for each section
workaronud for anchor not working on second click
2016-09-15 20:03:47 +02:00
n8225
3769d45418 Add ProcessWire #708 and Noosfero #539 (#784) 2016-09-15 02:17:34 +01:00
Andrew Rylatt
66587ee6aa Merge pull request #785 from erdihu/patch-1
Add Paste
2016-09-14 17:10:14 +01:00
Beard of War
fc55bf67bb Adding Odd Networks (#779)
* adding Odd Networks

* fix android typo
2016-09-14 03:20:49 +01:00
n8225
6c1e3bc3ad Add Crypt Pad (#781)
* Add Cryptpad #768

* Fix
2016-09-13 22:30:57 +01:00
n8225
1395ed8a18 Add spreed (#782)
* Add Spreed WebRTC #645

* Fix

* Fix grammer
2016-09-13 22:30:20 +01:00
n8225
d21c0c70b7 Add homebank (#783)
* Add homebank-converter #776

* Fix
2016-09-13 22:29:33 +01:00
Emeric POUPON
1c2c66cd4e Add FileShelter (#786) 2016-09-13 22:20:26 +01:00
erdihu
44d7b87ab6 Changed homepage address
Changed homepage address to http://phpaste.sourceforge.net/
2016-09-13 12:44:04 +02:00
erdihu
181e0cfcd5 Add Paste under Pastebins 2016-09-11 19:54:19 +02:00
n8225
7597f8a89b Fix Kriss Feed license
Issue #145
2016-09-09 06:37:57 -07:00
n8225
676b212f4c Merge pull request #777 from Pe46dro/master
Add Plik
2016-09-08 07:34:27 -07:00
n8225
e1b99066de Fix syntax errors. (#774)
* Fix syntax errors.

* Fix Huboard syntax.
2016-09-08 05:11:29 -04:00
Paweł Kapała
bfaea77fbe Add Buddy GO to self-hosted continuous integration application (#775)
* Add Buddy GO to self-hosted continuous integration application

* add Fair license to licenses list

Ref https://github.com/Kickball/awesome-selfhosted/pull/775
2016-09-08 05:09:46 -04:00
Pe46dro
ab60106e0c Added Plik 2016-09-07 20:06:07 +02:00
Andrew Rylatt
bdd74f8712 Merge pull request #771 from Kickball/kazoo
Add Kazoo (IPBX)
2016-09-05 06:55:53 +01:00
Andrew Rylatt
eeb0ba5284 Merge pull request #767 from n8225/Fix-Wiki
Fix wiki
2016-09-05 06:55:17 +01:00
Andrew Rylatt
0b45b32c6a Merge pull request #763 from n8225/Fix-SoftwareDevelopment
Fix software development
2016-09-05 06:54:34 +01:00
Andrew Rylatt
8f74dbecbb Merge pull request #729 from n8225/Fix-ID
Fix/cleanup Federated Identity/Authentication & move to awesome-sysadmin
2016-09-05 06:48:27 +01:00
nrew225
160c48a5e3 Removed daloRadius 2016-09-04 22:29:24 -07:00
Edward D
cc163bab64 Add Kazoo (IPBX)
Add Kazoo to IPBX.

Resolves #657 and [fredguth/awesome-selfhosted#1](https://github.com/fredguth/awesome-selfhosted/pull/1).
2016-09-04 12:43:51 -04:00
Edward D
7d0b703d67 fix category description formatting 2016-09-04 10:29:40 -04:00
n8225
ebb20a8a7a Fix url shorteners (#766)
* Add languages and licenses.

* Fix syntax Nimbus.
2016-09-03 07:48:47 -04:00
n8225
ffbc0979f5 Fix ticketing (#765)
* Update links, licenses, and languages.  Add license to list.

* Fix syntax Huboard
2016-09-03 07:48:27 -04:00
n8225
8d3c4a6397 Fix language and licenses for Task Management Section. (#764) 2016-09-03 07:47:16 -04:00
nodiscc
29686ce89d Merge pull request #762 from n8225/Fix-Proxy
Fix proxy
2016-09-03 11:13:26 +02:00
nodiscc
4fd3bef91c Merge pull request #725 from n8225/Fix-CMS
Fix cms
2016-09-03 11:12:31 +02:00
nrew225
8b8250ecd0 Fix syntax Raneto. 2016-09-02 19:41:37 -07:00
nrew225
dac9948771 Fix syntax errors 2016-09-02 19:34:39 -07:00
nrew225
9e9c1f16fd Fix syntax jingo. Remove Commonplace.
Removed Commonplace: no commits in 4 years, no license listed.
2016-09-02 19:27:25 -07:00
n8225
d39b29ba21 Fix photo (#755)
* Moved Koken to non-free

Koken is proprietary software
http://help.koken.me/customer/portal/questions/15933623-question-about-koken-code

* Removed unmaintained, fixed licenses, languages, and sytax.

Add CCBYNCNDv4 license
Removed Phog no commits in over 2 years and no license listed(no answer
to issue questioning license from 1 year ago).
Removed Pygmyfoto, repo states project is mothballed fo the time being.

* Fix license
2016-09-03 04:00:21 +02:00
nrew225
d6e681fcf7 Add full stop Fossil. 2016-09-02 18:31:27 -07:00
nrew225
0e7238a59b Added licenses, languages, and removed unmaintained.
Makes PR #732 invalid.
Remove Docstore: last commit 3 years ago, no license.
2016-09-02 18:10:01 -07:00
nrew225
feb50398be Update TinyProxy source code link. 2016-09-02 16:58:11 -07:00
nrew225
318d1687a2 Add language to Swiperproxy 2016-09-02 16:49:56 -07:00
nrew225
05bc7c45fe Remove 99ko 2016-09-02 16:18:36 -07:00
n8225
6f5e69d32f Add license and lang to reportr and fix syntax. (#754) 2016-09-03 00:06:59 +02:00
n8225
10470245dd Update license, language, and fix syntax errors. (#756) 2016-09-02 23:57:13 +02:00
n8225
ae1e6c71c2 Fix readit later lists (#757)
* Remove Wallabag public instance.

* Fix Wallabag Syntax error.
2016-09-02 23:56:33 +02:00
n8225
24d2a3c13b Add Searx license, and language. Remove Searx public instances. (#758) 2016-09-02 23:55:52 +02:00
n8225
c3c9713ceb Fix pastebin (#753)
* Added pastebin license, add BSD 2 clause to list of licenses.

ZeroBin is now PrivateBin updated links.

* add Snipt full stop

* merge bsd-2clause/3clause licenses

do not differentiate BSD licenses.
We don't know whether previous entries are under BSD-2 or 3.
The only difference is:

> 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
2016-09-02 23:54:54 +02:00
nodiscc
a6ce0a0b35 Merge pull request #752 from n8225/Fix-password
Fix password
2016-09-02 23:23:28 +02:00
nodiscc
6d20410849 Merge pull request #751 from n8225/Fix-money
Fix-money
2016-09-02 23:23:23 +02:00
nodiscc
c1a244ed4b Merge pull request #750 from n8225/Fix-office
Fix office
2016-09-02 23:23:16 +02:00
nodiscc
099db0d534 Merge pull request #748 from n8225/Fix-mediaStreaming
Fix media streaming
2016-09-02 23:23:02 +02:00
nodiscc
c96279efc1 Merge pull request #742 from Kickball/Fix-Groupware
Removed double-spaces as noted in PR #741
2016-09-02 23:21:56 +02:00
nrew225
0a289f7c4a remove apachev1 2016-09-02 11:11:01 -07:00
nrew225
970d531d09 Capitalize Code Ethercalc 2016-09-02 09:55:23 -07:00
nrew225
ae707345ca Add missing ) 2016-09-02 09:54:29 -07:00
nrew225
b5ec346561 Added space Emby 2016-09-02 09:49:50 -07:00
n8225
e70743d756 Update License, language, and links for Maps section. Add WTFPL to list of licenses. (#747) 2016-09-02 18:27:36 +02:00
nrew225
bc217f52ed Added missing lang and moved Demo before Source Code. 2016-09-02 09:26:59 -07:00
nrew225
cf608d371f Added missing lang, added demo for Etherpad, and reordered. 2016-09-02 09:19:52 -07:00
nrew225
e7f7b29da4 Added missing lang, fixed links, reordered.
Removed GRR demo as it appears down. Added GRR source.
2016-09-02 09:11:26 -07:00
nrew225
e3d0d087c9 Changed Javascript to HTML5, removed Javascript as secondary language as its used in almost all web apps. 2016-09-02 08:09:31 -07:00
Sergey Bronnikov
7095bc9919 Add Calagator (#746)
* Add Calagator

* Add link
2016-09-02 15:42:34 +02:00
nrew225
c1be49b88b Shorten Rygel description some more. 2016-09-01 21:06:01 -07:00
nrew225
76a0a68fd8 Update languages, licenses, and links for Media section. Removed unmaintained HTPC, added fork.
Removed HTPC Manager no activity in over a year, added active HTPC
Manager fork.
2016-09-01 21:00:50 -07:00
n8225
9b79779ca9 Merge pull request #745 from Kickball/links-libreprojects
add Libre Projects to other software lists
2016-09-01 20:18:49 -07:00
nodiscc
3202eb75dc add Libre Projects to other software lists
Maintained since 2011
https://github.com/libreprojects/libreprojects
2016-09-01 18:20:19 +02:00
nodiscc
da4ecd8536 add 3rd-party service warning for cloudtunes
requires access to youtube/dropbox
2016-09-01 18:09:32 +02:00
n8225
28ba7680b5 Fix gateways (#740)
* Update Links, License and language for Gateways

* Fix syntax error

* Change gateone language to python
2016-09-01 12:39:03 +02:00
n8225
cf77c4158b Removed double-spaces as noted in PR #741 2016-08-31 09:21:29 -07:00
nrew225
f1025ebbe1 Update Link. 2016-08-30 20:26:01 -07:00
nrew225
14ac17b083 Add language, update links, and fix syntax for Groupware. 2016-08-30 20:22:49 -07:00
nodiscc
89dec5bbc9 fix Poffer entry
* depends on a third-party network service ⚠
 * Change platform to Nodejs as per https://github.com/Zhouzi/Poffer#installation
 * fixes for WTFDYUM - also depends on a third-party service
 * ref https://github.com/Kickball/awesome-selfhosted/pull/739
2016-08-30 22:29:51 +02:00
Gabin
51871a66d8 add Poffer 2016-08-30 22:04:43 +02:00
Edward D
15e84c5bcc Fix spacing issues identified in #736. 2016-08-30 08:06:20 -04:00
n8225
8f5049bc34 Fix file sharing (#736)
* Update License, language, and links.

* Reorder

* fix error

* reorder list of licenses

* shorten some descriptions
2016-08-30 14:03:24 +02:00
nrew225
3885410381 Merge remote-tracking branch 'refs/remotes/Kickball/master' into Fix-ID
# Conflicts:
#	README.md
2016-08-29 21:15:38 -07:00
nrew225
f6fea0b88a added link 2016-08-29 21:12:36 -07:00
nrew225
b4d89de76c Removed Freereadius, Freeipa, indieauth, libravatar, openid, and osiam 2016-08-29 21:09:06 -07:00
Edward D
68cd8060a9 Fic
Remove Roundcube screenshots.
Fix Oxwall formatting.
Fix Kontalk formatting.
Remove OpenCA OCSPD.
2016-08-29 19:59:45 -04:00
n8225
596204364a Merge pull request #735 from Corion/patch-4
Add mojopaste (pastebin)
2016-08-29 15:44:03 -07:00
Edward D
74765c1f26 Add Medusa
Resolves merge conflict in #659.
2016-08-29 17:52:29 -04:00
Max Maischein
132d2e281a Update README.md 2016-08-29 21:31:59 +02:00
Max Maischein
3b3d4d385a Properly place the parentheses around [Demo] and [SourceCode] 2016-08-29 20:42:27 +02:00
Max Maischein
7cda67e256 Added source repository and demo link for mojopaste
Thanks to the comments, I've also added a link to the source repo and a live demo
2016-08-29 19:41:50 +02:00
Max Maischein
7841f5a509 Fix after review
Thank you for the speedy review!

Sorry - I hadn't noticed the full stop at the end of each line. Should be fixed now.
2016-08-29 19:38:22 +02:00
Max Maischein
a9cc1e22ca Add mojopaste (pastebin) 2016-08-29 19:07:51 +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
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
1819653a81 update OpenCA weblink 2016-08-27 15:45:28 -07:00
nrew225
0a9aa089d5 Fix Federated Identity/Authentication
Fixed licenses and languages.
Remove OpenID/OpenID Connect as it appears to be a standard and not
software.
Updated Source codes.
2016-08-27 15:34:29 -07: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
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
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
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
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
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
Edward D
17712050cb Wordpress language added and OXID eShop formatting fixes 2016-08-22 10:51:08 -04:00
Alfred Bez
65fec972aa added OXID eShop (#679)
closes #677
2016-08-22 16:48:22 +02:00
lsascha
3f38ed8d61 added sysPass to Password Managers (#678)
* added sysPass to Password Managers

* added license and language to sysPass
2016-08-22 16:46:50 +02:00
Jannik Anker
5b3a5474e1 Added Umbraco CMS (#681) 2016-08-22 16:45:48 +02:00
nodiscc
67b3dbb3d2 Merge pull request #667 from faisalhmohd/patch-1
Added Magento to E-commerce section
2016-08-22 13:18:45 +02:00
Mohammad Faisal
4ff5131330 Space added 2016-08-22 16:31:39 +06:00
nodiscc
3a4e611b8f Merge pull request #670 from carlos8f/master
Add Zenbot 3
2016-08-22 12:23:29 +02:00
nodiscc
0453d08421 Merge pull request #672 from MartinMalinda/patch-1
Roadiz runs on PHP, not NodeJS
2016-08-22 12:15:46 +02:00
nodiscc
46c13d14c9 Some additions and fixes (#669)
* add moped

* add mopidy-party and mopidy musicbox

* contributing: add note about alphabetical order

* add ympd

* makefile: add listlicenses target
lists all license fields in README.md

* misc license/format fixes
 * license *before* language
 * simplify licenses version numbers
 * remove 20euros (no license)
 * move gazelle to non-free (non commercial restriction https://github.com/WhatCD/Gazelle/blob/master/docs/COPYING.txt)

* license fixes, remove gaskit
(no activity  ~4 years https://github.com/bkeepers/gaskit/branches)

* license fixes, remove webalizer
(unmaintained, last modification date in source .tgz is 2013)

* makefile: add longdescriptions target
finds all descriptions longer than 250 characters

* makefile: only search for licenses and long descriptions between actual list beginning/end

* makefile: add syntaxerrors target (currently detects weird pairings like )(, `` )
add more tests to main makefile target

* makefile: fail if invalid content is found

* re-add untrusted to non-free.md (non-commercial license)
2016-08-22 12:07:58 +02:00
Martin Malinda
0e613617aa Roadiz runs on PHP, not NodeJS 2016-08-22 09:19:22 +02:00
Touhid Arastu
2366559d25 add Deskulu, opensource helpdesk and ticketing system 2016-08-22 11:10:49 +04:30
Carlos Rodriguez
03270b05de
Add Zenbot 3 2016-08-21 22:44:08 -07:00
Anton Troyanov
437661b6fb added OpenGTS to Maps & GPS section (#662)
* added OpenGTS to Maps & GPS section

OpenGTS™ ("Open GPS Tracking System") is the first available open source project designed specifically to provide web-based GPS tracking services for a "fleet" of vehicles

* updates according to pull request comments
2016-08-21 22:58:58 +02:00
Mohammad Faisal
e779979fbc Added Posio and fixed Hextris under Games (#668) 2016-08-21 22:56:34 +02:00
Mohammad Faisal
b191e483f6 Roadiz added (#666) 2016-08-21 22:49:38 +02:00
Mohammad Faisal
5beaf791ce Changed license to OSLv3 for Magento 2016-08-21 22:36:47 +06:00
Mohammad Faisal
7bb636542b Added Magento to E-commerce section 2016-08-21 22:16:32 +06:00
ePirat
cac989d793 Add Icecast to video streaming section (#663)
This adds Icecast to the video streaming section as well, and clarifies that it is an audio and video streaming server in the description. (Ref. #660)
2016-08-21 16:46:56 +02:00
Tim Allingham
e39b3410ac update link to invoiceninja for self hosted version 2016-08-21 20:23:40 +10:00
Andrew Rylatt
c0769718c9 Corrected Spacing and removed HL above Self-hosting Solutions 2016-08-18 07:04:29 +01:00
n2i
19dea564e2 Add NoteHub - Pastebin - Nodejs (#650)
Free and Hassle-free Pastebin for Markdown Pages. A simple, clean, password provided, generated-short link pastebin app.
2016-08-17 22:11:30 +02:00
nodiscc
e0f2b44a36 Merge pull request #653 from icterine/patch-1
Added miniProxy
2016-08-17 09:54:15 +02:00
Andrew Rylatt
0bf9d99eb7 Merge pull request #654 from Ketrel/Additions
Added CouchCMS
2016-08-17 07:16:28 +01:00
Andrew Rylatt
e712839c74 Merge pull request #652 from n8225/Misc/Other
Replace PR #638
2016-08-17 07:14:46 +01:00
Andrew Rylatt
114e9743e9 Merge pull request #646 from dpfaffenbauer/master
add CoreShop to e-commerce section
2016-08-17 07:11:22 +01:00
icterine
0beabd9c71 Added miniProxy
Added miniProxy and sorted Proxy section alphabetically
2016-08-17 14:03:16 +10:00
Ketrel
bd74e8c358 Added CouchCMS
Added CouchCMS to Content Management section
2016-08-16 10:47:56 -04:00
icterine
b119f0ff68 Update README.md
Added miniProxy to Proxy section
2016-08-16 22:51:10 +10:00
nrew225
6d3b64b4df fix link 2016-08-15 20:30:48 -07:00
dpfaffenbauer
45ca9fe3cf add gplv3 to coreshop 2016-08-15 08:39:34 +01:00
nodiscc
80aa2dadd6 remove PHP QR Code
not a web application, see https://github.com/Kickball/awesome-selfhosted/pull/637
2016-08-15 00:34:23 +02:00
n8225
3edf6aece5 Added programming language and license info in Note-taking & Editors. (#636)
* Added programming language to Wikis.

* Filled in missing licenses.

* Added ICEcoder issue #295

* Update README.md

Moved third party icon issue #633

* Add JARR #625

* Fixed syntax JARR

* Update README.md

* Added Leanote to Note-taking & Editors

* Added Wikifeat to Wikis

* Added Wide to IDE/Tools

* Add Uguu Issue #234

* Added Monsta FTP issue #244 to Web based file managers.

* Added DiamanteDesk issue #258 to Ticketing.
Reordered Ticketing in alphabetic order.
Added Open Software License 3.0 to list of licenses.

* WordPress: Added programming language

* Added programming language and license info for Jotter, Laverna, OpenNote, and Paperwork in Note-taking & Editors.

* Fixed Errors

* Removed - Read only from pepperminty wiki

* removed Jotter demo credentials

* corrections
2016-08-14 23:35:55 +02:00
Justin Clift
1989ed5f98 Add GlusterFS under Distributed Filesystems (#647) 2016-08-14 23:34:49 +02:00
n8225
ff3c081544 Add/FIX games (#641)
* Add 0hh1 to games

* Add ClumsyBird to games

* Add a dark room to games (#558)

* Added Hextris to games

* Add untrusted to list of games (#558)

* Add CCANCSAv3 to list of licenses

* FIX 20Euros (syntax, language, demo)

* Fix Agar.io (syntax, language)

* Fix Cubiks-2048

(syntax, license, language), added license to list of licenses)

* Fix added licenses syntax error.

* corrections

* corrected CCA to CCBY
2016-08-14 23:32:19 +02:00
nrew225
5cb30f7ee9 Added Misc/Other category
Added Webtrees issue #635
Added Geneweb
Removed Minmaps Category
moved mandmaps to Misc/other
added rule to contrib section
2016-08-14 10:35:10 -07:00
Icantcodeatall
15f9ad6a3e Add Sonarr (#648)
* Update README.md

* Update README.md

* Update README.md
2016-08-12 16:35:54 -04:00
dpfaffenbauer
3e6e91fe69 Add fullstop after description 2016-08-12 08:24:53 +02:00
Andrew Rylatt
2bbb3084d8 Merge pull request #630 from Kickball/rm-unmaintained-381
remove unmaintained projects
2016-08-12 07:18:35 +01:00
dpfaffenbauer
0c155d67a8 order alphabetically 2016-08-09 21:53:22 +02:00
dpfaffenbauer
8de320284c add CoreShop to e-commerce section 2016-08-09 09:54:04 +02:00
Edward D
a1b56aeb42 Readd Newebe 2016-08-06 22:11:56 +02:00
Ober7
e4b7ffc35a Add PHP QR Code (#637) 2016-08-06 21:56:00 +02:00
Andrew Rylatt
e9f4d56be7 Merge pull request #640 from n2i/patch-1
Add Subrion - CMS - PHP
2016-08-06 20:51:05 +01:00
Andrew Rylatt
b5720e4492 Merge pull request #639 from n8225/fixagendav
Agendav Fix
2016-08-06 20:50:16 +01:00
Andrew Rylatt
128d4852f5 Merge pull request #642 from n8225/AddSerposcope
Add Serposcope #611
2016-08-06 20:47:19 +01:00
Michael Barrow
407ec8dd1a Fix Kanboard license
Kanboard is MIT-licensed, not AGPL3. Ref: https://github.com/kanboard/kanboard/blob/master/LICENSE
2016-08-03 22:33:26 -07:00
nrew225
a39f894b18 Add Serposcope #611 2016-08-03 20:50:55 -07:00
xuansamdinh
fc48d69b90 Add Subrion - CMS - PHP
Subrion - free open source content management system that allows you to build websites for any purpose. Yes, from blog to corporate mega portal.
2016-08-04 10:08:41 +07:00
nrew225
f03d9e5cb9 Agendav Fix
Added missing parenthesis around Source Code for Agendav
2016-08-03 19:42:05 -07:00
Andrew Rylatt
e3a320650a Fix DirectoryLister merge conflict 2016-07-30 19:08:08 +01:00
Simone Grignola
f66e9efe84 Sorted Lavagna correctly 2016-07-27 21:38:59 +02:00
Simone Grignola
ed6222cec2 Added Lavagna as a project management tool 2016-07-26 23:09:35 +02:00
nodiscc
b6e8376b3d remove gallery3
unmaintained as per http://galleryproject.org/
#381
2016-07-25 16:18:24 +02:00
nodiscc
105e6b7c83 remove cacocloud
#381
2016-07-25 16:12:40 +02:00
nodiscc
4f2dd0839a remove newebe
#381
2016-07-25 16:06:22 +02:00
nodiscc
6f72ca5580 remove unmaintained projects
work on #381
2016-07-25 16:01:53 +02:00
Felix Bartels
681e05a7f3 update demo link for Kopano
Hi, the demo link for Kopano was missing the http and is therefore broken. Fix attached.
2016-07-22 14:57:40 +02:00
Edward D
1812296c19 Pastebin Category Fixes, Formatting Fixes for Pastebin 2016-07-12 12:35:16 -04:00
Eliot Whalan
de9e0f602a
Add Demo and Source code links 2016-07-12 16:40:48 +10:00
Eliot Whalan
332f1c462c
Add language, license and demo link 2016-07-12 16:38:35 +10:00
Eliot Whalan
a1c2bebda4
Add golang pastebin link 2016-07-12 11:05:03 +10:00
Paolo Pustorino
f3f88adacd Added Firefly III to financial tools (#618)
* Added Firefly III to financial tools

* Added correct license (MIT) for Firefly III

* Shortened description as for contribution guidelines
2016-07-11 15:57:26 -04:00
Andrew Rylatt
1dc44800d0 Merge pull request #620 from Aisbergg/cleanup-documentation-generators
Removed 'daux.io' and 'MdWiki' from 'Documentation Generators'
2016-07-11 07:03:35 +01:00
Andre
d318953ef3 Removed 'daux.io' and 'MdWiki' from 'Documentation Generators'. Added reference to static site generators. 2016-07-10 23:17:47 +02:00
Kevin Hinterlong
82168d2bf0 Fix sentence
added comma
2016-07-10 14:03:22 -05:00
Kevin Hinterlong
a3fa034bf9 Fix sentence
"open source" was repeated
2016-07-10 13:58:44 -05:00
Austin
3fc1241890 Update Pomf Repository URL
Development of pomf has shifted to an organization url, after long inactivity from nokonoko.

A PR was merged, stating that development has moved to the url now listed in this PR.
2016-07-08 07:55:24 -05:00
nodiscc
606bcdba09 Merge pull request #609 from spekulatius/patch-1
Improving readability
2016-07-07 13:43:33 +02:00
nodiscc
452c494760 Merge pull request #608 from yannforget/patch-1
Add InfCloud
2016-07-07 13:43:09 +02:00
FortressBuilder
ae8bf3c057 Add openHAB 2016-07-07 09:41:04 +02:00
Yann
6c675000d5 Add InfCloud: correct link 2016-07-07 01:07:52 +02:00
Andrew Rylatt
9300c42a3e Merge pull request #604 from marclaporte/patch-2
Adding WikiSuite
2016-07-06 23:45:08 +01:00
Andrew Rylatt
3d3af2e41d Merge pull request #605 from nodiscc/bipio
Add Bipio
2016-07-06 23:43:59 +01:00
Peter Thaleikis
d627f4e9c2 Improving readability
Removing dot and unnecessary explaination.
2016-07-06 20:06:44 +12:00
Yann
5b2d789ed1 Add InfCloud
[Website](https://www.inf-it.com/open-source/clients/infcloud/), [Demo](https://www.inf-it.com/infcloud/)

A recent integration (2015-09-22) of CalDavZap and CardDavMate, two CalDAV & CardDAV web clients.
2016-07-06 02:36:32 +02:00
fengshaun
91561ed5c2 reorder transfer.sh and remove duplicate Jirafeau entry 2016-07-03 15:32:45 -04:00
nodiscc
2197c44aa3 syntax fix 2016-07-03 13:01:44 +02:00
nodiscc
18e23635a4 fix tine2.0 entry, closes https://github.com/Kickball/awesome-selfhosted/issues/595 2016-07-03 12:59:31 +02:00
nodiscc
3d6c03797d add Bip.io 2016-07-03 12:57:44 +02:00
Marc Laporte
c987587645 Adding WikiSuite 2016-07-03 05:15:14 -04:00
fengshaun
6757f46610 add Jirafeau and transfer.sh to file sharing category 2016-07-02 23:52:02 -04:00
Cristian Menghi
7ed4391b49 Fix Keeweb (#598)
* Adding Keepass

* add keeweb

A web based password manager compatible with keepass

* fixit URL keeweb
2016-07-02 12:56:46 -04:00
foorb
163d3ace2b Add Encode Explorer (#564)
* Encode Explorer

Encode Explorer is a file browser written in PHP, XHTML and CSS. It displays the list of files in a folder. It was designed to be used in safe mode and so it is kept simple and functional. Free for everyone.

* Fix Encode Explorer Description and Ordering
2016-07-02 12:51:45 -04:00
nodiscc
ef99b6b75f Add DirectoryLister
Closes #239
2016-07-01 23:40:47 +02:00
nodiscc
8b8db3a57f Merge pull request #590 from Kickball/citadel
Add Citadel Missing Information
2016-06-26 11:38:32 +02:00
Andrew Rylatt
2f925ab5f7 Merge pull request #591 from Kickball/exim
Update Exim Missing Information
2016-06-25 21:41:10 +01:00
Edward D
ccd843ee46 Update Exim Formatting 2016-06-25 16:40:24 -04:00
Andrew Rylatt
d0c2658dd1 Merge pull request #592 from Kickball/opensmtpd
Update OpenSMTPD with missing information
2016-06-25 21:38:42 +01:00
Andrew Rylatt
9de34d0ad7 Merge pull request #593 from Kickball/qmail
Update Qmail with missing license
2016-06-25 21:37:21 +01:00
Edward D
6a5fd81d30 Update Groupware Missing Information 2016-06-25 16:21:36 -04:00
Edward D
d85012945d Fix OpenSMTPD (MTA) Source Code Link 2016-06-25 16:05:22 -04:00
Edward D
e0df3619e2 Add Qmail Source Code 2016-06-25 16:02:04 -04:00
Edward D
3fee3d2db3 Fix Citadel (Email Complete Solutions) License 2016-06-25 15:57:13 -04:00
Edward D
f87341d5cc Fix Exim (MTA) License and Source Code 2016-06-25 15:55:24 -04:00
Edward D
2fc34fba50 Update Qmail with missing license
* Add Qmail License
2016-06-25 00:12:59 -04:00
Edward D
161bd09ed9 Update OpenSMTPD with missing information
* Add OpenSMTPD Language
* Add OpenSMTPD Source Code
2016-06-24 23:52:55 -04:00
Edward D
9fc900a883 Update Exim Missing Information
* Add Exim Language
* Add Exim Source Code
* Update Exim Site Link to use HTTPS
2016-06-24 23:46:00 -04:00
Edward D
6262e0112a Add Citadel Missing Information 2016-06-24 23:42:49 -04:00
nodiscc
6277cdfa93 cleanup: remove double dots, AGPL -> AGPLv3, update contributors list 2016-06-24 08:53:37 +02:00
nodiscc
fee315fa34 Merge remote-tracking branch 'kickball/pr/581' 2016-06-24 08:50:50 +02:00
nodiscc
4071ff3dc0 Merge pull request #585 from fbartels/master
Add Kopano (completely open fork of MAPI based groupware Zarafa)
2016-06-24 08:48:50 +02:00
nodiscc
a6ccbe6a80 Merge pull request #584 from astorije/patch-1
Replace unmaintained Shout with its official community fork
2016-06-24 08:48:39 +02:00
nodiscc
89d2090ef0 Merge pull request #568 from CooperBarrett/master
Add Nextcloud, explorer, goBrowser,  SickRage & CouchPotato
2016-06-24 08:48:17 +02:00
Felix Bartels
0462114879 Add Kopano (completely open fork of MAPI based groupware Zarafa) 2016-06-24 08:02:31 +02:00
Jérémie Astori
b6a49a2cde Replace unmaintained Shout with its official community fork
The Lounge is a community initiative started earlier this year, after development on Shout stopped.
Demo looks sloppy at the moment, I know...

See https://github.com/erming/shout#official-forks
2016-06-23 22:36:19 -04:00
Andrew Rylatt
061f9089db Merge pull request #576 from Kickball/addition/ttrss-reader
Add ttrss-reader
2016-06-22 22:35:49 +01:00
Andrew Rylatt
fb5dc2754a Merge pull request #580 from githubber/master
Added to Web based file managers
2016-06-22 22:35:23 +01:00
markkrj
f6bc93a81d Update README.md 2016-06-22 08:33:07 -03:00
Shane Cooke
1e37b7b66b Updating info about source code, licence, language 2016-06-22 16:57:03 +06:00
nodiscc
ce62307d00 Fix lets-chat language/platform 2016-06-22 12:48:46 +02:00
Alashov Berkeli
a6ac53c39c
added Actor 2016-06-22 05:56:48 +05:00
markkrj
7916ec1e5a Update README.md 2016-06-21 18:19:05 -03:00
Shane Cooke
6ba9e786c0 Added to Web based file managers
But they are more like DAMs
2016-06-21 21:15:03 +06:00
CooperBarrett
1e36fd78f9 Change booksickmarks to bookmarks 2016-06-19 23:58:56 +02:00
nodiscc
16ec971d02 fix ttrss-reader
missing final .
2016-06-18 22:07:12 +02:00
nodiscc
d80a04b022 Add ttrss-reader
Fixes https://github.com/Kickball/awesome-selfhosted/issues/394
2016-06-18 22:06:20 +02:00
nodiscc
28ce14f628 Merge pull request #575 from nodiscc/fix-ethercalc
fix ethercalc entry
2016-06-18 20:12:42 +02:00
nodiscc
dbbc34d0fd Merge pull request #570 from rangeroob/gigablast
Add Gigablast
2016-06-18 20:06:09 +02:00
nodiscc
83024853ae Merge pull request #567 from ryantm/patch-2
add unison to file synchronization
2016-06-18 20:05:55 +02:00
nodiscc
468402c3d9 Merge pull request #560 from Aguay-val/master
Add Træfɪk (Traefik)  Web Proxy
2016-06-18 20:05:32 +02:00
CooperBarrett
3a1a9e100e Remove Language Html 2016-06-18 19:43:24 +02:00
CooperBarrett
be5c42a08f Remove jQuery language fron Sickrage 2016-06-18 08:31:22 +02:00
CooperBarrett
de95e90165 Add explorer & goBrowser
Add explorer & goBrowser
2016-06-17 23:41:20 +02:00
CooperBarrett
6b14fbba49 Update License
Update License Sickrage, Couchpotato and Nextcloud
2016-06-17 23:12:32 +02:00
Derek Viera
04feecf0a3 make alphabetical 2016-06-17 16:33:57 -04:00
Derek Viera
8c7cfbe4af Add Gigablast 2016-06-17 16:23:47 -04:00
CooperBarrett
2609c1024b Add Nextcloud
Add Nextcloud, fork of Owncloud
2016-06-17 10:14:59 +02:00
CooperBarrett
3e8d961c2e Update README.md 2016-06-17 09:40:07 +02:00
CooperBarrett
d654ca6898 Add SickRage & CouchPotato
Add SickRage & CouchPotato, Automatic torrent/nzb searching, downloading for TV Shows and Movies
2016-06-17 09:38:44 +02:00
Ryan Mulligan
77337a1fc6 add license and language for unison 2016-06-14 20:09:36 -07:00
Ryan Mulligan
abbb9e591b add unison to file synchronization
Unison is a very nice file synchronization program licensed under GPL.
2016-06-14 20:05:50 -07:00
Andrew Rylatt
95d863aa2a Merge pull request #555 from nodiscc/markdown-edit
Add Markdown Edit
2016-06-10 22:22:58 +01:00
Alex Fornuto
797c88c9bc Move Subsonic to non-free list, Add Libresonic (#550)
* moved subsonic to non-free

Now that Subsonic is [no longer open-source] (http://forum.subsonic.org/forum/viewtopic.php?f=4&t=16604#p71128), it belongs on the non-free list.

* removed open-source from Subsonic's description

* Closing Parens

* added libresonic to readme

Replaces Subsonic, which has been moved to the non-free list.

* alphabetized

.... I got your alphabetized right here... grumble frakem
2016-06-10 02:21:20 +01:00
Ethan Madden
497aa1b0b3 Added pbnh (#553)
* Added pbnh

* fix pbnh entry

better description, fix missing full stop
ref https://github.com/Kickball/awesome-selfhosted/pull/553
2016-06-10 02:20:04 +01:00
Matteo Piccina
572b1de096 Added Eclipse Che (#546)
* Added Eclipse Che

* Added Code for Eclipse Che

* update eclipse che license

add entry in the licenses list
Ref https://github.com/Kickball/awesome-selfhosted/pull/546

* Reordered IDE/Tools
2016-06-10 02:19:44 +01:00
David Baldwynn
e25776ac30 Added tellform to Polls/Events (#563)
* Added tellform to Polls/Events

* Dudle added back

* add tellform source code link

Ref https://github.com/Kickball/awesome-selfhosted/pull/563

* Re-ordered polls/events into alphabetical order
2016-06-10 02:19:07 +01:00
Aguay
d80bb573b1 Modify double point by end point 2016-06-08 22:33:53 +02:00
nodiscc
feb295497c fix localpaste entry
lowercase, missing whitespace
Closes https://github.com/Kickball/awesome-selfhosted/issues/230
2016-06-07 21:35:59 +02:00
Aguay
89d3faa23d Correct License (only MIT) + Delete demo + Add Source code 2016-06-01 23:06:58 +02:00
Aguay
719d87dea2 Add Træfɪk (Traefik) Web Proxy 2016-06-01 22:39:19 +02:00
Starbeamrainbowlabs
00895a945f Add Pepperminty Wiki (#556)
* Add Pepperminty Wiki

* Change license code to match everything else.

* Fix license, MPL2 -> MPLv2

Ref https://github.com/Kickball/awesome-selfhosted/pull/556
2016-05-26 19:48:57 +01:00
nodiscc
952e6ec070 Add dns section, redirect to awesome-sysadmin (#554)
fixes #548
2016-05-26 02:08:41 +01:00
nodiscc
2dc3bcd79f fix ethercalc entry 2016-05-21 23:57:24 +02:00
nodiscc
79f1f0cfcc alphabetical sort 2016-05-15 16:29:35 +02:00
Julien Reichardt
2895b2b84e Add DPlatform (selfhosted solutions)
* Add DPlatform

* Fix links to source code and website
2016-05-09 04:16:42 -04:00
The Scorpion
6f00b16fd5 Added Robust IRC (#551)
* Added Robust IRC

* Added Licence
2016-05-05 19:55:33 -04:00
Jarek Lipski
4ecbc140b9 Add Puffin (#544)
* Add Puffin

* Fix Makefile: source and demo links, invert order

* Put Puffin in alphabetical order
2016-05-05 19:52:46 -04:00
Matt Lee
d42de05252 Update README.md (#549)
Fix GNU social spelling and GNU FM license
2016-05-05 19:51:17 -04:00
nodiscc
e553b55454 add markdown-edit 2016-04-24 00:49:00 +02:00
nodiscc
025d9da0f9 Merge pull request #536 from pierreozoux/patch-1
Adds Mautic
2016-04-23 19:52:19 +02:00
nodiscc
eb3673e2a1 update contributors list (make contrib) 2016-04-23 19:50:22 +02:00
Gabriel Cossette
22e0ee5d6f Add Tiki (Wiki), Add Lifu (File Sharing)
* Add Tiki

* Add Lufi
2016-04-23 13:26:04 -04:00
Izac Lorimer
dcffc94261 Added OSSN (#538)
* Added OSSN

Added Open Source Social Network.

* Changed ' to `
2016-04-22 08:57:23 -04:00
Edward D
a50e2bbb03 Remove Unneeded Description 2016-04-21 20:15:01 +01:00
Andrew Rylatt
69d0c9b81d Merge pull request #531 from Kickball/olelo-fix
Olelo Formatting Fixes
2016-04-13 17:28:25 +01:00
Pierre Ozoux
db9a4606c9 Adds Mautic 2016-04-13 13:21:03 +02:00
Edward D
cd3f719e48 Update Olelo 2016-04-12 13:08:08 +01:00
Madhu GB
d2f1627b1c Add Druid (#534)
* Add Druid
2016-04-12 13:06:37 +01:00
Sylvain Boily
04e01b657b Add IPBX section (#526)
* Add IPBX section
2016-04-12 13:04:02 +01:00
nodiscc
c7c1a50292 Merge pull request #529 from Kickball/twister-fix
Update Twister (Social Networks and Forums)
2016-04-07 19:51:50 +02:00
nodiscc
abd6df79fd Merge pull request #532 from Kickball/relate
Add RELATE (Learning and Courses)
2016-04-07 19:51:23 +02:00
nodiscc
8c25e1ea5d Merge pull request #533 from Kickball/economizzer
Add Economizzer (Money, Budgeting and Management)
2016-04-07 19:44:17 +02:00
nodiscc
cfce078339 Merge pull request #530 from Kickball/tracks-fix
Update Tracks
2016-04-07 19:43:59 +02:00
Andrew Rylatt
ed4db9f7dd Merge pull request #519 from Kickball/hospital-run
Add Hospital Run
2016-04-07 13:33:35 +01:00
Edward D
1cd408854d Add LocalPaste 2016-04-07 09:09:42 +01:00
Edward D
795c36f944 Add Economizzer (Money, Budgeting and Management) 2016-04-07 07:36:21 +01:00
Edward D
4d4eaf7808 Add RELATE (Learning and Courses) 2016-04-07 07:28:28 +01:00
Edward D
98152b1cff Olelo Formatting Fixes 2016-04-07 07:08:39 +01:00
Edward D
e0b4ea2664 Update Tracks 2016-04-07 06:35:35 +01:00
Edward D
9f67565f1a Update Twister (Social Networks and Forums) 2016-04-07 06:30:23 +01:00
Edward D
e500fc4e62 Remove Backend Source Code Link 2016-04-07 05:42:35 +01:00
Andrew Rylatt
cd7cf64925 Merge pull request #521 from cedk/patch-1
Add Tryton to ERP
2016-04-07 05:03:04 +01:00
Andrew Rylatt
ed50a808da Merge pull request #520 from runical/master
Changed the pydio adress from pyd.io to pydio.com
2016-04-06 20:15:19 +01:00
Madhu GB
5d0f049837 Added Mailtrain and Slimta 2016-04-06 19:35:39 +02:00
Cédric Krier
64b40288c0 Add missing closing parenthesis 2016-04-03 15:23:32 +02:00
Cédric Krier
71080340f0 Fix language format 2016-04-01 09:55:22 +02:00
Cédric Krier
ec864e0b60 Add Tryton to ERP 2016-04-01 01:22:38 +02:00
Peter van den Hurk
ea9818f7ac Changed the pydio adress from pyd.io to pydio.com 2016-03-31 17:01:46 +02:00
Andrew
a78131253d Merge pull request #512 from richter-p/patch-1
added php password manager
2016-03-30 21:13:47 +01:00
Andrew
eaddaf07ba Merge pull request #514 from stweil/master
Fix typo (found by codespell)
2016-03-30 21:09:54 +01:00
Edward D
710406522e Merge pull request #516 from salsakran/patch-1
Add Metabase
2016-03-30 14:42:44 -04:00
paddo
e205a77728 Update README.md
updated link to project site
2016-03-30 10:19:46 +02:00
Edward D
a9df09f9ce Add Hospital Run 2016-03-30 01:18:02 -04:00
Sameer Al-Sakran
99c88df8ed add source code link 2016-03-28 13:10:32 -07:00
Sameer Al-Sakran
69c0b3aea8 Adding Metabase 2016-03-28 12:44:36 -07:00
paddo
4962d86412 Update README.md 2016-03-23 18:16:13 +01:00
paddo
8e59a0eb2a Update README.md 2016-03-23 18:14:53 +01:00
Hammy Havoc
165f7a99bc Added self to author list 2016-03-21 23:13:36 +00:00
Hammy Havoc
629211c365 Changed formatting of license
Was an acronym, now conforms with the given structure.
2016-03-21 23:06:42 +00:00
Hammy Havoc
6546d94a9b Added license 2016-03-21 22:58:59 +00:00
paddo
608dc53cd9 added php password manager 2016-03-20 22:52:25 +01:00
Hammy Havoc
84a713b2bd Corrected naming
Seems my Grammarly plugin messed this up. Oops!
2016-03-20 21:11:22 +00:00
Hammy Havoc
709a4d5fe0 Removed extra *
Thanks for catching that!
2016-03-20 21:09:26 +00:00
Stefan Weil
48a2facef4 Fix typo (found by codespell)
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2016-03-20 20:38:28 +01:00
Hammy Havoc
40fca01171 Added Grafana
Lovely software.
2016-03-20 03:49:27 +00:00
Edward D
0b433e875b Merge pull request #509 from mide/add-dashing
Add Dashing (Personal Dashboard)
2016-03-17 18:33:35 -04:00
Mark Ide
6ec6ea9de3 Add Dashing to Personal Dashboard list 2016-03-16 15:53:53 -04:00
Vadim Rutkovsky
9e8a2eda73 Add benedetto 2016-03-16 16:03:21 +01:00
Andrew
a85d6b4aa8 Merge pull request #503 from cornerot/patch-1
add Sprut.io file manager
2016-03-14 15:43:17 +00:00
cornerot
bc822ee7d7 fix: "file manger" -> "file manager"
fix: "file manger" -> "file manager"
2016-03-14 15:32:56 +03:00
Chris McCormick
ee471dd1ec Fixed capitalisation in Tracks license. 2016-03-14 13:41:27 +08:00
Chris McCormick
669bbbc358 Put Restyaboard in alphabetical order. 2016-03-14 13:41:00 +08:00
Chris McCormick
350cc84340 Added omgnata TODO list web app. 2016-03-14 13:40:01 +08:00
Edward D
40ba083365 Merge pull request #483 from sfermigier/master
Add Abilian SBE (social networking / collaboration platform)
2016-03-13 14:31:25 -04:00
Stefane Fermigier
0803beff66 Add full stop 2016-03-13 19:17:45 +01:00
Andrew
b35b6febc7 Merge pull request #502 from vrutkovs/headphones
Add Headphones - a music downloader
2016-03-13 18:09:04 +00:00
Vadim Rutkovsky
b8271bfe21 Add Headphones 2016-03-13 14:32:04 +01:00
Andrew
1fa2fc5e0a Merge pull request #500 from rafael-santiago/master
Add Cherry to the list
2016-03-13 04:08:58 +00:00
cornerot
4aa2786802 add Sprut.io file manager
add Sprut.io file manager
2016-03-13 05:48:28 +03:00
Edward D
9c52f11c6e Merge pull request #495 from samtuke/master
Add Email Marketing Category, phpList (Email Marketing)
2016-03-12 13:30:56 -05:00
rafael-santiago
579d3ca78a Typo 2016-03-11 17:58:19 -03:00
rafael-santiago
b5fefecb58 Add Cherry to the list 2016-03-11 17:54:45 -03:00
Edward D
a6913507bd Merge pull request #490 from NicolasCARPi/elabftw
Add eLabFTW (CMS)
2016-03-11 13:08:12 -05:00
Sam Tuke
5ca08e0dfd Changed new section name and added link in index/TOC 2016-03-11 12:49:24 +01:00
NicolasCARPi
abfed7f9fc Add eLabFTW to the list 2016-03-11 10:04:57 +01:00
Andrew
330b70ddea Merge pull request #494 from peter-mw/patch-1
Add Microweber CMS
2016-03-10 21:05:07 +00:00
Andrew
27749b9786 Merge pull request #498 from tillarnold/drone
Add drone
2016-03-10 21:04:34 +00:00
tillarnold
f9fb13a140 Fix the language of bugzilla
Pearl -> Perl
2016-03-10 21:38:12 +01:00
tillarnold
2171911400 Add drone 2016-03-10 21:36:51 +01:00
Peter Ivanov
60cfaa8e4e changes per review 2016-03-10 20:43:56 +02:00
nodiscc
052d3071a2 Merge pull request #491 from hebbet/patch-1
capital P for WordPress
2016-03-10 19:03:28 +01:00
Sam Tuke
62fa85c28f Added Email Marketing category and phpList app 2016-03-10 17:51:40 +01:00
Peter Ivanov
694b06ca5c Add Microweber CMS
Microweber is drag and drop CMS and online shop, based on Laravel framework

https://github.com/microweber/microweber
2016-03-10 18:48:34 +02:00
Paul
a28d6a3ab2 Fix gitbucket url 2016-03-10 17:32:05 +01:00
hebbet
ea0eacd416 capital P for WordPress
small change.

ref https://codex.wordpress.org/Function_Reference/capital_P_dangit
http://justintadlock.com/archives/2010/07/08/lowercase-p-dangit
2016-03-09 20:50:28 +01:00
Edward D
e4d3602bdd Merge pull request #485 from leplatrem/patch-1
Add Kinto (File Transfer/Synchronization)
2016-03-09 13:23:23 -05:00
Mathieu Leplatre
68849fda62 Sort alphabetically 2016-03-09 18:35:04 +01:00
Valmik
c28c53e14c Fixed ordering for Odoo
Oops, missed one
2016-03-09 20:03:44 +05:30
Valmik
47a3b18ff9 Removed extra spaces 2016-03-09 20:01:30 +05:30
Valmik
5dad5834a9 Fixed ordering for "Demo" and "Source Code" 2016-03-09 19:59:36 +05:30
Valmik
4c0298cb38 Added ERPNext to ERP Section
Full disclosure: I work for the company that created and maintains ERPNext
2016-03-09 18:16:49 +05:30
Edward D
533dd059c7 Merge pull request #480 from nodiscc/master
Syntax Fixes, reorder & group media streaming, add icecast2+airtime, add external links
2016-03-08 12:55:43 -05:00
Kovah
ebbb250d2f Adds Attendize (ticket selling system) 2016-03-08 12:35:57 +01:00
Mathieu Leplatre
defa55ed93 Remove Javascript from Kinto server description 2016-03-08 12:21:56 +01:00
Mathieu Leplatre
b2dc6bc878 Added Kinto storage service 2016-03-07 12:24:03 +01:00
Stefane Fermigier
3dac235b2a Update README.md 2016-03-07 10:00:31 +01:00
nodiscc
0f0ac67b5a fix mistakenly renamed section 2016-03-06 17:07:45 +01:00
nodiscc
4003832d3e rename music streaming -> audio streaming, sort 2016-03-06 17:05:41 +01:00
nodiscc
87cc439acf add airtime and icecast2 to streaming audio servers 2016-03-06 17:05:41 +01:00
nodiscc
3cefd326f1 add external wikipedia links for media streaming, fix whitespace 2016-03-06 17:05:41 +01:00
nodiscc
8559750aed group video/music streaming under Media Streaming 2016-03-06 17:05:41 +01:00
nodiscc
b48e2d73ad fix stops, hyphens, formatting, missing description 2016-03-06 17:03:56 +01:00
Andrew
aacce98cb5 Merge pull request #477 from Kickball/nodiscc-patch-1
move monitoring section to awesome-sysadmin
2016-03-05 21:10:22 +00:00
cave
80eb616970 added brackets 2016-03-04 15:04:12 +01:00