mirror_php/humhub
1
0
Fork 0
mirror of https://github.com/humhub/humhub.git synced 2025-03-03 14:49:31 +01:00
Code Issues Projects Releases Wiki Activity
2,121 Commits 128 Branches 157 Tags
Commit Graph

2121 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
buddha87
6f19fd4188 Group Admin to Group Manager rename fixes in User model 2016-04-10 22:57:37 +02:00
buddha87
e9da6dc0d9 Merge branch 'v1.1-dev' of https://github.com/humhub/humhub into v1.1-dev 2016-04-08 13:46:07 +02:00
buddha87
3e393f368b Rename group admin to group manager. 2016-04-08 13:21:48 +02:00
buddha87
6d40afa551 Merge pull request #1627 from buddha87/v1.1-dev 
Exclude Admin Group from default authentication group setting.
 2016-04-08 11:58:05 +02:00
buddha87
2d02c65187 Merge branch 'v1.1-dev' of https://github.com/humhub/humhub into v1.1-dev 2016-04-08 11:56:58 +02:00
buddha87
ad31a3a522 Exclude Admin Group from default authentication group setting. 2016-04-08 11:55:31 +02:00
buddha87
44e70184d7 Merge pull request #1619 from buddha87/v1.1-dev 
Notification Overview theme update
 2016-04-07 14:49:15 +02:00
buddha87
2319740ced Notification Overview theme update 2016-04-07 14:48:40 +02:00
buddha87
8ea3ca14f8 Merge pull request #1618 from buddha87/v1.1-dev 
Notification Overview with Filter
 2016-04-07 14:41:24 +02:00
buddha87
0f29e90502 Notification Overview with Filter 2016-04-07 14:39:41 +02:00
Lucas Bartholemy
6b79dc6c27 Merge branch 'v1.1-dev' of github.com:humhub/humhub into v1.1-dev 2016-04-04 21:26:24 +02:00
Lucas Bartholemy
8846386897 Added friendship button to directory members page 2016-04-04 21:26:13 +02:00
buddha87
2ca4ec5a49 Merge pull request #1603 from buddha87/v1.1-dev 
Fixed HForm invalid field error handling
 2016-04-04 21:21:36 +02:00
buddha87
d97ff3353b Merge branch 'v1.1-dev' of https://github.com/humhub/humhub into v1.1-dev 2016-04-04 21:17:24 +02:00
buddha87
43d1c6f11e Fixed invalid form field error handling. 2016-04-04 21:16:34 +02:00
Lucas Bartholemy
dda3d8114e Improved group list 2016-04-04 20:25:10 +02:00
Lucas Bartholemy
c58c378339 Added Profile Header changes to v1.1 incl. Friends 2016-04-01 17:44:13 +02:00
Lucas Bartholemy
6670159850 Merge branch 'master' into v1.1-dev 
Conflicts:
	protected/humhub/modules/user/widgets/views/profileHeader.php
 2016-04-01 17:36:42 +02:00
HumHub Translate
f4a68207a5 Enh: Updated Translations (translate.humhub.org) 2016-04-01 17:28:17 +02:00
Lucas Bartholemy
a0cc9e3fb6 Merge pull request #1586 from davidjeddy/master 
Update index-test.php
 2016-04-01 17:26:37 +02:00
Lucas Bartholemy
fdf130fec0 Merge pull request #1591 from nminelle/master 
Completed French translation for Search module
 2016-04-01 17:24:48 +02:00
Lucas Bartholemy
a834393552 Merge pull request #1593 from smb043/patch-1 
Fix username or email value (rus)
 2016-04-01 17:24:22 +02:00
HumHub Translate
cfb894364e Enh: Updated Translations (translate.humhub.org) 2016-04-01 17:21:23 +02:00
Lucas Bartholemy
60f550508a Enh: Reduced page size in user list modal 2016-04-01 16:57:48 +02:00
Lucas Bartholemy
320a383429 Enh: Show message in user list modal when there are no users 2016-04-01 16:56:35 +02:00
Lucas Bartholemy
c5f7e4d40e Enh: Added modals to show users/space followers in profile/space header 2016-04-01 16:53:41 +02:00
smb043
9cf64d6648 Fix username or email value 2016-04-01 14:04:58 +03:00
Lucas Bartholemy
1309fdca80 Refactored mail update && allow custom mail subjects 2016-04-01 11:22:04 +02:00
Lucas Bartholemy
805fdf4a75 Fixed: group rewrite typo 2016-04-01 11:20:52 +02:00
Nicolas Minelle
e59e1a1c57 Added French translations to Space module 2016-03-31 22:51:06 +02:00
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