148 Commits

Author SHA1 Message Date
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
b54bfd98cb Theme.css update from current less compilation 2016-07-13 18:06:04 +02:00
buddha87
3a8da355bc Merge branch 'master' of https://github.com/humhub/humhub 2016-07-13 18:04:30 +02:00
buddha87
e6bd5e52a7 Force render Markdown Addlink/AddFile modals over fullscreen editor. 2016-07-13 18:02:11 +02:00
Sebastian Stumpf
50992225d5 Fixed positioning of arrows in galleries. 2016-07-13 14:21:35 +02:00
Carsten Brandt
de8ab700ee Removed share-panel styles
share widget has been removed in 0471bdc229dfe80e8b1ef03f3535037561513257 but style is still present in .less file in the theme.
2016-06-08 14:29:41 +02:00
Lucas Bartholemy
689d5ee34f Fixed 1.1 merge 2016-06-03 13:28:33 +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
buddha87
9e5dff707a User Account Settings styling 2016-05-22 18:43:53 +02:00
buddha87
15de5818c5 Grid view alignments + Permission submenu 2016-05-10 16:14:43 +02:00
buddha87
3ff25a7894 Space name/color widget + Tab Menu Admin Modules 2016-05-10 07:25:56 +02:00
buddha87
2f495e1fee Add Group Member loader button 2016-05-10 01:15:16 +02:00
buddha87
b92a43467f New Tab Menu (Space settings) 2016-05-10 00:05:07 +02:00
buddha87
76fd7815a4 Addes Loader save button in admin forms 2016-05-07 18:29:06 +02:00
buddha87
fdd223a985 JS Action/Content refactoring Implementation of action components. 2016-05-02 21:40:26 +02:00
buddha87
06e69903ea JS Module safe module boot + new theme path updates. 2016-05-02 01:45:36 +02:00
buddha87
33db8c5e6b Less theme testings 2016-05-01 23:02:09 +02:00
Lucas Bartholemy
864a7831c7 Merge branch 'v1.1-dev' into v1.2-dev 2016-04-21 15:00:54 +02:00
Lucas Bartholemy
dc451dba1e Merge branch 'master' into v1.1-dev
# Conflicts:
#	protected/humhub/modules/admin/models/UserApprovalSearch.php
#	protected/humhub/modules/admin/models/UserSearch.php
#	themes/HumHub/css/theme.css
2016-04-20 17:17:36 +02:00
buddha87
2a4bb0a0a5 Merge branch 'v1.2-dev' of https://github.com/humhub/humhub into v1.2-dev 2016-04-19 15:52:30 +02:00
buddha87
15cc36822c Added package.json, pjax dependencie + js rewrite enhancements 2016-04-19 15:47:05 +02:00
buddha87
c366600d00 Static max width/height for ligthbox gallery + removed outline from gallery 2016-04-15 14:47:10 +02:00
Lucas Bartholemy
8e258bff79 Merge branch 'master' into v1.1-dev
# Conflicts:
#	protected/humhub/config/common.php
#	protected/humhub/modules/content/components/ActiveQueryContent.php
#	themes/HumHub/css/theme.css
2016-04-14 18:41:00 +02:00
buddha87
2319740ced Notification Overview theme update 2016-04-07 14:48:40 +02:00
buddha87
0f29e90502 Notification Overview with Filter 2016-04-07 14:39:41 +02:00
Lucas Bartholemy
2167fa94b3 Fixed: Word-break in comments/activity 2016-04-03 15:42:02 +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
7d18e6178a Fixed #339: Added minimum modal width 2016-02-25 16:30:40 +01:00
Lucas Bartholemy
0a388d225a Fixed: Removed duplicate Bootstrap files 2016-02-24 00:25:32 +01:00
Lucas Bartholemy
062d531da9 Merge branch 'master' into v1.1-dev
Conflicts:
	protected/humhub/config/common.php
	protected/humhub/modules/admin/controllers/UserController.php
	protected/humhub/modules/user/models/User.php
	protected/humhub/modules/user/views/auth/login.php
2016-02-16 15:59:09 +01:00
andystrobel
0a286cd83c Added hand cursor to "show more" link at comments 2015-12-28 10:04:15 +01:00
andystrobel
a8d5fc7bf5 Fixed max-width for images in markdown output 2015-12-22 15:54:33 +01:00
andystrobel
7797184931 Fixed: Missing scrollbar at login page #1346 2015-12-01 21:48:44 +01:00
andystrobel
c94a87e2f7 Optimized word breaking 2015-11-25 12:57:17 +01:00
andystrobel
f9badd467f Changed member sings on directory 2015-11-24 13:44:01 +01:00
andystrobel
c74138f56c Fixed: Html in Tooltips #1284 2015-11-19 14:05:56 +01:00
andystrobel
c41e4cf8b0 Added background gradiant on login views 2015-11-15 17:31:47 +01:00
andystrobel
f27ae49c4d Added ShareWidget to dashboard 2015-11-14 19:05:36 +01:00
andystrobel
f919bca885 Improved ImageWidget for spaces 2015-11-06 17:07:05 +01:00
andystrobel
1c07196dc9 Enh: Added space colors 2015-11-06 11:21:17 +01:00
andystrobel
77fd34d4be Fixed: Wrong success panel color 2015-11-04 16:23:05 +01:00
andystrobel
9cb7f79c9e Hide sidebar widgets on mobile devices 2015-11-04 15:25:24 +01:00
andystrobel
57899a142a Responsive improvements for header views and mobile top menu 2015-11-04 14:08:30 +01:00
andystrobel
76793c218a Responsive optimizations 2015-11-04 13:55:52 +01:00
andystrobel
c76beb2ce1 Moved space preferences menu to space header 2015-11-02 17:27:51 +01:00
andystrobel
30180eef97 Styled menu dropdown-menu 2015-11-02 13:01:05 +01:00
andystrobel
7e01b67e6c Enh: Optimized responsive layout 2015-10-30 19:17:38 +01:00
andystrobel
dbbb060fa5 Enh: Added submit button for comments 2015-10-29 19:11:58 +01:00
andystrobel
4f189df56c Updated theme.css 2015-10-20 12:11:50 +02:00