123 Commits

Author	SHA1	Message	Date
Lucas Bartholemy	da40a1c87b	Merge branch 'develop' into Fix/hasSidebar	2020-10-16 13:06:45 +02:00
Lucas Bartholemy	c04304b6ff	Enh #4469: Added alias for file uploads folder	2020-10-15 18:09:56 +02:00
Faeze Moradi	52d5a3a91f	Fix/hasSidebar	2020-10-15 17:09:49 +02:00
buddh4	a59fd16a34	Merge branch 'develop' into fix_4396	2020-10-15 15:48:00 +02:00
buddh4	ff39a3f8af	Merge branch 'develop' into fix_4396	2020-10-15 15:12:11 +02:00
Lucas Bartholemy	486951b945	Prepare 1.7.0-beta.1	2020-10-15 13:37:02 +02:00
Lucas Bartholemy	83b4f7a3ea	Merge branch 'develop' into enh/user-cli	2020-10-15 12:07:39 +02:00
buddh4	986dd68a13	Changed CHANGELOG_DEV.md	2020-10-14 20:41:41 +02:00
buddh4	dcb600e550	Merge branch 'develop' into chng/removeOldSpacePickerWidget	2020-10-14 16:47:39 +02:00
buddh4	83ed9ea593	Updated CHANGELOG_DEV.md	2020-10-14 16:45:35 +02:00
Lucas Bartholemy	7988c217da	Merge branch 'develop' into enh/migrateLuaminas	2020-10-14 16:33:09 +02:00
Lucas Bartholemy	c697390748	Updated CHANGELOG	2020-10-14 15:35:54 +02:00
buddh4	41ec29eef7	Fix #4493: Removed legacy ControllerAccess in notification ListController	2020-10-14 14:03:05 +02:00
Faeze Moradi	2565356f84	set about page as target url of invite notification	2020-10-14 00:08:41 +02:00
Lucas Bartholemy	eda37bd923	Enh #4475: Add Console UserAdmin Command	2020-10-13 19:29:11 +02:00
buddh4	b3fcaa6443	Updated CHANGELOG_DEV.md	2020-10-13 15:12:54 +02:00
buddh4	e2293c58e5	Merge branch 'develop' into enh/timeagoRework	2020-10-12 18:49:00 +02:00
buddh4	d5776dfd5d	Updated CHANGELOG_DEV.md#	2020-10-12 18:48:17 +02:00
Lucas Bartholemy	65ee911f37	Merge branch 'develop' into enh/injectStreamEntries	2020-10-12 17:54:52 +02:00
Lucas Bartholemy	565946f0da	Merge branch 'develop' into fix/catchModuleConfigLoadError	2020-10-12 17:25:09 +02:00
buddh4	56f18e1ebd	Updated CHANGELOG_DEV.md	2020-10-12 16:42:54 +02:00
buddh4	1a6a13e308	Updated CHANGELOG_DEV.md	2020-10-12 16:37:29 +02:00
buddh4	5b218e84aa	Merge branch 'develop' into enh/injectStreamEntries	2020-10-12 16:27:13 +02:00
buddh4	eeec4d8f34	Updated CHANGELOG_DEV.md	2020-10-12 16:26:39 +02:00
Lucas Bartholemy	4793578308	Merge pull request #4442 from humhub/feature/spaceAboutPage ... Feature/space about page	2020-10-12 16:15:37 +02:00
Lucas Bartholemy	06da2d4945	Merge branch 'develop' into enh/file-module	2020-10-12 16:03:39 +02:00
Lucas Bartholemy	67ec4a427d	Merge branch 'develop' into feature/spaceAboutPage	2020-10-12 15:13:56 +02:00
Lucas Bartholemy	701e11731b	Merge branch 'develop' into enh/3889	2020-10-12 14:56:51 +02:00
Lucas Bartholemy	2d4888862e	Update CHANGELOG_DEV.md	2020-10-12 14:56:27 +02:00
Lucas Bartholemy	54ae3f05cf	Enh #3978 Image scale/resize options; Added FileController for console	2020-10-12 14:47:28 +02:00
Lucas Bartholemy	2af59fa766	Updated changelog	2020-10-12 14:47:23 +02:00
yurabakhtin	ed50912173	Remove cacert.pem	2020-10-12 11:29:47 +03:00
yurabakhtin	b14decd2d8	Prevent resized site icons by manually uploaded files	2020-10-12 09:25:54 +03:00
Lucas Bartholemy	ca96f997d0	Update CHANGELOG_DEV.md	2020-10-11 09:46:43 +02:00
Lucas Bartholemy	a627d7ccd2	Merge branch 'develop' into fix/4456	2020-10-10 15:42:02 +02:00
Lucas Bartholemy	9815f0706d	Update CHANGELOG_DEV.md	2020-10-10 15:41:33 +02:00
Lucas Bartholemy	98933e0c15	Merge pull request #4462 from humhub/fix/4461 ... Fix #4451: PHP Deprecated Warning in ProsemirrorRichText::replaceLink…	2020-10-10 15:40:51 +02:00
buddh4	7240f6f080	Fix #4451: PHP Deprecated Warning in ProsemirrorRichText::replaceLinkExtension	2020-10-09 16:25:57 +02:00
buddh4	74e9230719	Updated CHANGELOG_DEV.md	2020-10-09 16:14:01 +02:00
Lucas Bartholemy	6cbfddc722	Merge branch 'develop' into enh/addUserFollowsToLive	2020-10-08 20:57:24 +02:00
buddh4	6b0d6930c7	Updated CHANGELOG_DEV.md	2020-10-08 15:15:35 +02:00
Faeze Moradi	6028852d92	Update CHANGELOG-DEV.md	2020-10-08 11:47:47 +02:00
Faeze Moradi	40fa54f0f3	Fix conflict	2020-10-07 18:32:06 +02:00
Lucas Bartholemy	bd5d92ee27	Merge branch 'develop' into ref_4283	2020-10-07 11:26:45 +02:00
yurabakhtin	a1f5ecb07a	Update CHANGELOG_DEV.md	2020-10-07 10:34:03 +03:00
Master_Hans	7720eeb838	#4283 add changes to the CHANGELOG_DEV.md	2020-10-07 09:06:45 +03:00
Master_Hans	d91530ff1f	remove CHANGELOG_DEV.md	2020-10-07 09:04:30 +03:00
Faeze Moradi	27e2767ac8	Update CHANGELOG-DEV.md	2020-10-06 23:08:09 +02:00
yurabakhtin	830c27a47b	Update CHANGELOG_DEV.md	2020-10-06 18:21:40 +03:00
yurabakhtin	b9033afe0d	Update CHANGELOG_DEV.md	2020-10-06 12:00:56 +03:00