Lucas Bartholemy 359b85fdc9 Merge branch 'master' into v1.3-dev ...

# Conflicts:
#	protected/humhub/components/Theme.php
#	protected/humhub/modules/admin/models/forms/DesignSettingsForm.php
#	protected/humhub/modules/content/resources/js/humhub.content.js
#	protected/humhub/modules/space/modules/manage/views/member/pending-invitations.php
#	protected/humhub/modules/stream/resources/js/humhub.stream.js
#	static/js/humhub/humhub.ui.richtext.js

2018-07-02 11:12:55 +02:00

..

colorpicker

…

humhub

Merge branch 'master' into v1.3-dev

2018-07-02 11:12:55 +02:00

all-ce58fb7858b808766e16730bae74d4cb.js

- Fixed stream utils + tests

2018-06-26 18:11:22 +02:00

blueimp-gallery.min.js

…

bootstrap3-wysihtml5.js

…

desktop-notify-config.js

…

desktop-notify-min.js

…

ekko-lightbox-modified.js

…

jquery.highlight.min.js

…

jquery.nicescroll.min.js

…

jquery.pjax.modified.js

Enh: Added ui module for general ui related helper

2018-05-03 12:51:24 +02:00

jui.bootstrap.bridge.js

…

markdownEditor.js

…

modernizr.js

Upgrade Modernizr library from 2.6.1 to 3.5.0

2018-01-21 14:35:19 +01:00

panelMenu.js

…

wysihtml5-0.3.0.js

…