buddh4
de6cb8271b
Merge remote-tracking branch 'remotes/origin/v1.3-dev' into dev-topics
...
# Conflicts:
# protected/humhub/modules/activity/widgets/views/activityStream.php
# protected/humhub/modules/content/components/ContentActiveRecord.php
# protected/humhub/modules/content/models/ContentTag.php
# protected/humhub/modules/content/tests/codeception/_support/_generated/UnitTesterActions.php
# protected/humhub/modules/content/widgets/ContentTagDropDown.php
# protected/humhub/modules/dashboard/components/actions/DashboardStream.php
# protected/humhub/modules/dashboard/controllers/DashboardController.php
# protected/humhub/modules/dashboard/views/dashboard/index.php
# protected/humhub/modules/friendship/models/Friendship.php
# protected/humhub/modules/space/modules/manage/views/default/index.php
# protected/humhub/modules/space/views/space/_layout.php
# protected/humhub/modules/stream/actions/Stream.php
# protected/humhub/modules/stream/widgets/StreamViewer.php
# protected/humhub/modules/ui/Module.php
# protected/humhub/modules/ui/config.php
# protected/humhub/modules/ui/module.json
# protected/humhub/modules/user/models/GroupPermission.php
# protected/humhub/tests/codeception/_support/FunctionalTester.php
# protected/humhub/widgets/BasePickerField.php
# protected/humhub/widgets/BootstrapComponent.php
# protected/humhub/widgets/ContentTagDropDown.php
# protected/humhub/widgets/InputWidget.php
# protected/humhub/widgets/JsWidget.php
# protected/humhub/widgets/Label.php
# protected/humhub/widgets/LayoutAddons.php
# protected/humhub/widgets/MultiSelectField.php
# static/js/humhub/humhub.ui.modal.js
# static/js/jquery.pjax.modified.js
# themes/HumHub/css/theme.css
2018-06-21 16:27:42 +02:00
buddh4
af85d33f5f
Enh: Added ui module for general ui related helper
2018-05-03 12:51:24 +02:00
Lucas Bartholemy
6d19c7fce7
Fixed bower paths
2017-11-05 21:38:25 +01:00
buddh4
cd64d15cae
Enh: Included select2-humhub theme into the new theming
...
Enh: Added select2 dropdown for language selection in account and admin settings
Enh: Added data-ui-select2 addition for simple select2 dropdowns
Fix: Don't apply js additions if there was no matching element
2017-03-15 13:23:55 +01:00
Lucas Bartholemy
98f92e2221
Moved root folders (js/css/resources/less) into static folder
2017-01-26 17:44:51 +01:00
