Lucas Bartholemy 8e258bff79 Merge branch 'master' into v1.1-dev ...

# Conflicts:
#	protected/humhub/config/common.php
#	protected/humhub/modules/content/components/ActiveQueryContent.php
#	themes/HumHub/css/theme.css

2016-04-14 18:41:00 +02:00

..

activity

Fixed: Activity link when no wall entry is available

2015-09-05 19:04:35 +02:00

admin

Fixed admin logo upload

2015-08-31 09:21:41 +02:00

at

Enh: Added submit button for comments

2015-10-29 19:11:58 +01:00

file

Fixed: Html encode file upload errors

2015-11-18 21:51:13 +01:00

highlight.js

Added Markdown Editor / Viewer Widgets

2015-03-04 21:47:09 +01:00

installer

Optimized Installer usability

2015-11-20 19:16:08 +01:00

jcrop

Initial Commit

2014-02-10 06:36:00 +01:00

like

Migrate Like Module

2015-06-29 05:21:20 +02:00

search

Updated search

2015-06-27 05:57:44 +02:00

space

Enh: Ajax follow space button

2016-04-13 16:38:16 +02:00

tour

Updated Bootstrap-Tour plugin to 0.10.2

2015-10-23 13:28:45 +02:00

user

Merge branch 'master' into v1.1-dev

2016-04-14 18:41:00 +02:00