buddh4
|
4d4c4995c5
|
Merge pull request #3185 from reinq/abc
fix #2713
|
2018-06-27 13:10:29 +02:00 |
|
Lucas Bartholemy
|
d78e352848
|
Merge branch 'v1.3-dev' of github.com:humhub/humhub into v1.3-dev
# Conflicts:
# protected/humhub/docs/CHANGELOG_DEV.md
|
2018-06-27 12:24:58 +02:00 |
|
buddh4
|
85db3f7365
|
Merge pull request #3079 from githubjeka/v1.3-dev-group-change-notify
Added notification for members of groups
|
2018-06-27 12:23:45 +02:00 |
|
Lucas Bartholemy
|
2278f27820
|
Chg: MySQL queue is now the default job queuing driver
|
2018-06-27 12:23:39 +02:00 |
|
buddh4
|
aa06d94696
|
Merge branch 'v1.3-dev' into v1.3-dev-group-change-notify
|
2018-06-27 11:56:30 +02:00 |
|
buddh4
|
4fd32d7a00
|
Merge pull request #3188 from Felli/patch-4
Enh: Add steps to using Facebook Oauth
|
2018-06-27 11:53:38 +02:00 |
|
buddh4
|
524075741f
|
Merge branch 'v1.3-dev' into patch-4
|
2018-06-27 11:53:27 +02:00 |
|
buddh4
|
58c42652c8
|
Merge pull request #3179 from Tahrz/patch-1
Fix for humhub\components\Theme
|
2018-06-27 11:51:43 +02:00 |
|
Lucas Bartholemy
|
1f73bc6404
|
fixed typo in phpdoc
|
2018-06-27 11:51:22 +02:00 |
|
Lucas Bartholemy
|
ef475caad8
|
Merge branch 'v1.3-dev' of github.com:humhub/humhub into v1.3-dev
|
2018-06-27 11:49:10 +02:00 |
|
Lucas Bartholemy
|
9dc691fc82
|
Chg: Renamed information cronjob section to background jobs and added queue status
|
2018-06-27 11:48:56 +02:00 |
|
buddh4
|
b2192fa3de
|
Fixed functional tests not working regarding ZendLuceneSearch print output.
|
2018-06-27 11:48:21 +02:00 |
|
buddh4
|
0d7926288d
|
Fixed Content Polymorphicrelation not set when creating ContentActiveRecord
|
2018-06-27 11:37:12 +02:00 |
|
buddh4
|
55302f6d38
|
- Fixed unit test missing basePath
|
2018-06-26 18:48:51 +02:00 |
|
buddh4
|
e87b043162
|
- Fixed stream utils + tests
- Asset Rebuild
|
2018-06-26 18:11:22 +02:00 |
|
buddh4
|
6452f6e52c
|
Added try/catch to BaseSettingsManager::isDatabaseInstalled()
|
2018-06-26 15:13:17 +02:00 |
|
buddh4
|
64985ef69f
|
Fixed ThemeLoader with manually specified themes
|
2018-06-26 14:23:19 +02:00 |
|
buddh4
|
670f49b4cb
|
Added missing BaseSettingsManager::isDatabaseInstalled
|
2018-06-26 13:43:36 +02:00 |
|
buddh4
|
3a9337cf74
|
Improved db installation check
|
2018-06-26 13:40:53 +02:00 |
|
buddh4
|
5f314b29c9
|
Merge branch 'v1.3-dev' into dev-topics
|
2018-06-26 13:08:53 +02:00 |
|
buddh4
|
2fd134e110
|
Fixed test files
|
2018-06-26 13:04:44 +02:00 |
|
Sarah Tsumayoi
|
01aa04e460
|
Update authentication.md
|
2018-06-26 04:18:14 +09:00 |
|
githubjeka
|
d1a30802ec
|
Added MembersManagePermission to Space Module
|
2018-06-25 14:17:13 +03:00 |
|
Sarah Tsumayoi
|
932703f99d
|
Update CHANGELOG_DEV.md
|
2018-06-23 02:37:15 +09:00 |
|
Sarah Tsumayoi
|
7691ebe284
|
Enh: Add steps to using Facebook Oauth
|
2018-06-23 02:35:38 +09:00 |
|
Lucas Bartholemy
|
c82e163938
|
Set Base URL prior init
|
2018-06-22 16:08:40 +02:00 |
|
buddh4
|
e8c0cdc7cb
|
- Fixed multiple ContentTag afterSave definition
- Fixed missing import in DashboardStreamAction
|
2018-06-21 18:01:49 +02:00 |
|
buddh4
|
269cec204e
|
Build theme.css
|
2018-06-21 18:00:44 +02:00 |
|
buddh4
|
00038723fa
|
Fixed cannotLoadMore stream entry behaviour.
|
2018-06-21 18:00:16 +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
|
67eb5fba2e
|
Added humhub\modules\content\components\ActiveQueryCotnent::contentTag() content filter
|
2018-06-21 11:41:01 +02:00 |
|
buddh4
|
1b716e2951
|
- Fixed new richtext on comments
- Aligned richtext style
|
2018-06-21 11:36:11 +02:00 |
|
buddh4
|
8e85283a24
|
Fixed invalid access level of humhub\modules\queue\driver\Instant::status()
|
2018-06-20 16:19:13 +02:00 |
|
buddh4
|
606ca66c5c
|
Added javascript-stream.md documentation
|
2018-06-20 16:05:25 +02:00 |
|
buddh4
|
bd99cd8b1a
|
Reverted stream filter style
|
2018-06-20 16:04:45 +02:00 |
|
buddh4
|
ddb9e62b2a
|
- Added abstract stream.Stream.initEvents() to Stream javascript API
- Fixed topic badges are not updated on stream-filter-bar
- Fixed only show show-more stream button if last entry was not already loaded
|
2018-06-20 16:03:38 +02:00 |
|
Lucas Bartholemy
|
9230378737
|
Enh: Added UTC only timezone in server timezone dropdown
|
2018-06-20 12:14:47 +02:00 |
|
Andrey Azarko
|
9ba985a688
|
fix #2713
|
2018-06-17 01:40:38 +03:00 |
|
buddh4
|
4f20732e3c
|
Merge pull request #3183 from marvinhuebner/bugfix/remove-debugger
[BUGFIX] remove `debugger;` in javascript from spaces tour
|
2018-06-14 22:02:18 +02:00 |
|
Marvin Hübner
|
191a170a3c
|
[BUGFIX] remove debugger; in javascript from spaces tour
|
2018-06-14 13:36:34 +02:00 |
|
Lucas Bartholemy
|
b26d41e072
|
Enh: Allow enable/disable modules by CLI
|
2018-06-14 11:14:30 +02:00 |
|
Tahrz
|
2ae4deb0c8
|
Add is_array check
|
2018-06-14 09:14:31 +03:00 |
|
Tahrz
|
f929a6ee03
|
Fix for humhub\components\Theme
Fix for Theme class force `pathMap` change. So now, you can change module default views in your config files with `pathMap`.
|
2018-06-13 17:08:02 +03:00 |
|
haykhakobyan94
|
7c8858691f
|
fix errors
|
2018-06-13 15:22:06 +04:00 |
|
haykhakobyan94
|
f4a296bae7
|
fixing errors
|
2018-06-13 15:12:36 +04:00 |
|
haykhakobyan94
|
d27e197616
|
fixing errors
|
2018-06-13 15:05:08 +04:00 |
|
haykhakobyan94
|
88fd8cf8ad
|
fixing errors
|
2018-06-13 14:51:54 +04:00 |
|
haykhakobyan94
|
375757f60a
|
fixing errors
|
2018-06-13 14:45:33 +04:00 |
|
haykhakobyan94
|
d198661f9b
|
fixing errors
|
2018-06-13 14:36:51 +04:00 |
|