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,244 Commits 128 Branches 157 Tags
Commit Graph

2244 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
fcc3c16693 Merge pull request #1620 from buddha87/master 
Fixed #1606 Hide edit and delete link when profile image is removed
 2016-04-07 19:35:20 +02:00
buddha87
77bab18090 Merge branch 'master' of https://github.com/humhub/humhub 2016-04-07 19:34:14 +02:00
buddha87
7ebf2c1df9 Fixed #1606 Hide edit and delete link when profile image is removed 2016-04-07 19:32:58 +02:00
buddha87
4f9357c792 Merge pull request #1285 from davidjeddy/patch-2 
Update .travis.yml
 2016-04-07 16:40:38 +02:00
buddha87
df3d578abe Merge pull request #1243 from rubenandre/patch-4 
Update widgets_views_markdownEditor.php
 2016-04-07 16:38:50 +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
buddha87
61cab1d382 Merge pull request #1612 from buddha87/master 
Fixed date/birthdate field type bug
 2016-04-06 00:16:46 +02:00
buddha87
ff26d3b37c Fixed Date field type bug 2016-04-05 23:29:06 +02:00
buddha87
55445a0c31 Merge branch 'master' of https://github.com/humhub/humhub 2016-04-05 23:12:20 +02:00
buddha87
57d9a30696 Fixed FieldType Date 2016-04-05 23:10:38 +02:00
buddha87
6cb45965df Merge pull request #1609 from RichWeber/#1608 
fix #1608
 2016-04-05 22:54:04 +02:00
buddha87
5f8d2bb145 Fixed birthdate profile edit field 2016-04-05 22:50:02 +02:00
buddha87
4436482690 Fixed date/birthdate field type bug 2016-04-05 22:39:25 +02:00
RichWeber
516c67182e fix #1608 2016-04-05 23:32:13 +03:00
buddha87
bf3faa244c Fixed Date form field type bug. 2016-04-05 18:19:59 +02:00
buddha87
de61e77e53 Merge pull request #1607 from buddha87/master 
Fixed #1604 invite error display.
 2016-04-05 14:43:01 +02:00
buddha87
2cfa09aeaa Fixed #1604 invite error display. 2016-04-05 14:42:15 +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
abc41bf181 Fixed: Typo in space-assign-all-members command 2016-04-04 17:47:23 +02:00
Lucas Bartholemy
2167fa94b3 Fixed: Word-break in comments/activity 2016-04-03 15:42:02 +02:00
Lucas Bartholemy
2807b90625 Merge pull request #1595 from nminelle/master 
Completed French translations for Comment module
 2016-04-01 19:49:16 +02:00
Nicolas Minelle
1eda517a29 French translation typo in Comment module 2016-04-01 19:18:53 +02:00
Nicolas Minelle
5f550f5a33 Completed French translations for Comment module 2016-04-01 18:51:12 +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