2269 Commits

Author SHA1 Message Date
buddha87
81446fa858 Merge pull request #1703 from buddha87/v1.1-dev
Add Group Member loader button
2016-05-10 01:16:04 +02:00
buddha87
2f495e1fee Add Group Member loader button 2016-05-10 01:15:16 +02:00
buddha87
762c35ac4f Merge pull request #1702 from buddha87/v1.1-dev
New Tab Menu (Admin)
2016-05-10 01:05:34 +02:00
buddha87
944bf8dba6 New Tab Menu (Admin) 2016-05-10 01:04:40 +02:00
Lucas Bartholemy
2bb4db6ba1 Improved user url rule 2016-05-10 00:26:48 +02:00
buddha87
48590467c3 Merge pull request #1701 from buddha87/v1.1-dev
New Space Menu (Manage members)
2016-05-10 00:23:01 +02:00
buddha87
e61bae4e2a Merge branch 'v1.1-dev' of https://github.com/humhub/humhub into v1.1-dev 2016-05-10 00:22:11 +02:00
buddha87
ae6cf6a1d7 New Space Menu (Manage members) 2016-05-10 00:21:13 +02:00
buddha87
78be219b00 Merge pull request #1700 from buddha87/v1.1-dev
New Tab Menu (Space settings)
2016-05-10 00:06:51 +02:00
buddha87
61efdf3342 Merge branch 'v1.1-dev' of https://github.com/humhub/humhub into v1.1-dev 2016-05-10 00:05:49 +02:00
buddha87
b92a43467f New Tab Menu (Space settings) 2016-05-10 00:05:07 +02:00
Lucas Bartholemy
c5d3bcddb1 Loading buttons in installer 2016-05-09 16:00:54 +02:00
Lucas Bartholemy
234908c281 Fixed missing Yii import 2016-05-09 14:59:52 +02:00
Lucas Bartholemy
f76cb85e68 Refactored settings usage 2016-05-09 03:11:41 +02:00
Lucas Bartholemy
d84470dbd5 New settings logic for admin config 2016-05-09 01:13:13 +02:00
Lucas Bartholemy
46730ad6f7 Better settings compatibility for older modules 2016-05-09 00:31:20 +02:00
Lucas Bartholemy
a98753e3e3 Added new settings api doc 2016-05-09 00:31:05 +02:00
Lucas Bartholemy
c3f74a6428 Refactored settings system 2016-05-08 21:26:58 +02:00
buddha87
fcdd17e221 Merge pull request #1697 from buddha87/v1.1-dev
Enh: Paste text to richtext / richtext formatting
2016-05-07 21:50:47 +02:00
buddha87
cd11f6144d Merge branch 'v1.1-dev' of https://github.com/humhub/humhub into v1.1-dev 2016-05-07 21:49:54 +02:00
buddha87
42eac0de14 Enh: Paste text to richtext / richtext formatting 2016-05-07 21:49:15 +02:00
buddha87
e1bd0662a8 Merge pull request #1696 from buddha87/v1.1-dev
Enh: Added loader button to space/user settings + fixed user onIntegrity check
2016-05-07 19:08:54 +02:00
buddha87
626c892874 Merge branch 'v1.1-dev' of https://github.com/humhub/humhub into v1.1-dev 2016-05-07 19:07:36 +02:00
buddha87
694e0f540b Enh: Added loader button to space/user settings 2016-05-07 19:06:15 +02:00
buddha87
519a8e768e Fixed user onIntegrity check + Space Indexpage validation 2016-05-07 18:47:08 +02:00
buddha87
d903267f69 Merge pull request #1695 from buddha87/v1.1-dev
Loader buttons + Set index Page for spaces
2016-05-07 18:34:09 +02:00
buddha87
3a834105b9 Merge branch 'v1.1-dev' of https://github.com/humhub/humhub into v1.1-dev 2016-05-07 18:31:15 +02:00
buddha87
c225722493 Enh: Set index page for spaces. 2016-05-07 18:30:48 +02:00
buddha87
76fd7815a4 Addes Loader save button in admin forms 2016-05-07 18:29:06 +02:00
Lucas Bartholemy
bd8c200f8a Fixed tests scriptUrl 2016-05-05 16:22:08 +02:00
Lucas Bartholemy
6276a5bcc1 Added scriptUrl to test config 2016-05-05 16:07:43 +02:00
Lucas Bartholemy
dc7c348b7f User editable profile fields must not be visible on profile about page 2016-05-05 15:55:44 +02:00
Lucas Bartholemy
9ea94d3892 Fixed theme getBaseUrl 2016-05-05 14:52:50 +02:00
Lucas Bartholemy
d8f858bf7c Unified module bundled theme ability, moved theme helpers method to ThemeHelper 2016-05-05 14:39:57 +02:00
Lucas Bartholemy
da4bcccf06 Optimized user/space header view code 2016-05-05 03:19:23 +02:00
Lucas Bartholemy
9165939860 Fixed group user search in directory 2016-05-05 03:02:02 +02:00
Lucas Bartholemy
fb43777ce0 Fixed memory usage on many to many relation with via option 2016-05-05 02:32:50 +02:00
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
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
Lucas Bartholemy
bd48f50c4d Fixed #1597: Changed datatype (activity / object_id) to integer v1.0.1 2016-05-02 00:11:45 +02:00