4918 Commits

Author SHA1 Message Date
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
f7ed7021bf Updated npm packages 2018-07-01 02:32:20 +02:00
buddh4
b1e1143025 Merge branch 'v1.3-dev' of https://github.com/humhub/humhub into v1.3-dev
# Conflicts:
#	protected/humhub/modules/content/components/ContentActiveRecord.php
#	protected/humhub/modules/content/widgets/WallEntryControlLink.php
2018-06-30 22:22:54 +02:00
buddh4
151b24ccfc Added Movable ContentActiveRecord 2018-06-30 22:04:42 +02:00
Lucas Bartholemy
bde1953247 Minor fix 2018-06-27 18:54:36 +02:00
Lucas Bartholemy
2c197127e4 Updated sidebar docs 2018-06-27 18:40:12 +02:00
Lucas Bartholemy
52bde2df97 Merge branch 'v1.3-dev' of github.com:humhub/humhub into v1.3-dev 2018-06-27 18:23:44 +02:00
Lucas Bartholemy
e314e035b0 Improved Space/User container layouts and sidebar handling 2018-06-27 18:23:26 +02:00
Lucas Bartholemy
6e558df85d
Merge pull request #3165 from Felli/patch-1
Enh: Add Snippets documentation
2018-06-27 18:16:26 +02:00
Lucas Bartholemy
0103663535 Merge branch 'v1.3-dev' of github.com:humhub/humhub into v1.3-dev 2018-06-27 16:00:50 +02:00
Lucas Bartholemy
00a5229199 Ignore theme loader if baseUrl is not set 2018-06-27 16:00:36 +02:00
buddh4
9c18b17b2e Fixed timeago comment issue 2018-06-27 15:44:50 +02:00
buddh4
27d7f8749a - Enh: Added css footer-nav class for footer navigation 2018-06-27 15:05:40 +02:00
buddh4
a294d7a640 Merge branch 'v1.3-dev' of https://github.com/humhub/humhub into v1.3-dev 2018-06-27 14:54:58 +02:00
buddh4
e3867f29f8 - Fixed relative wallStream path not found
- Fixed tests
2018-06-27 14:54:28 +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
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
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