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
Lucas Bartholemy
3e0a507cea Fixed #1661 #1666 #1578: Fixed requirement error when no INTL is installed 2016-04-25 15:14:30 +02:00
Lucas Bartholemy
c2a650d399 Merge branch 'master' of github.com:humhub/humhub 
Conflicts:
	protected/humhub/modules/comment/messages/fr/widgets_views_form.php
 2016-04-24 20:15:58 +02:00
HumHub Translate
2166dc2a0a Enh: Updated Translations (translate.humhub.org) 2016-04-24 19:58:52 +02:00
buddha87
23d16549ec Merge pull request #1663 from buddha87/v1.1-dev 
Enhanced Group Management
 2016-04-21 17:24:53 +02:00
buddha87
5931fca993 Enhanced Group Management 2016-04-21 17:23:52 +02:00
Lucas Bartholemy
7a1a3ea483 Enh: Public layout files attributes in BaseActivity 2016-04-21 13:15:46 +02:00
buddha87
1246023047 Merge pull request #1660 from buddha87/v1.1-dev 
Enh: Added Manage Group User View
 2016-04-20 22:47:17 +02:00
buddha87
a037a9975d Merge branch 'v1.1-dev' of https://github.com/humhub/humhub into v1.1-dev 2016-04-20 22:45:57 +02:00
buddha87
9d5d044d07 Enh: Added Manage Group User View 2016-04-20 22:45:28 +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
a0d1ae7831 Merge pull request #1656 from buddha87/master 
Documentation and crop image fix
 2016-04-20 15:06:55 +02:00
buddha87
c231d034ee Fixed close crop image by drag outside of the modal. 2016-04-20 15:04:30 +02:00
buddha87
144b13c9cf Merge branch 'master' of https://github.com/humhub/humhub 2016-04-20 15:02:29 +02:00
Lucas Bartholemy
f0fdc809a3 Enh: Added optional logout url 2016-04-20 13:57:52 +02:00
Lucas Bartholemy
24790cf7e5 Fixed: Broken 72px apple touch icon url 2016-04-20 13:07:26 +02:00
buddha87
b78f3413c8 Added Documentation 2016-04-19 23:35:10 +02:00
buddha87
7d8658857d Merge branch 'master' of https://github.com/humhub/humhub 2016-04-19 17:34:28 +02:00
buddha87
cdb255e679 Use of fully qualified column names for user approval search. 2016-04-19 17:33:33 +02:00
buddha87
1edc188c4a Merge pull request #1655 from buddha87/master 
Fixed #1652 use fully qualified column names for user search
 2016-04-19 17:18:36 +02:00
buddha87
811b061455 Merge branch 'master' of https://github.com/humhub/humhub 2016-04-19 17:16:15 +02:00
buddha87
bc19b1bb85 Fixed #1652 use fully qualified column names for user search 2016-04-19 17:15:46 +02:00
Lucas Bartholemy
b476ca7d0e Fixed: Login page redirect for guests 2016-04-19 15:09:52 +02:00
Lucas Bartholemy
78e9cb882f Merge pull request #1654 from cebe/patch-1 
fixed path in layouting docs
 2016-04-19 14:22:22 +02:00
Carsten Brandt
423cbb7b1c fixed path in layouting docs 2016-04-19 13:40:58 +02:00
buddha87
6ec93886c3 Merge pull request #1648 from buddha87/master 
Static max width/height for ligthbox gallery + removed outline from g…
 2016-04-15 14:53: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
95afa0b117 Merge branch 'v1.1-dev' of github.com:humhub/humhub into v1.1-dev 2016-04-15 13:22:07 +02:00
Lucas Bartholemy
c261633441 Fixed: Tests with new group system 2016-04-15 13:21:49 +02:00
Lucas Bartholemy
7aab8b9339 Merge pull request #1646 from helnokaly/master 
Fix issue space->getAdmins() returning all space members
 2016-04-14 23:49:04 +02:00
helnokaly
0067acb0e7 Fix issue space->getAdmins returning all space members 2016-04-14 18:43:14 +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
Lucas Bartholemy
87ce19737c Changed HumHub version to 1.0.1 2016-04-14 17:48:48 +02:00
Lucas Bartholemy
b7d50817af Enh: Increased fxp/composer-asset-plugin version 2016-04-14 17:48:19 +02:00
Lucas Bartholemy
2e787ec380 Fixed #1636: Chinese language yii category mapping 2016-04-14 17:02:50 +02:00
Lucas Bartholemy
da88feef0e Fixed #1594: Removed duplicated code 2016-04-14 16:56:16 +02:00
Lucas Bartholemy
d09d6829ac Merge branch 'master' of github.com:humhub/humhub 2016-04-14 16:50:02 +02:00
Lucas Bartholemy
ed19da7b48 Enh #1634: Added favicon.ico to gitignore 2016-04-14 16:49:11 +02:00
buddha87
094a2741da Merge pull request #1642 from buddha87/master 
Allow non unique space names by configuration + Ajax follow space button
 2016-04-13 16:41:20 +02:00
buddha87
2a39ce2651 Enh: Ajax follow space button 2016-04-13 16:38:16 +02:00
buddha87
fa113fcf2c Merge branch 'master' of https://github.com/humhub/humhub 2016-04-13 16:35:57 +02:00
buddha87
3aa0d2d05b Enable non unique space names by configuration. 2016-04-13 14:39:59 +02:00
buddha87
9319fad0b4 Merge pull request #1641 from buddha87/v1.1-dev 
Added getNotificatoins functionality to core modules and getName with…
 2016-04-13 14:36:18 +02:00
buddha87
5b1c5e0c00 Added getNotificatoins functionality to core modules and getName with translation support + Filter by Module in notification overview 2016-04-13 14:34:33 +02:00
buddha87
d28d161935 Merge pull request #1639 from buddha87/v1.1-dev 
Fixed UserApproval bug caused by group admin rename
 2016-04-12 14:03:36 +02:00
buddha87
438b946f5c Fixed UserApproval caused by group admin rename 2016-04-12 14:02:12 +02:00
buddha87
83ff9b4752 Merge pull request #1638 from buddha87/v1.1-dev 
Group Admin rename to Group Manager and Notification Overview fixes
 2016-04-12 13:57:02 +02:00
buddha87
7045d5716e Fixed notification overview empty filter selection, no entries found message, added filter for friendship approval and friendship request 2016-04-12 13:38:32 +02:00
buddha87
609992a231 Merge pull request #1635 from buddha87/master 
Fixed #1616 fixed contentaddon canDelete issue
 2016-04-11 20:40:37 +02:00
buddha87
61d2e2b00a Fixed #1616 fixed contentaddon canDelete issue 2016-04-11 20:37:33 +02:00
buddha87
6f19fd4188 Group Admin to Group Manager rename fixes in User model 2016-04-10 22:57:37 +02:00