1
0
mirror of https://github.com/humhub/humhub.git synced 2025-02-17 14:25:02 +01:00

2676 Commits

Author SHA1 Message Date
Lucas Bartholemy
be2f051829 DashboardContent 1.2 adjustments 2016-10-14 17:33:44 +02:00
Lucas Bartholemy
63d6afe0b3 Merge branch 'master' into v1.2-dev
# Conflicts:
#	protected/humhub/config/common.php
#	protected/humhub/modules/admin/components/Controller.php
#	protected/humhub/modules/dashboard/views/dashboard/index.php
#	protected/humhub/modules/dashboard/views/dashboard/index_guest.php
#	themes/HumHub/css/theme.css
2016-10-14 17:30:06 +02:00
Lucas Bartholemy
8673769ab1 Space Membership Button enhancements 2016-10-14 17:15:41 +02:00
Lucas Bartholemy
2b30d68002 Cleanup content container module settings after deactivation 2016-10-14 17:13:54 +02:00
Lucas Bartholemy
037ace60a8 SettingsManager - added deleteAll method and improved boolean handling 2016-10-14 17:13:05 +02:00
Lucas Bartholemy
f7aea6532e Merge pull request from Lokke/patch-3
Update views_mails_UserInviteSpace.php
2016-10-14 17:10:29 +02:00
Lucas Bartholemy
4f5f0a44af Merge pull request from SilverFire/master
Added SpaceContent widget
2016-10-14 17:09:51 +02:00
Lucas Bartholemy
fb2371adb3 Merge pull request from SilverFire/dashboard-content
Added DashboardContent widget
2016-10-14 17:08:36 +02:00
Lucas Bartholemy
48cc36a0dc Merge pull request from cebe/patch-2
fixed paths of icon and manifest.json in main layout
2016-10-14 17:06:55 +02:00
Carsten Brandt
85899bcb5d fixed paths of icon and manifest.json in main layout 2016-10-12 23:57:53 +02:00
SilverFire - Dmitry Naumenko
7aab0a9da1 Added SpaceContent widget to have an event before dashboard content rendering 2016-10-11 18:47:30 +03:00
SilverFire - Dmitry Naumenko
39fb75ab31 Added SpaceContent widget to have an event before space content rendering 2016-10-11 14:16:20 +03:00
Lokke
2a7d3a76c2 Update views_mails_UserInviteSpace.php
just fixed some german translations
2016-10-07 14:50:36 +02:00
buddha87
4a4975cdf9 User Approval Fix 2016-10-06 17:08:39 +02:00
buddha87
4d6e142d9a Change language in account settings refactored. 2016-10-06 15:46:46 +02:00
buddha87
a054d665b4 Merge branch 'master' of https://github.com/humhub/humhub 2016-10-06 13:41:12 +02:00
buddha87
6508b78922 Fixed change language account setting without additional page reload. 2016-10-06 13:40:51 +02:00
buddha87
add444e14f Acceptancetest Login wait; 2016-10-06 13:19:24 +02:00
buddha87
099acb8ab0 Merge pull request from SilverFire/master
Fixed russian spelling
2016-10-06 12:42:47 +02:00
SilverFire - Dmitry Naumenko
329d6b09a2
Fixed russian spelling 2016-10-06 13:11:20 +03:00
buddha87
52a6ffb8a5 Travis test alignment. 2016-10-06 11:57:35 +02:00
buddha87
b6e59c1e7f Test alignments 2016-10-06 11:50:42 +02:00
buddha87
f1213ca70b Small text change. 2016-10-05 11:25:20 +02:00
buddha87
eaaf40fbbd Small text change. 2016-10-05 11:23:03 +02:00
buddha87
8f42e6151e Enhanced Permission Management/AccessControl + Aligned core testings 2016-10-05 10:40:45 +02:00
Lucas Bartholemy
10fd14782d Fixed: Ldap sync error for users empty email address 2016-09-26 17:23:14 +02:00
Lucas Bartholemy
17b3fc0801 Merge branch 'master' of github.com:humhub/humhub v1.1.1 2016-09-26 09:57:25 +02:00
Lucas Bartholemy
e4b338e93a Changed version to 1.1.1 2016-09-26 09:57:08 +02:00
Lucas Bartholemy
45bb66e1cb Merge pull request from onmotion/mobile-horizontal-scrolling
Horizontal scrolling images on mobile devices
2016-09-25 19:21:32 +02:00
Lucas Bartholemy
e725fd4a5a Merge pull request from shyper-ideler/patch-1
added let's encrypt challenge as an exception in RedirectMatch
2016-09-25 18:41:25 +02:00
kozhevnikov
0063030cf1 Horizontal scrolling images on mobile devices 2016-09-23 15:15:39 +03:00
Lucas Bartholemy
cfd1d182d1 Improvements in admin group manage layout 2016-09-22 16:40:30 +02:00
shyper-ideler
0007cb6280 added let's encrypt challenge as an exception in RedirectMatch 2016-09-20 21:04:57 +02:00
buddha87
62f7eaef99 Merge branch 'v1.2-dev' of https://github.com/humhub/humhub into v1.2-dev 2016-09-19 11:47:12 +02:00
buddha87
547e07befb Test alingments 2016-09-19 11:46:11 +02:00
buddha87
ae73029fc5 Test alignments 2016-09-19 11:39:23 +02:00
Lucas Bartholemy
5825b0998f Merge branch 'master' into v1.2-dev
# Conflicts:
#	protected/humhub/docs/guide/dev-testing.md
2016-09-19 11:04:22 +02:00
Lucas Bartholemy
fca23a3302 Merge branch 'v1.2-dev' of github.com:humhub/humhub into v1.2-dev 2016-09-19 10:54:26 +02:00
buddha87
1bb209791b Merge branch 'master' of https://github.com/humhub/humhub 2016-09-18 20:44:13 +02:00
buddha87
297618e6a7 Updated docs 2016-09-18 20:43:51 +02:00
Lucas Bartholemy
9bd281acfe Enh: Added base sidebar widget class 2016-09-17 21:23:21 +02:00
Lucas Bartholemy
a5139ed5b5 Enh: Added ShowMorePager widget 2016-09-17 21:03:06 +02:00
buddha87
3bcc3e67ad Small JS cleanup 2016-09-15 14:20:46 +02:00
buddha87
f8b6bfac34 Cleaner htmlEncode in richTextEditor.php 2016-09-15 14:14:30 +02:00
buddha87
bb56775bcd Fixed richtext self-xss + past html tags 2016-09-15 14:05:11 +02:00
buddha87
fcc5d5e7fe Fixed proxy password compatibility mapping 2016-09-13 19:20:16 +02:00
buddha87
07dd1d024d Merge branch 'master' of https://github.com/humhub/humhub 2016-09-13 19:12:38 +02:00
buddha87
4e5f7e0bf8 Fixed invalid proxy password setting key 2016-09-13 19:12:18 +02:00
buddha87
99203d02bf New dev/prod asset. 2016-09-12 19:56:27 +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