438 Commits

Author	SHA1	Message	Date
buddh4	703c25763a	Production asset build	2018-07-03 14:15:53 +02:00
buddh4	c96dc2f0e1	- Change humhub.ui.picker encode handling	2018-07-03 14:12:17 +02:00
buddh4	1187ae29b4	Build production assets	2018-07-02 17:37:51 +02:00
buddh4	1a6f067a91	Production asset build	2018-07-02 12:10:06 +02:00
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
buddh4	ffc1fb9011	- Enh: Added Pin/Archived/Public wallentry icons ... - Enh: Smaller stream style fixes - Enh: Added movable behavior to content type post - Fix: Invalid use of global permission for new force invite	2018-07-01 14:51:28 +02:00
buddh4	acaaa514d3	- Fixed hide topic picker after post submit ... - Force strip_tags for contenttags	2018-07-01 12:21:46 +02:00
buddh4	b7971e94c9	Fixed picker value comparison check	2018-07-01 11:14:41 +02:00
buddh4	bb24d8e93d	- Added Topic Picker to post form ... - Fix double topic selection	2018-07-01 09:17:59 +02:00
buddh4	104ce26391	- Added MoveContent controller logic ... - Enabled MoveContent for content type Post - Fixed: Wrong page title displayed	2018-07-01 02:38:46 +02:00
buddh4	27d7f8749a	- Enh: Added css footer-nav class for footer navigation	2018-06-27 15:05:40 +02:00
buddh4	e87b043162	- Fixed stream utils + tests ... - Asset Rebuild	2018-06-26 18:11:22 +02:00
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	f9dc3a0140	Merge branch 'v1.3-dev' of https://github.com/humhub/humhub into v1.3-dev ... # Conflicts: # protected/humhub/tests/codeception/_support/_generated/AcceptanceTesterActions.php	2018-06-21 12:04:04 +02:00
buddh4	1b716e2951	- Fixed new richtext on comments ... - Aligned richtext style	2018-06-21 11:36:11 +02:00
buddh4	bd99cd8b1a	Reverted stream filter style	2018-06-20 16:04:45 +02:00
Andrey Azarko	9ba985a688	fix #2713	2018-06-17 01:40:38 +03:00
Lucas Bartholemy	88dc34955e	Merge branch 'master' into v1.3-dev ... # Conflicts: # protected/humhub/components/Module.php # protected/humhub/components/ModuleManager.php # protected/humhub/config/common.php # protected/humhub/modules/content/components/ContentActiveRecord.php # protected/humhub/modules/content/models/Content.php # protected/humhub/modules/space/behaviors/SpaceModelMembership.php # protected/humhub/modules/space/models/Space.php # protected/humhub/modules/space/views/space/_layout.php # protected/humhub/modules/user/views/profile/_layout.php # protected/humhub/tests/codeception/_support/HumHubDbTestCase.php # protected/humhub/widgets/ContentTagDropDown.php # protected/humhub/widgets/LayoutAddons.php	2018-06-03 22:24:50 +02:00
buddh4	404a4c7d9f	- Enh: Added sortOrder utility humhub\libs\Sort ... - Enh: Added `humhub\modules\content\helpers\ContentContainerHelper` util with `ContentContainerHelper::getCurrent()` - Enh: Added `humhub\modules\stream\helpers\StreamHelper` util with `StreamHelper::createUrl()` - Chg: Shifted activity stream logic to `humhub\modules\activity\actions\ActivityStreamAction` and `humhub\modules\activity\controllers\StreamController` - Chg: Added activity stream action `humhub\modules\activity\actions\ActivityStreamAction` - Enh: Added `humhub\modules\stream\models\WallStreamQuery` class used for wall streams e.g. Space content stream - Enh: Added `ui` core module - Enh: Added abstract ui filters used for dynamic/extendable filter views - Chg: New Stream and Stream Filter API - Enh: Added `topic` content filter concept with stream integration	2018-05-23 15:25:35 +02:00
buddh4	be7b3a74e0	- Fixed empty modal dialog response issue ... - Fix #3146 invalid bootstrap.min.css link in installer - Enh: Auto save `humhub\modules\content\models\ContentTagAddition` within `humhub\modules\content\models\ContentTag::afterSave()` - Enh: Added `humhub\modules\content\components\ContentActiveRecord::isOwner()` to check the ownership of a content	2018-05-15 11:46:07 +02:00
buddh4	af85d33f5f	Enh: Added ui module for general ui related helper	2018-05-03 12:51:24 +02:00
buddh4	92012b9861	Fixed ie11/edge prosemirror-richtext issue ... Fixed richtext link bug	2018-04-26 18:06:00 +02:00
buddh4	e7997f9300	Fixed: Invalid Component.instance calls throws error instead of returning null.	2018-04-25 14:51:22 +02:00
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
buddh4	61f1ccc002	Build production assets	2018-04-11 14:54:24 +02:00
Lucas Bartholemy	c40d9e21df	Merge branch 'master' into v1.3-dev ... # Conflicts: # .travis.yml # protected/humhub/modules/admin/controllers/UserController.php # protected/humhub/modules/comment/models/Comment.php # protected/humhub/modules/post/controllers/PostController.php # protected/humhub/modules/space/Events.php # protected/humhub/modules/user/controllers/AccountController.php # protected/humhub/modules/user/models/User.php	2018-03-16 10:44:04 +01:00
Carlos Ferreira	13c429fbac	<img> tag has no end tag	2018-03-14 21:32:17 +01:00
Carlos Ferreira	2abb916c16	Fix #3097	2018-03-14 21:30:18 +01:00
buddh4	b7e37d7a15	Fix #2968 html encoding issue for user image tooltip	2018-03-06 15:29:08 +01:00
buddh4	f51863a6da	Enh: Added ContentTypePicker ... Fix: Fixed Pickerfield image Enhanced Stream filter style	2018-02-25 19:57:48 +01:00
buddh4	7c88e1fc41	Enh: Refactored Stream Filters	2018-02-24 18:24:57 +01:00
Evgeniy Tkachenko	6b2018b6e8	Fix compatible PJAX with jQuery 3	2018-02-14 16:35:36 +03:00
Lucas Bartholemy	a030a033d5	Merge pull request #2959 from acs-ferreira/patch-39 ... Upgrade Modernizr library from 2.6.1 to 3.5.0	2018-02-13 19:37:30 +01:00
Lucas Bartholemy	708af2787b	Merge branch 'master' into v1.3-dev ... # Conflicts: # composer.json # protected/humhub/modules/admin/controllers/PendingRegistrationsController.php # protected/humhub/modules/admin/controllers/UserController.php # protected/humhub/modules/admin/views/pending-registrations/index.php # protected/humhub/modules/admin/views/user/index.php # protected/humhub/modules/space/behaviors/SpaceController.php # protected/humhub/modules/space/behaviors/SpaceModelMembership.php # static/less/file.less # themes/HumHub/css/theme.css	2018-02-13 19:21:27 +01:00
buddh4	5e230c19d7	Added Stream Topic Filter	2018-02-09 21:28:09 +01:00
buddh4	975e715995	Merge branch 'v1.3-dev' of https://github.com/humhub/humhub into v1.3-dev ... # Conflicts: # protected/humhub/config/common.php # protected/humhub/docs/CHANGELOG_DEV.md # protected/humhub/docs/guide/bundled-software.md # protected/humhub/modules/content/widgets/richtext/HumHubRichText.php # themes/HumHub/css/theme.css	2018-02-08 14:35:13 +01:00
buddh4	130c4aa6de	Added ProseMirror rich text editor.	2018-02-08 14:28:55 +01:00
buddh4	30c16143e6	Merge pull request #2975 from Societec/master ... feature: supply 'submitted' listeners with server response	2018-02-07 18:50:42 +01:00
Carlos Ferreira	056bfd6392	Update .ready() function ... https://api.jquery.com/ready/	2018-02-05 21:27:46 +01:00
Kristian Lein-Mathisen	9f97d987ed	feature: supply 'submitted' listeners with server response ... now your listeners can process the server response, which was previously hidden.	2018-01-29 10:56:18 +01:00
Lucas Bartholemy	132af2fcda	Fix: Stream image preview size not changeable	2018-01-23 14:56:30 +01:00
Lucas Bartholemy	00691514c1	Revert "Revert "Merge branch 'v1.3-dev' into master"" ... This reverts commit 955d83be8b9e20183b1db209141db7ab24d048a3.	2018-01-23 09:50:01 +01:00
Lucas Bartholemy	955d83be8b	Revert "Merge branch 'v1.3-dev' into master" ... This reverts commit 895156b2a5113f3ac87a20616e599e37ed853e7a, reversing changes made to 28acd4040a3a7e84c90520b093eff6e977cb4f82.	2018-01-23 09:40:29 +01:00
Lucas Bartholemy	895156b2a5	Merge branch 'v1.3-dev' into master	2018-01-23 09:26:11 +01:00
Carlos Ferreira	ba09858fbb	Upgrade Modernizr library from 2.6.1 to 3.5.0 ... Build : https://modernizr.com/download/?-inlinesvg-domprefixes-hasevent-prefixed-prefixes-setclasses-shiv-testallprops-testprop-teststyles	2018-01-21 14:35:19 +01:00
buddh4	d755cc1b12	humhub.ui.modal.js cleanup	2018-01-19 14:48:01 +01:00
buddh4	380440c0a3	Remove modal.load and modal.post dataType restriction	2018-01-19 14:46:12 +01:00
buddh4	55319a0302	Fix #2947: Allow json success result on modalSubmit	2018-01-19 14:43:56 +01:00
Kristian Lein-Mathisen	e1fcb09fa7	Detect dataType from server response in AJAX requests ... Previously: if the AJAX query doesn't contain a dataType, we assume the dataType is "html". Now: if the AJAX query doesn't contain a dataType, we determine the dataType from the server's content-type (either "html" or "json"). This is is particularly useful in `modal.load(url)` scenarios and other places where the response type can be both "html" and "json".	2018-01-12 15:27:46 +01:00
Lucas Bartholemy	80058ddf8a	Reverted align of space acronym	2018-01-07 19:23:00 +01:00