21 Commits

Author SHA1 Message Date
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
Lucas Bartholemy
dd5bac2db9 Rewrite File Module 2015-06-29 02:05:44 +02:00
Lucas Bartholemy
9877d2f909 Updated search 2015-06-27 05:57:44 +02:00
Lucas Bartholemy
893357e765 Module/Marketplace yii2 migration 2015-06-26 01:01:02 +02:00
Lucas Bartholemy
5689050943 Replaced index.php - added composer.json 2015-06-24 16:48:52 +02:00