54 Commits

Author	SHA1	Message	Date
Lucas Bartholemy	b09dd2fce9	fix composer.json merge	2018-02-13 19:31:41 +01:00
Lucas Bartholemy	708af2787b	Merge branch 'master' into v1.3-dev ... # Conflicts: # composer.json # protected/humhub/modules/admin/controllers/PendingRegistrationsController.php # protected/humhub/modules/admin/controllers/UserController.php # protected/humhub/modules/admin/views/pending-registrations/index.php # protected/humhub/modules/admin/views/user/index.php # protected/humhub/modules/space/behaviors/SpaceController.php # protected/humhub/modules/space/behaviors/SpaceModelMembership.php # static/less/file.less # themes/HumHub/css/theme.css	2018-02-13 19:21:27 +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
Daniel Kesselberg	98a8a41831	Migrate PendingRegistrations to new Exporter ... Drop phpexcel dependency	2018-01-18 12:52:56 +01:00
Daniel Kesselberg	6eefd92997	Update packages	2018-01-15 22:48:13 +01:00
Daniel Kesselberg	94da209f95	Add packages	2018-01-12 15:54:54 +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	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
Lucas Bartholemy	d2d45f7d78	Merge branch 'v1.3-dev' into master	2017-12-20 12:00:21 +01:00
Carsten Brandt	958d940da6	improve composer-asset-plugin config ... - Make sure to be compatible with newer versions of the plugin > The "extra.asset-installer-paths" option is deprecated, use the > "config.fxp-asset.installer-paths" option - Improve performance of dependency resolution: 120d35506e (diff-b5d0ee8c97c7abd7e3fa29b9a27d1780)	2017-11-17 11:16:08 +01:00
Lucas Bartholemy	5fef46c527	Enh: Added Push live module driver using Redis and Node.JS	2017-11-10 01:45:08 +01:00
Lucas Bartholemy	b87e0b1b81	Composer update (add queue & redis)	2017-10-27 21:52:18 +02:00
Lucas Bartholemy	13c5a53d3c	- Chg: Switched from Composer FXP plugin to Asset Packagist repository ... - Enh: Committed composer.lock	2017-10-14 00:22:23 +02:00
Lucas Bartholemy	18f5bdce4c	Enh: Added DurationPickerWidget	2017-09-19 13:58:40 +02:00
Carlos Ferreira	887e0acd80	Stick to Yii2 concrete version ... See https://github.com/humhub/humhub/issues/2745	2017-09-07 08:47:45 +02:00
buddh4	03fdb7a5df	ControllerAccess	2017-08-01 22:10:35 +02:00
buddh4	7153d174d8	Added ImagesLoaded js	2017-07-25 13:13:09 +02:00
buddh4	4a3376e4fa	Button API enhancements. ... Enh: Include `kartik-v/yii2-widgets`	2017-07-03 14:50:44 +02:00
Lucas Bartholemy	ac3ef62056	Enh: Upgraded zhuravljov\yii\queue to version 0.11, fixed download issue	2017-04-03 19:39:47 +02:00
buddh4	4a60d75e98	Enh: #2359 Use Jplayer playlist feature for post mp3	2017-03-16 14:26:21 +01:00
Lucas Bartholemy	20bc9e74dc	Enh: Added Clipboard.js and Permalink "Copy to clipboard" link	2017-03-09 14:19:26 +01:00
buddh4	8108e6890e	Updated min Yii version to 2.0.11	2017-02-10 16:45:13 +01:00
Carlos Ferreira	f6511ad4ac	Update composer.json	2017-02-09 12:30:35 +01:00
Lucas Bartholemy	e149b8be7e	Added queuing component	2017-01-18 12:48:47 +01:00
buddh4	887aa4f9d0	Revert of Activity field change + Test alignments.	2017-01-08 00:28:07 +01:00
buddha87	4d5bc8708e	Initial Notification Rewrite + Markdown posts (experimental).	2017-01-04 14:53:25 +01:00
buddha87	0cef6f0330	Richtext JS Api, Disabled Archived Stream, Stream Console Fix	2016-12-18 23:05:34 +01:00
buddha87	feabb9f20b	Api Enh: Stream Action uses StreamQuery Model, Js UI Addition extends + Mutation Observer + Fixes: SpaceChooser animation + Tour.	2016-12-09 08:37:52 +01:00
buddha87	66c969de00	Enh: Space Chooser rewrite.	2016-11-11 16:23:47 +01:00
Lucas Bartholemy	177d6ec9b1	File documentation enhancements	2016-10-31 18:45:21 +01:00
Lucas Bartholemy	c889256aa3	Added PJax page loading	2016-10-24 14:58:51 +02:00
Lucas Bartholemy	bcc99af9d4	Moved support css/js for older IE version into own AssetBundles	2016-10-21 13:44:22 +02:00
Lucas Bartholemy	8a736d1c81	Merge branch 'master' into v1.2-dev ... # Conflicts: # protected/humhub/config/common.php # protected/humhub/modules/content/components/actions/ContentContainerStream.php # protected/humhub/modules/space/models/Membership.php # protected/humhub/modules/space/views/space/home.php # protected/humhub/modules/stream/actions/Stream.php # protected/humhub/modules/stream/widgets/StreamViewer.php # protected/humhub/modules/user/models/User.php # protected/humhub/tests/codeception/acceptance/modules/user/LoginCept.php # themes/HumHub/css/theme.css	2016-09-12 19:29:05 +02:00
buddha87	600d587cc8	Enh: Asset Management Enhancement with yii asset command support minif/uglify.	2016-08-21 19:58:55 +02:00
Carsten Brandt	0de6df7d5c	Adjust Yii requirements in composer.json ... More restrictive version constraints. Otherwise Humhub would break if Yii releases a 2.1 version. Same for extensions.	2016-07-11 18:34:49 +02:00
buddha87	08fea57851	Merge branch 'v1.2-dev' of https://github.com/humhub/humhub into v1.2-dev	2016-06-05 20:06:27 +02:00
buddha87	5baf8b8e62	UserSettingMenu in authentication settings	2016-06-05 19:20:43 +02:00
Lucas Bartholemy	beb208f460	Merge branch 'master' into v1.2-dev ... # Conflicts: # protected/humhub/docs/guide/README.md # protected/humhub/modules/content/controllers/ContentController.php # protected/humhub/modules/dashboard/components/actions/DashboardStream.php # protected/humhub/modules/dashboard/controllers/DashboardController.php # protected/humhub/modules/space/controllers/SpaceController.php # protected/humhub/modules/stream/widgets/views/stream.php # protected/humhub/views/layouts/main.php # themes/HumHub/css/theme.css	2016-06-03 13:11:57 +02:00
Lucas Bartholemy	21dab558df	Added space pretty urls, cleanup space controls menu	2016-05-10 02:09:39 +02:00
buddha87	6eb0b942ff	JS rewrite . initial stream implementation.	2016-04-28 14:35:30 +02:00
buddha87	c6f8769bfe	Group Implementation Initial	2016-03-14 20:10:18 +01:00
Lucas Bartholemy	3e8ac428cf	Merge branch 'master' into v1.1-dev ... Conflicts: protected/humhub/config/common.php protected/humhub/modules/user/models/Invite.php protected/humhub/modules/user/widgets/UserFollowButton.php	2016-02-25 18:41:41 +01:00
Lucas Bartholemy	766be98368	Enh: Updated bootstrap markdown editor (added it to composer)	2016-02-22 12:54:26 +01:00
Lucas Bartholemy	8191d4ef86	Enh #117: Refactored authentication (pluggable yii2-authclient support)	2016-01-15 01:53:10 +01:00
Lucas Bartholemy	ffa8abdae0	Enh #1376: Added more Bower dependencies	2015-12-22 20:36:41 +01:00
Lucas Bartholemy	462b10301a	Enh #1357: TimeAgo improvements, added jquery-timeago as bower asset, i18n fixes	2015-12-21 17:13:13 +01:00
Lucas Bartholemy	98fcd29681	Migrated LDAP Support to yii2	2015-08-02 20:40:49 +02:00