mirror_php/humhub - humhub - Irisnetwork

mirror_php/humhub

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

Go to file

Lucas Bartholemy 8a736d1c81 Merge branch 'master' into v1.2-dev

# Conflicts:
#	protected/humhub/config/common.php
#	protected/humhub/modules/content/components/actions/ContentContainerStream.php
#	protected/humhub/modules/space/models/Membership.php
#	protected/humhub/modules/space/views/space/home.php
#	protected/humhub/modules/stream/actions/Stream.php
#	protected/humhub/modules/stream/widgets/StreamViewer.php
#	protected/humhub/modules/user/models/User.php
#	protected/humhub/tests/codeception/acceptance/modules/user/LoginCept.php
#	themes/HumHub/css/theme.css

2016-09-12 19:29:05 +02:00

assets gitignore

2016-08-24 13:01:58 +02:00

Enh: Asset Management Enhancement with yii asset command support minif/uglify.

2016-08-21 19:58:55 +02:00

Updated fontawesome to version 4.0.3 and fixed glyphicons #65

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

Updated colors and icons

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

Updated emoji's

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

Merge branch 'master' into v1.2-dev

2016-09-12 19:29:05 +02:00

Merge branch 'master' into v1.2-dev

2016-09-12 19:29:05 +02:00

Fix user profile banner error.

2016-09-09 12:00:57 +05:00

Merge branch 'master' into v1.2-dev

2016-09-12 19:29:05 +02:00

Prevent directory listing for profile_images #963

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

.gitignore

Merge branch 'master' into v1.2-dev

2016-09-12 19:29:05 +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

Merge branch 'master' into v1.2-dev

2016-09-12 19:29:05 +02:00

CONTRIBUTING.md

Typo in CONTRIBUTING.md

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

Gruntfile.js

Fixed production asset management

2016-08-23 22:29:34 +02:00

index-test.php

Enh: Asset Management Enhancement with yii asset command support minif/uglify.

2016-08-21 19:58:55 +02:00

index.php

Optimized local configuration files (added common config)

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

package.json

Fixed production asset management

2016-08-23 22:29:34 +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: