mirror_php/humhub
1
0
Fork 0
mirror of https://github.com/humhub/humhub.git synced 2025-01-17 22:28:51 +01:00
Code Issues Projects Releases Wiki Activity
4,918 Commits 102 Branches 157 Tags
Commit Graph

242 Commits

Author SHA1 Message Date
buddh4
b7971e94c9 Fixed picker value comparison check 2018-07-01 11:14:41 +02:00
buddh4
27d7f8749a - Enh: Added css footer-nav class for footer navigation 2018-06-27 15:05:40 +02:00
buddh4
269cec204e Build theme.css 2018-06-21 18:00:44 +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
Lucas Bartholemy
06fe164228 Enh: Automatic theme stylesheet loading including parent theme stylesheets 
Chg: Moved OpenSans font to core assets
 2018-06-05 16:26:48 +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
af85d33f5f Enh: Added ui module for general ui related helper 2018-05-03 12:51:24 +02: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
buddh4
5e230c19d7 Added Stream Topic Filter 2018-02-09 21:28:09 +01:00
buddh4
9601bec8bd Theme build. 2018-02-08 14:36:43 +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
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
80058ddf8a Reverted align of space acronym 2018-01-07 19:23:00 +01:00
Lucas Bartholemy
36dab5f27f Fixed Space image acronym position 2018-01-07 13:50:07 +01:00
Lucas Bartholemy
df538e14e3 Revert "Revert "Merge branch 'v1.3-dev' into master"" 
This reverts commit 834368140af6359eeb075b96127477c4339059d6.

# Conflicts:
#	protected/humhub/modules/admin/models/forms/CacheSettingsForm.php
 2017-12-22 19:55:12 +01:00
Lucas Bartholemy
d7539f41ff
Merge pull request #2864 from githubjeka/patch-2 
The fix for alignment of username in a comment
 2017-12-22 14:01:27 +01:00
Lucas Bartholemy
834368140a Revert "Merge branch 'v1.3-dev' into master" 
This reverts commit d2d45f7d78e54b9dcf81e023af336c5bc064b548, reversing
changes made to 3a2daed62f549a4720741b9cd5a15a83521e08e4.

# Conflicts:
#	protected/humhub/docs/guide/admin/asynchronous-tasks.md
 2017-12-22 13:49:00 +01:00
Evgeniy Tkachenko
075d143a43
fix merge conflict 2017-12-22 14:43:16 +03:00
Evgeniy Tkachenko
9c0ebdd79c
Update theme.css 2017-12-21 13:19:53 +03:00
Evgeniy Tkachenko
0a515b102d
Update theme.css 2017-12-21 13:11:03 +03:00
Evgeniy Tkachenko
8061a6b517
Update theme.css 2017-12-21 12:03:47 +03:00
Lucas Bartholemy
6d19c7fce7 Fixed bower paths 2017-11-05 21:38:25 +01:00
buddh4
d40f1b12ef Enh: Added apple-mobile-web-app-* and mobile-web-app-capable meta tags to head.php 2017-10-23 01:49:30 +02:00
buddh4
7be5ce3596 Fix stream image max-width + small cleanup. 2017-10-21 00:28:12 +02:00
buddh4
19301671bd Fixed IDE type hinting 2017-09-21 16:52:35 +02:00
buddh4
c918acfee6 Fix: Mentioning keeps running even if previous input result was empty 
Enh: Darkened comment links for better readability
 2017-07-28 19:01:39 +02:00
buddh4
0f00da0e11 Fix: Automatic scroll to top after Modal loading 
Fix: Disable body scroll if modal is open.
 2017-07-21 20:53:00 +02:00
buddh4
6bc65a88d2 Enh: Added new MarkdownField input widget as replacement of deprecated MarkdownEditor 
Fix: Fixed markdown file upload pjax issue
 2017-07-20 17:54:37 +02:00
buddh4
1353c263ca Fix #2644 overlapping popup preview image after increasing preview image size (hagalaz) 
Fix: Button widget child class static instantiation not working
Fix: ModalButton instatiation and added ModalButton::close()
 2017-06-28 15:30:07 +02:00
buddh4
b7d2b0a0cf Fix #2612: Single list item hides markers 2017-06-07 17:40:52 +02:00
buddh4
fa13155fa6 Fix #2601 multi select dropdown style. 2017-06-07 17:16:01 +02:00
buddh4
2ec9f6c93f Fixed activity stream word-break issue. 2017-06-01 17:49:24 +02:00
buddh4
7c987fcf08 Fix: Label success color 2017-04-13 18:18:12 +02:00
buddh4
44e5ac1c2d Fix #2219: Overlapping summary mail content 
Fix Wall entry layout link/text overflow
 2017-04-04 16:14:05 +02:00
Lucas Bartholemy
250a6bf1e7 Enh: WallEntry layout layout improvements 2017-03-25 12:09:30 +01:00
Lucas Bartholemy
d5736ed0ba Enh: Improved administration user deletion view 2017-03-24 21:25:07 +01:00
Sarah Tsumayoi
2c1137009b Fix: Typo 2017-03-22 16:33:34 -04:00
buddh4
9d01d7ddad Fixed Test 
Added Missing production asset
Enh: Added Grunt tasks `build-assets`, `build-theme`, `build-search`
 2017-03-17 13:48:08 +01:00
buddh4
39d082745a Enh: Raised collapse value for posts to full embeded youtube video height 
Fix: Fixed oembed post edit
+ Rebuild theme
 2017-03-15 14:57:07 +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
buddh4
b58aba384f Fix: missing margin of wall-entry-controls in comments. 2017-03-13 22:50:45 +01:00
buddh4
09b6f64053 Fix: file preview text overflow in HumHub theme. 2017-02-20 15:18:59 +01:00
buddh4
18d39adfbd Added JS context menu to ui.additions. 2017-02-17 14:42:10 +01:00
buddh4
df84ef633d Minified theme.css 2017-02-09 15:26:28 +01:00