2244 Commits

Author SHA1 Message Date
Nicolas Minelle
981ed8a12d Added French translation 2016-03-31 22:16:56 +02:00
buddha87
a9cc216bdd Merge pull request #1590 from buddha87/master
Revoke membership by post
2016-03-31 20:07:46 +02:00
buddha87
aae91a3942 Revoke membership by post 2016-03-31 20:06:28 +02:00
buddha87
a0d2819905 Merge pull request #1589 from buddha87/master
Fixed #1579 removed forcepost from cancel pending space membership
2016-03-31 17:17:15 +02:00
buddha87
2a9ea06f89 Merge branch 'master' of https://github.com/humhub/humhub 2016-03-31 15:51:13 +02:00
buddha87
78acdb15da Fixed #1579 removed forcepost from cancel pending space membership 2016-03-31 15:45:36 +02:00
David J Eddy
71ad3947de Update index-test.php
Added ./config/dynamic to index-test to allow more parity between dev and testing application configurations.
2016-03-30 10:01:17 -04:00
Lucas Bartholemy
5d987e0388 Merge branch 'master' into v1.1-dev 2016-03-30 08:38:47 +02:00
Lucas Bartholemy
ed2a66481f Merge branch 'master' of github.com:humhub/humhub 2016-03-30 08:36:01 +02:00
Lucas Bartholemy
dc8b72753d Enh: Changed formatters sizeFormatBase to 1000 2016-03-30 08:35:39 +02:00
Lucas Bartholemy
b5a6def4c9 New group handling in installer 2016-03-29 06:44:39 +02:00
Lucas Bartholemy
4deb2fe2c6 Merge remote-tracking branch 'remotes/origin/master' into v1.1-dev 2016-03-27 14:47:34 +02:00
HumHub Translate
c949ca2276 Enh: Updated Translations (translate.humhub.org) v1.0.0 2016-03-26 06:42:19 +01:00
HumHub Translate
a81dc406c0 Enh: Updated Translations (translate.humhub.org) 2016-03-26 06:39:49 +01:00
Lucas Bartholemy
d758e7e524 Changed version to 1.0.0 2016-03-25 11:55:13 +01:00
Lucas Bartholemy
7faa85ca28 Fixed #1567: New password visible during change 2016-03-25 11:53:22 +01:00
Lucas Bartholemy
63e7824f3e Fixed #1547: Added missing statistic code on auth layout 2016-03-25 11:49:31 +01:00
Lucas Bartholemy
3ee4a10d8d Fixed: Space chooser mobile scrolling problem (reverted to jquery.nicescroll v3.6.6) 2016-03-24 11:36:31 +01:00
Sebastian Stumpf
9651e38135 Fixed potential Problem in LDAP authentication causing connection timeout to LDAP Server. 2016-03-24 11:07:10 +01:00
Lucas Bartholemy
9943c33e15 Merge branch 'upstream' of https://github.com/3cst4sy/humhub into 3cst4sy-upstream 2016-03-20 06:36:28 +01:00
HumHub Translate
131b49e09a Enh: Updated Translations (translate.humhub.org) 2016-03-19 11:26:00 +01:00
Lucas Bartholemy
834d291cb2 Merge pull request #1564 from programguy/patch-1
Fixed #1465 Double notifications for comments
2016-03-19 10:43:11 +01:00
Lucas Bartholemy
6917760506 Merge pull request #1566 from buddha87/v1.1-dev
Multi Group User
2016-03-19 10:42:48 +01:00
Lucas Bartholemy
d1c85b4a39 Fixed: Typo in activity dev doc 2016-03-19 06:31:43 +01:00
buddha87
1f468ec924 Multi Group implementation + migration 2016-03-18 19:30:38 +01:00
buddha87
158b5dfba3 Merge branch 'v1.1-dev' of https://github.com/humhub/humhub into v1.1-dev 2016-03-18 19:22:15 +01:00
programguy
bd0bd7f833 Fixed #1465 Double notifications for comments
Skip new comment notification if the user was mentioned in a comment.
2016-03-16 21:40:02 -04:00
Lucas Bartholemy
d383050918 Merge branch 'v1.1-dev' of github.com:humhub/humhub into v1.1-dev 2016-03-16 08:11:20 +01:00
Lucas Bartholemy
5d33566ec6 Force absolute Urls in activities 2016-03-16 08:10:52 +01:00
buddha87
a591332ca1 Merge pull request #1560 from buddha87/master
Fixed inactive user logout.
2016-03-16 00:01:57 +01:00
buddha87
fba8fed180 Fixed inactive user logout. 2016-03-16 00:00:20 +01:00
buddha87
d7c997a1e2 Fixed inactive user logout. 2016-03-15 23:55:35 +01:00
buddha87
1bffd471bf Merge pull request #1559 from buddha87/master
Fix #1220 Responsive Gridviews
2016-03-15 14:59:29 +01:00
buddha87
af41e56bad Fix #1220 Responsive Gridviews 2016-03-15 14:51:37 +01:00
buddha87
a9d834cfaa Group Fixes 1 2016-03-14 22:22:04 +01:00
buddha87
d2642d3ec4 Merge branch 'v1.1-dev' of https://github.com/humhub/humhub into v1.1-dev 2016-03-14 20:13:37 +01:00
buddha87
c6f8769bfe Group Implementation Initial 2016-03-14 20:10:18 +01:00
Sebastian Stumpf
eaefa9cd80 Password fields in View are now password input fileds. 2016-03-14 12:28:34 +01:00
Lucas Bartholemy
a17c6285f8 Merge branch 'master' into v1.1-dev
Conflicts:
	protected/humhub/modules/user/libs/Ldap.php
	protected/humhub/modules/user/models/User.php
	protected/humhub/modules/user/views/auth/login.php
	protected/humhub/modules/user/widgets/UserPicker.php
	protected/humhub/modules/user/widgets/views/userPicker.php
	resources/user/userpicker.js
2016-03-10 20:17:38 +01:00
Sebastian Stumpf
f411337cda Merge branch 'master' of https://github.com/humhub/humhub 2016-03-10 14:44:28 +01:00
Lucas Bartholemy
0979b13fe7 Fixed: Possible search race condition in cron 2016-03-10 14:08:33 +01:00
Lucas Bartholemy
d11b958e8b Enh: Added search database path config parameter 2016-03-10 14:05:59 +01:00
buddha87
a32042653a Merge pull request #1545 from buddha87/master
Fix: Added access control for inactive user.
2016-03-09 18:17:35 +01:00
buddha87
fa96ee0ba9 Fix: Added access control for inactive user. 2016-03-09 18:15:47 +01:00
buddha87
28fbe362ee Fix: Align username validation 2016-03-09 15:44:33 +01:00
buddha87
a92e0b6394 Extend username length migration 2016-03-09 15:23:50 +01:00
Lucas Bartholemy
f5f75b7f0a Fixed: Removed constant in group migration - to avoid potential upgrade error 2016-03-09 14:47:10 +01:00
Sebastian Stumpf
2d5e01a414 Fixed permanent deactivation of ldap users when the user is not found in ldap. 2016-03-09 14:27:50 +01:00
buddha87
e619b9463e Merge pull request #1537 from buddha87/master
Fix: New Mail Modal Form fix
2016-03-08 21:57:21 +01:00
buddha87
b228d88784 Merge branch 'master' of https://github.com/humhub/humhub 2016-03-08 21:55:18 +01:00