Lucas Bartholemy 5c83ee389a Merge branch 'master' of github.com:humhub/humhub ...

Conflicts:
	protected/modules_core/admin/views/module/list.php

2014-06-29 07:59:56 +02:00

..

components

…

controllers

Merge remote-tracking branch 'origin/master'

2014-06-28 21:34:46 +02:00

forms

…

messages

Regenerated Translation Messages

2014-05-12 18:37:24 +02:00

migrations

Reduced user/space name setting field length to 100chars

2014-05-21 15:12:18 +02:00

models

Don´t show hidden profile fields

2014-06-18 09:02:36 +02:00

resources

Global design and usability changes (spaces, profile, directory; Integrated animate.css and jQuery File Upload for profile images)

2014-06-28 21:07:21 +02:00

views

Integrated jQuery File Upload Plugin for space profile images

2014-06-29 00:40:40 +02:00

widgets

Global design and usability changes (spaces, profile, directory; Integrated animate.css and jQuery File Upload for profile images)

2014-06-28 21:07:21 +02:00

autostart.php

Changes to the module system

2014-06-25 17:43:16 +02:00

module.json

Changes to the module system

2014-06-25 17:43:16 +02:00

ProfileControllerBehavior.php

…

UserModule.php

Added aimple appstore

2014-06-29 07:54:03 +02:00