aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update AUTHORS.md (#895)n82252016-12-173-103/+297
| | | | | | | | | | | | * 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
* Merge pull request #892 from Kickball/addTravisnodiscc2016-12-173-0/+188
|\ | | | | Add travis
| * warn only on awesomebot failnrew2252016-12-171-2/+2
| |
| * Warn on awesomebot failsnrew2252016-12-171-1/+1
| |
| * Warn on awesomebot failsnrew2252016-12-172-1/+1
| |
| * Warn on awesomebot failsnrew2252016-12-172-2/+2
| |
| * turn off emailsn82252016-12-171-0/+3
| |
| * allow ssl errorsn82252016-12-171-1/+1
| |
| * Update .travis.ymln82252016-12-101-1/+1
| |
| * Update .travis.ymln82252016-12-101-2/+1
| |
| * update travis.ymlnrew2252016-12-101-2/+3
| |
| * update travis filenrew2252016-12-101-2/+4
| |
| * Initial Commitnrew2252016-12-103-0/+183
| |
* | Merge pull request #893 from fuerbringer/redaxonodiscc2016-12-141-0/+1
|\ \ | | | | | | Add REDAXO
| * | Changed REDAXO CMS descriptionfuerbringer2016-12-141-1/+1
| | |
| * | Add REDAXOfuerbringer2016-12-111-0/+1
| | |
* | | Merge pull request #859 from Kickball/add-ahn82252016-12-131-0/+2
|\ \ \ | | | | | | | | Added anchr.io and http2-serverpush-proxy (Replaces #855)
| * | | Move Anchr to Misc CategoryEdward D2016-12-131-3/+1
| | | | | | | | | | | | As a tempory solution I've moved Anchr to the misc category.
| * | | Added anchr.io and http2-serverpush-proxyEdward D2016-11-201-0/+4
| | | | | | | | | | | | Replaces #855.
* | | | Update AUTHORS file (#890)n82252016-12-123-205/+103
| |/ / |/| | | | | Remove Authors and AUTHORS.md created from github api.
* | | Merge pull request #889 from Kickball/hrm-fixAndrew Rylatt2016-12-101-2/+2
|\ \ \ | |_|/ |/| | Fix HRM formatting
| * | lowercase resources in linkn82252016-12-091-1/+1
| | |
| * | Fix HRM formattingEdward D2016-12-091-2/+2
|/ /
* | Merge pull request #885 from Kickball/n8225-patch-2Andrew Rylatt2016-12-081-1/+1
|\ \ | | | | | | Fix CCBYSAv4 syntax in list of Licenses
| * | Fix CCBYSAv4 syntax in list of Licensesn82252016-12-071-1/+1
| | | | | | | | | added closing ` to `CCBYSAv4` license in list of licenses
* | | Merge pull request #887 from Kickball/n8225-patch-3Andrew Rylatt2016-12-081-1/+1
|\ \ \ | |/ / |/| | Fix Coordino
| * | Fix Coordinon82252016-12-071-1/+1
|/ / | | | | Missing Full stop
* | Merge pull request #881 from Kovah/#300n82252016-12-061-0/+1
|\ \ | | | | | | Adds Coordino (#300)
| * | Adds Coordino (#300)Kovah2016-12-061-0/+1
| | |
* | | Merge pull request #882 from Kovah/#299n82252016-12-061-0/+2
|\ \ \ | | | | | | | | Adds cartulary and the CDDL license (#299)
| * | | Updates description for cartulary and removes duplicate linkKovah2016-12-061-1/+1
| | | |
| * | | Adds cartulary and the CDDL license (#299)Kovah2016-12-061-0/+2
| |/ /
* | | Merge pull request #883 from Kovah/#427n82252016-12-061-0/+10
|\ \ \ | |/ / |/| | Introduce new HRM category (#427)
| * | Introduce new HRM category (#427)Kovah2016-12-061-0/+10
|/ / | | | | | | | | | | | | * Adds new HRM category * Adds IceHrm * Adds OrangeHRM * Adds Sentrifugo
* | Merge pull request #872 from Kickball/wiki-ref-notetakingn82252016-12-051-0/+2
|\ \ | | | | | | add wiki section reference from note-taking & editors
| * | add wiki section reference from note-taking & editorsnodiscc2016-11-291-0/+2
| | | | | | | | | wikis are a common note-taking solution
* | | Merge pull request #871 from Kickball/fix-868nodiscc2016-11-301-1/+1
|\ \ \ | |/ / |/| | Fix typo in header
| * | Fix typo in headernodiscc2016-11-291-1/+1
| | | | | | | | | fix #868
* | | Merge pull request #867 from 88250/masternodiscc2016-11-291-0/+2
|\ \ \ | | | | | | | | Add Solo and Symphony
| * | | Update Solo and SymphonyD2016-11-281-2/+2
| | | |
| * | | Update SoloD2016-11-261-1/+1
| | | |
| * | | Add a social networks & forum - SymphonyD2016-11-261-0/+1
| | | | | | | | | | | | | | | | | | | | A modern community (forum/SNS/blog) platform written in Java. https://github.com/b3log/symphony
| * | | Add a blogging platform - SoloD2016-11-261-0/+1
| |/ / | | | | | | | | | | | | A blogging system written in Java, feel free to create your or your team own blog. https://github.com/b3log/solo
* | | Merge pull request #870 from devfake/masternodiscc2016-11-291-1/+1
|\ \ \ | |/ / |/| | update flox
| * | Update Flox DescriptionEdward D2016-11-281-1/+1
| | |
| * | update floxViktor Geringer2016-11-281-1/+1
|/ /
* | Merge pull request #849 from jgillich/patch-2n82252016-11-251-1/+1
|\ \ | | | | | | factor.io website is dead, replaced with github
| * | update factor.io websiteJakob Gillich2016-11-241-1/+1
| | | | | | | | | | | | no longer supports HTTPS
* | | Merge pull request #863 from m1guelpf/patch-3nodiscc2016-11-231-0/+1
|\ \ \ | | | | | | | | Add LicAPI
| * | | Remove demoMiguel Piedrafita2016-11-221-1/+1
| | | |