humhub

mirror of https://github.com/humhub/humhub.git synced 2025-01-17 22:28:51 +01:00

Go to file

Lucas Bartholemy 236bcde151 Merge branch 'master' into v1.1-dev

# Conflicts:
#	protected/humhub/modules/admin/messages/de/views_setting_mailing.php

2016-05-24 17:14:37 +02:00

assets

Added .gitingore on assets folder

2014-07-07 16:28:39 +02:00

css

Fixed: Markdown editor CSS padding

2016-02-27 16:04:29 +01:00

fonts

Updated fontawesome to version 4.0.3 and fixed glyphicons #65

2014-05-14 20:41:18 +02:00

ico

Updated colors and icons

2015-03-26 17:15:07 +01:00

img

Updated emoji's

2015-10-15 19:25:48 +02:00

Admin Settings Text/Layout

2016-05-13 19:58:51 +02:00

protected

Merge branch 'master' into v1.1-dev

2016-05-24 17:14:37 +02:00

resources

Added preconfigured authclients and improved ui

2016-05-20 17:05:42 +02:00

themes/HumHub

User Account Settings styling

2016-05-22 18:43:53 +02:00

uploads

Prevent directory listing for profile_images #963

2015-04-21 14:44:41 +02:00

.gitignore

Enh #1634 : Added favicon.ico to gitignore

2016-04-14 16:49:11 +02:00

.htaccess.dist

Prevent application 404 errors for robots.txt / favicon.ico files #900 #905

2015-04-13 12:10:07 +02:00

.travis.yml

Merge pull request #1285 from davidjeddy/patch-2

2016-04-07 16:40:38 +02:00

composer.json

Added space pretty urls, cleanup space controls menu

2016-05-10 02:09:39 +02:00

CONTRIBUTING.md

Typo in CONTRIBUTING.md

2015-10-08 17:19:42 +02:00

index-test.php

Update index-test.php

2016-03-30 10:01:17 -04:00

index.php

Optimized local configuration files (added common config)

2015-07-16 13:33:28 +02:00

README.md

Fixed docs link

2015-08-31 11:04:32 +02:00

robots.txt

Replaced index.php - added composer.json

2015-06-24 16:48:52 +02:00

README.md

HumHub is a feature rich and highly flexible OpenSource Social Network Kit written in PHP.

It's perfect for individual:

Social Intranets
Enterprise Social Networks
Private Social Networks

More information:

README.md

HumHub - Social Network Kit