mirror_php/humhub
1
0
Fork 0
mirror of https://github.com/humhub/humhub.git synced 2025-01-17 22:28:51 +01:00
Code Issues Projects Releases Wiki Activity
2,456 Commits 102 Branches 157 Tags
Commit Graph

2456 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lucas Bartholemy
f8bd1e4bab Hide group page in directory when there are no multiple groups 2016-05-04 15:42:22 +02:00
Lucas Bartholemy
d55c587605 Merge branch 'v1.1-dev' of github.com:humhub/humhub into v1.1-dev 2016-05-04 15:34:45 +02:00
Lucas Bartholemy
4a3c88206d Fixed group user count memory usage 2016-05-04 15:34:24 +02:00
Lucas Bartholemy
a6e70357a8 Merge branch 'v1.1-dev' of github.com:humhub/humhub into v1.1-dev 2016-05-04 15:01:04 +02:00
Lucas Bartholemy
35208b8d88 Merge branch 'master' into v1.1-dev 
# Conflicts:
#	protected/humhub/modules/user/libs/Ldap.php
 2016-05-04 15:00:53 +02:00
Lucas Bartholemy
4706291da6 Admins can edit/delete arbitrarily content 2016-05-04 14:59:47 +02:00
Lucas Bartholemy
8dffbb2365 Cache isSystemAdmin result in user model 2016-05-04 14:41:47 +02:00
buddha87
fdd223a985 JS Action/Content refactoring Implementation of action components. 2016-05-02 21:40:26 +02:00
buddha87
8905daf4f0 Merge pull request #1685 from buddha87/v1.1-dev 
V1.1 dev
 2016-05-02 13:05:46 +02:00
buddha87
ca066690ff Merge branch 'v1.1-dev' of https://github.com/humhub/humhub into v1.1-dev 2016-05-02 13:04:09 +02:00
Lucas Bartholemy
5829d93e21 Merge pull request #1684 from cebe/v1.1-dev 
Apply aad2063e6ca3ca87d708956ad173fbc45fe9db1f to v1.1-dev
 2016-05-02 12:48:42 +02:00
Lucas Bartholemy
f5c7e578ba Revert config/common.php change (commit ae502d3f0dac9bd6f113bd5b5a34bc603206ae5e) 2016-05-02 11:37:55 +02:00
buddha87
481d51d72a Changed is-manager dropdown style in group member edit 2016-05-02 01:53:15 +02:00
buddha87
06e69903ea JS Module safe module boot + new theme path updates. 2016-05-02 01:45:36 +02:00
Lucas Bartholemy
bd48f50c4d Fixed #1597: Changed datatype (activity / object_id) to integer v1.0.1 2016-05-02 00:11:45 +02:00
Lucas Bartholemy
73279be477 Fixed #1664: Misleading error message on module uninstall 2016-05-02 00:01:36 +02:00
Lucas Bartholemy
39112b860a Fixed #1667: Added share panel checkbox to account settings 2016-05-01 23:56:01 +02:00
buddha87
49e4b3c89e Merge branch 'v1.2-dev' of https://github.com/humhub/humhub into v1.2-dev 2016-05-01 23:02:26 +02:00
buddha87
33db8c5e6b Less theme testings 2016-05-01 23:02:09 +02:00
buddha87
d26d5bd0e9 Modal close on click fix. 2016-05-01 22:58:04 +02:00
Lucas Bartholemy
8276094103 Merge pull request #1622 from VasileGabriel/v1.2-dev 
Add foreign keys
 2016-05-01 22:13:19 +02:00
Lucas Bartholemy
bca31ae3c6 Merge pull request #1662 from evolved37/patch-2 
Update forms_AuthenticationLdapSettingsForm.php
 2016-05-01 22:08:53 +02:00
Lucas Bartholemy
594f3c74ea Merge pull request #1670 from cebe/patch-1 
Update views_config_admin.php
 2016-05-01 22:08:34 +02:00
Lucas Bartholemy
d1b125a9d4 Merge pull request #1675 from TadWohlrapp/master 
Added "disabled" attribute to un-editable <select> fields
 2016-05-01 22:08:12 +02:00
Lucas Bartholemy
5b4373aba1 Fixed #1668: Missing import of LDAP exception 2016-05-01 19:24:38 +02:00
Lucas Bartholemy
aad2063e6c Revert config/common.php change (commit ae502d3f0dac9bd6f113bd5b5a34bc603206ae5e) 2016-05-01 19:19:47 +02:00
buddha87
f0b3be8fd6 Merge pull request #1674 from cebe/patch-2 
Update admin-adv-auth.md
 2016-05-01 18:56:54 +02:00
Lucas Bartholemy
fcc20d6537 Merge branch 'master' into v1.1-dev 
# Conflicts:
#	protected/humhub/modules/admin/controllers/GroupController.php
#	protected/humhub/modules/admin/controllers/LoggingController.php
#	protected/humhub/modules/admin/controllers/SpaceController.php
#	protected/humhub/modules/directory/controllers/DirectoryController.php
#	protected/humhub/modules/installer/controllers/ConfigController.php
#	protected/humhub/modules/user/controllers/AccountController.php
#	protected/humhub/modules/user/controllers/AuthController.php
 2016-05-01 18:07:22 +02:00
HumHub Translate
ae502d3f0d Enh: Updated Translations (translate.humhub.org) 2016-05-01 17:59:17 +02:00
buddha87
4c8c384ff8 Merge pull request #1682 from cebe/fix-login-redirect 
cleanup overall usage of redirect()
 2016-05-01 17:31:19 +02:00
Carsten Brandt
0efee69bce cleanup overall usage of redirect() 
- make sure response instance is returned and nothing else is executed
  after redirect
- use consistent syntax, avoid extra calls to Url helper, which are not
  needed
- use controller redirect methods instead of
  Yii::$app->response->redirect()
- use goHome() and goBack() shortcut methods where applicable
- fixed some excpetion imports and catch blocks I found while fixing the
  above.
 2016-05-01 17:00:23 +02:00
Lucas Bartholemy
d5757096be Fixed: Don't set empty UrlManager baseUrl in console application 2016-04-30 13:29:28 +02:00
Lucas Bartholemy
41f39050e1 Fixed: Non "returning" redirects in various actions 2016-04-29 22:28:20 +02:00
Lucas Bartholemy
3af1173e03 Merge pull request #1678 from cebe/fix-login-redirect 
fixed redirect in login to avoid executing login logic again
 2016-04-29 20:51:05 +02:00
buddha87
907563f360 JS Rewrite - JSConfiguration + Modal confirm + Documentation 2016-04-29 19:23:11 +02:00
Carsten Brandt
c4fc763429 fixed redirect in login to avoid executing login logic again 
redirect should always return.
 2016-04-29 16:13:52 +02:00
Lucas Bartholemy
e30f291519 Fixed: Dashboard stream performance issue 2016-04-28 20:31:02 +02:00
Lucas Bartholemy
46c54d71f8 Merge pull request #1673 from cebe/fix-group-registration 
fixed group registration default value
 2016-04-28 17:24:37 +02:00
buddha87
6eb0b942ff JS rewrite . initial stream implementation. 2016-04-28 14:35:30 +02:00
buddha87
57c736fbff Fixed #1669 new widget stream widget path in index_guest.php 2016-04-28 14:33:26 +02:00
Tad Wohlrapp
8741cff058 Added "disabled" for un-editable fields 
Now un-editable <select> fields are shown as disabled. See commit 0e4f02dbc5c2d7e67b65812b3d2ff57211428f2e
 2016-04-27 22:43:00 +02:00
Tad Wohlrapp
0e4f02dbc5 Added option readonly for <select> elements 
Goes together with another Commit in protected\humhub\compat\HForm.php (marking un-editable fields as disabled and readonly).
Before, a <select> element wasn't disabled even though it couldn't be edited. The user changed a value and saved the change, but the value would remain unchanged. Now the <select> element is disabled and greyed out, so the user knows they can't change anything there.
 2016-04-27 22:39:27 +02:00
Tad Wohlrapp
003e241b1b Fixed small LdapException error 2016-04-27 22:28:56 +02:00
Tad Wohlrapp
cf45a70f74 Corrected typo 2016-04-27 22:19:55 +02:00
Carsten Brandt
75e72ca494 Update admin-adv-auth.md 
fixed class name in auth config example.

must be `humhub\modules\user\authclient\Collection` otherwise password auth will not work anymore.
 2016-04-27 21:35:17 +02:00
Carsten Brandt
dbc4b99777 fixed group registration default value 
to make automatic registration (e.g. via oauth) work
directly without showing the registration form.

fixes #1672
 2016-04-27 20:39:22 +02:00
Carsten Brandt
49cdc0b4d9 Update views_config_admin.php 
typo fix.
 2016-04-27 17:39:28 +02:00
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