mirror_php/humhub - humhub - Irisnetwork

mirror_php/humhub

mirror of https://github.com/humhub/humhub.git synced 2025-01-18 06:38:14 +01:00

Go to file

Lucas Bartholemy 22a8bbf4e2 Merge branch 'master' into v1.3-dev

# Conflicts:
#	composer.json
#	protected/humhub/config/common.php
#	protected/humhub/modules/admin/models/UserSearch.php
#	protected/humhub/modules/admin/views/approval/index.php
#	protected/humhub/modules/space/behaviors/SpaceModelModules.php
#	protected/humhub/modules/space/models/Module.php
#	protected/humhub/modules/user/components/UrlRule.php
#	protected/humhub/tests/codeception/_support/HumHubDbTestCase.php

2018-04-18 15:37:22 +02:00

Typo

2017-10-17 15:40:34 +02:00

assets gitignore

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

Merge branch 'master' into v1.3-dev

2018-04-18 15:37:22 +02:00

Merge branch 'master' into v1.3-dev

2018-04-18 15:37:22 +02:00

Theme build.

2018-02-08 14:36:43 +01:00

Prevent directory listing for profile_images #963

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

.codeclimate.yml

Exclude folder _generated for codeclimate.

2018-01-13 22:15:46 +01:00

.editorconfig

Added .editorconfig code style configuration file

2017-02-10 00:02:42 +01:00

.gitignore

Revert "Revert "Merge branch 'v1.3-dev' into master""

2018-01-23 09:50:01 +01:00

.htaccess.dist

Merge branch 'master' into v1.3-dev

2018-04-18 15:37:22 +02:00

.travis.yml

Merge branch 'master' into v1.3-dev

2018-03-16 10:44:04 +01:00

composer.json

Apply Yii security patch

2018-03-20 16:20:03 +01:00

composer.lock

Enh: Added random default space color on creation

2018-03-16 13:11:58 +01:00

CONTRIBUTING.md

Update CONTRIBUTING.md

2017-08-16 17:26:11 -07:00

Gruntfile.js

Enh: Added grunt migrate-up and migrate-create task

2017-05-10 11:42:36 +02:00

index-test.php

Merge branch 'master' of https://github.com/humhub/humhub

2017-03-03 18:06:30 +01:00

index.php

Added @webroot-static and @web-static aliases

2017-01-26 17:36:59 +01:00

package-lock.json

Added ProseMirror rich text editor.

2018-02-08 14:28:55 +01:00

package.json

Update package.json

2017-05-02 14:23:05 +02:00

README.md

Update README.md

2017-08-29 21:40:04 +02:00

robots.txt

Replaced index.php - added composer.json

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

ruleset.xml

Update ruleset.xml

2018-01-23 12:14:39 +01: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: