Commit Graph

5867 Commits

Author SHA1 Message Date
nodiscc
0e7862dbbf Merge pull request #922 from nebulade/master
Guacamoly was renamed to Meemo
2017-01-04 14:52:38 +01:00
Johannes Zellner
fa135400c6 Guacamoly was renamed to Meemo 2016-12-30 16:41:25 +01:00
n8225
d04a0ffc28 Merge pull request #921 from Kickball/restreamer-docker
Add Docker platform to Restreamer
2016-12-28 14:25:26 -06:00
n8225
51d08de348 Add Shinobi #917 (#920) 2016-12-28 19:14:13 +00:00
nodiscc
90ed62afc4 Add Docker platform to Restreamer
Since Restreamer can _not_ be run without docker
2016-12-28 15:33:15 +01:00
nodiscc
5409a673ab Merge pull request #918 from LINKIWI/modern-paste
Add Modern Paste
2016-12-25 14:50:49 +01:00
Kevin Lin
5a8e2f5bb8 Add Modern Paste 2016-12-24 09:31:19 -08:00
n8225
dbe9a936b7 Add scr.ch and savepad (#902)
* Add savepad and scri.ch

#886 and #897

* fix license/lang

* removed scri.ch (no activity in 2 years)
2016-12-22 02:35:50 +00:00
zotlabs
c0c477a183 redmatrix is now hubzilla, RedMatrix removed, Hubzilla edited
* redmatrix is now hubzilla

* changes requested by @n8225

* corrected for Americans who think that their spelling is the only form of English.
2016-12-22 02:11:20 +00:00
nodiscc
5e69ee8970 Merge pull request #906 from Kickball/AddMisc
Add to Misc/Other: vimbadmin, google-webfonts-helper, 411
2016-12-21 19:18:53 +01:00
nodiscc
21db94754f Merge pull request #904 from Kickball/AddAuto
Add multiple to Automations
2016-12-21 13:45:18 +01:00
n8225
6edea94e30 Add Scrumblr #896 and PHP Task/Todo list #778 (#903)
* Add Scrumblr #896

* Add #778 PHP Task/Todo List

* change Scrumblr source link
2016-12-20 22:19:06 +00:00
Kyle Farwell
f6539924df Add Tokumei (#912) 2016-12-20 22:18:19 +00:00
nrew225
950a672940 fixed typo 2016-12-20 08:16:15 -06:00
nrew225
e231e878dc moved Peerflix-server to p2p 2016-12-20 07:10:59 -06:00
nodiscc
5a4646bf23 Merge pull request #910 from Kickball/AddFileShare
Add bittorrent-tracker #487
2016-12-19 13:53:39 +01:00
nodiscc
9db649f805 Merge pull request #909 from Kickball/AddHR
Add Admidio #869
2016-12-19 13:53:14 +01:00
nodiscc
bed5e75af2 Merge pull request #907 from Kickball/AddDashboard
Add iDashboard-PHP #835
2016-12-19 13:52:22 +01:00
nrew225
857e873bd6 Add iDashboard-PHP #835 2016-12-18 09:06:21 -06:00
nrew225
5057d435af Add bittorrent-tracker #487 2016-12-18 09:04:47 -06:00
nrew225
e79987ef25 Add Admisio #869 2016-12-18 09:02:47 -06:00
nrew225
49cd31c7e3 Add 411 #789 2016-12-18 08:55:27 -06:00
n8225
46a373c1e8 Update AUTHORS.md (#895)
* Update AUTHORS.md

Created .mailmap file

Created with the following command:
mv .github/.mailmap . && printf "Commits | Author \n:---: | ---\n" > AUTHORS.md && git shortlog -sne >> AUTHORS.md &&
sed -i 's/\t/ | /g' AUTHORS.md && mv .mailmap .github/.mailmap

* Update Contrib line in makefile
2016-12-17 16:57:58 +00:00
nrew225
2d9e4241b9 Add to Misc/Other
#819 ViMbAdmin
#545 google-webfonts-helper
2016-12-17 08:51:55 -06:00
nrew225
026e664a23 Add #854 Episodes and #825 Peerflix-server 2016-12-17 08:45:25 -06:00
nodiscc
073e8320c4 Merge pull request #892 from Kickball/addTravis
Add travis
2016-12-17 14:17:26 +01:00
nrew225
e921ece095 warn only on awesomebot fail 2016-12-16 19:27:29 -06:00
nrew225
27c69ae1fd Warn on awesomebot fails 2016-12-16 19:16:11 -06:00
nrew225
6b25d7f2a5 Warn on awesomebot fails 2016-12-16 19:01:54 -06:00
nrew225
08ef1288a8 Warn on awesomebot fails 2016-12-16 18:54:22 -06:00
n8225
f584b1502e turn off emails 2016-12-16 18:32:06 -06:00
nrew225
fd5438f75b Add pyLoad and WebUI-aria2 2016-12-16 18:21:14 -06:00
n8225
d02f359fdc allow ssl errors 2016-12-16 18:18:34 -06:00
nodiscc
e47cac4fff Merge pull request #893 from fuerbringer/redaxo
Add REDAXO
2016-12-14 14:41:49 +01:00
fuerbringer
ac2d083e67 Changed REDAXO CMS description 2016-12-14 12:44:02 +01:00
n8225
d647107ec0 Merge pull request #859 from Kickball/add-ah
Added anchr.io and http2-serverpush-proxy (Replaces #855)
2016-12-13 05:12:15 -06:00
Edward D
64672bbfe3 Move Anchr to Misc Category
As a tempory solution I've moved Anchr to the misc category.
2016-12-13 04:03:55 +00:00
n8225
0d6b9d8315 Update AUTHORS file (#890)
Remove Authors and AUTHORS.md created from github api.
2016-12-12 04:57:46 +00:00
fuerbringer
a116cc8a0e Add REDAXO 2016-12-11 02:14:29 +01:00
Andrew Rylatt
34f6960690 Merge pull request #889 from Kickball/hrm-fix
Fix HRM formatting
2016-12-10 21:15:14 +00:00
n8225
0df51de709 Update .travis.yml 2016-12-10 09:54:11 -06:00
n8225
ab4e7355cf Update .travis.yml 2016-12-10 09:42:49 -06:00
nrew225
adc7d8b672 update travis.yml 2016-12-10 08:04:47 -06:00
nrew225
6a3d1074ed update travis file 2016-12-10 08:00:55 -06:00
nrew225
3da769f665 Initial Commit 2016-12-10 07:46:24 -06:00
n8225
032605de88 lowercase resources in link 2016-12-09 15:48:40 -06:00
Edward D
fa80b718ab Fix HRM formatting 2016-12-09 20:35:47 +00:00
Andrew Rylatt
d27fb831fd Merge pull request #885 from Kickball/n8225-patch-2
Fix CCBYSAv4 syntax in list of Licenses
2016-12-08 22:24:54 +00:00
Andrew Rylatt
44e4e622ad Merge pull request #887 from Kickball/n8225-patch-3
Fix Coordino
2016-12-08 22:23:27 +00:00
n8225
a05fc0f391 Fix Coordino
Missing Full stop
2016-12-07 10:35:42 -06:00