mirror_php/humhub
1
0
Fork 0
mirror of https://github.com/humhub/humhub.git synced 2025-02-06 08:19:03 +01:00
Code Issues Projects Releases Wiki Activity
5,367 Commits 109 Branches 157 Tags
Commit Graph

208 Commits

Author SHA1 Message Date
buddh4
12e3e5addf - Fix: Richtext without focusMenu on small devices overlaps previous sibling 2018-08-23 18:27:42 +02:00
buddh4
a20895a686 Fix: Prevent .gitignore deletion on production asset build 2018-08-21 13:50:23 +02:00
buddh4
52e685f67d - Enh: Added windows support for grunt tasks 
- Enh: Added `grunt test-server` and `grunt test`
 2018-08-21 13:15:37 +02:00
buddh4
f8767cc07f Fix: Comment buttons overlap editor text 2018-08-20 20:22:26 +02:00
buddh4
c7b379f2b9 Enh: Added AbstractRichTextEditor::layout in order to change richtext style 
Enh: Added `block` type RichText for non focus menu style
 2018-08-03 13:27:37 +02:00
buddh4
741415133e Fix: List style of Richtext embedded in media lists broken 2018-08-02 22:16:41 +02:00
buddh4
cfa33f450c Enh: Enhanced plain menu richtext style 2018-08-02 21:50:13 +02:00
buddh4
b5cde8f302 Fix: Aligned select2 include path 
Fix: Use default markdown code background color for highlight.js
 2018-07-27 11:03:34 +02:00
buddh4
9825a9a224 - Fix: introduction tour not working 
- Chng: Moved static js dependencies from `static/resources` into `static/js`
 2018-07-26 16:16:53 +02:00
buddh4
19a71b84ab - Enh added highligh.js as ui addition 
- Fix: ui.addition.applyTo with filter ignores first filter index
 2018-07-26 16:13:48 +02:00
buddh4
7b548302e0 Fix: suppress "unable to determine dataType" error for aborted xhr requests 2018-07-20 00:04:15 +02:00
buddh4
d087799c5e Added prod js/css assets to gitignore 2018-07-19 16:48:07 +02:00
buddh4
8f2535b6db Removed production assets from repository. 2018-07-18 17:02:29 +02:00
buddh4
ab7fb45955 Fix: Profile/Space image upload not working after full page reloads 2018-07-18 16:13:08 +02:00
buddh4
17c319475b Reverted prosemirror paragraph padding 2018-07-18 13:12:15 +02:00
buddh4
c3392a16a9 - Enh: Use of new richtext version 1.0.4 see https://github.com/humhub/humhub-prosemirror/blob/master/docs/CHANGELOG.md 
- Enh: Added max-height for post/comment/edit richtext
 2018-07-17 19:31:23 +02:00
buddh4
6f98b4f055 Production asset rebuild 2018-07-13 16:43:25 +02:00
buddh4
391d04eb3d Production asset build 2018-07-12 21:09:31 +02:00
buddh4
cf1c423f62 - Fix force invite not working on space creation 
- Enh: Enable invite all instead of force membership in case force invite checkbox is not selected
- Fix prevent MembersAdded activity when using force space membership
- Enh added `humhub.modules.ui.picker.Picker.disable()` in order to disable/enable userpicker fields
 2018-07-12 19:10:02 +02:00
buddh4
be8a89e01e Fix: UI addition mutation observer interfering with new rich-text mutation logic 2018-07-06 22:37:33 +02:00
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