mirror_php/humhub
1
0
Fork 0
mirror of https://github.com/humhub/humhub.git synced 2025-01-29 20:38:26 +01:00
Code Issues Projects Releases Wiki Activity
2,373 Commits 108 Branches 157 Tags
Commit Graph

2373 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
buddha87
f2abd6cae0 Merge branch 'v1.1-dev' of https://github.com/humhub/humhub into v1.1-dev 2016-05-22 18:47:34 +02:00
buddha87
9e5dff707a User Account Settings styling 2016-05-22 18:43:53 +02:00
Lucas Bartholemy
f9c9ade4da Fixed CheckPasswordValidator when no user is logged in 2016-05-21 05:19:59 +02:00
Lucas Bartholemy
673d786f9b Authclient improvements 2016-05-21 05:14:06 +02:00
Lucas Bartholemy
7e1a99d1df Minor group administration fixes 2016-05-21 03:35:20 +02:00
Lucas Bartholemy
6d755e9023 Allow group_id attribute in AuthClient attributes 2016-05-21 03:34:47 +02:00
Lucas Bartholemy
e165f73f30 Improved default group during registration 2016-05-21 03:33:50 +02:00
Lucas Bartholemy
1c0026e9ce Validate group_id in registration scenario 2016-05-21 03:32:49 +02:00
buddha87
e86f83fdb9 Merge branch 'v1.1-dev' of https://github.com/humhub/humhub into v1.1-dev 2016-05-21 01:52:32 +02:00
buddha87
6a57fc96bd ImageConverter fix 2016-05-21 01:52:17 +02:00
Lucas Bartholemy
1d1c359a03 Authentication documentation 2016-05-20 19:06:00 +02:00
Lucas Bartholemy
36e6405200 Added preconfigured authclients and improved ui 2016-05-20 17:05:42 +02:00
Lucas Bartholemy
e553932382 Fixed #580: Do not generate en_uk message files 2016-05-20 02:56:45 +02:00
Lucas Bartholemy
ef06f1ee47 Trim RichTextWidget output 2016-05-20 02:48:03 +02:00
Lucas Bartholemy
1b39451cea Merge pull request #1742 from cebe/v1.1-dev 
cleanup, small fixes and phpdoc improvements
 2016-05-20 02:38:57 +02:00
Carsten Brandt
12cc597821 cleanup, small fixes and phpdoc improvements 
things I found while working.
 2016-05-20 02:31:09 +02:00
Lucas Bartholemy
af3ba93a76 Merge pull request #1741 from cebe/patch-2 
Fixed typo in German translation: "Benachrichtungen"
 2016-05-20 01:12:46 +02:00
Carsten Brandt
4fa36f5e91 Fixed typo in German translation: "Benachrichtungen" 
korrekt: Benachricht**ig**ungen
 2016-05-20 00:39:46 +02:00
Lucas Bartholemy
a47dcdb459 Merge pull request #1740 from cebe/search-fix 
fixed search results for short keywords
 2016-05-19 20:32:51 +02:00
Carsten Brandt
d7f72e1182 fixed search results for short keywords 
fixes #1737
 2016-05-19 20:14:19 +02:00
Lucas Bartholemy
d8fc0d251f Merge branch 'v1.1-dev' of github.com:humhub/humhub into v1.1-dev 2016-05-19 19:41:43 +02:00
Lucas Bartholemy
8f24cb0adf Merge branch 'master' into v1.1-dev 
# Conflicts:
#	protected/humhub/docs/guide/dev-settings.md
 2016-05-19 19:36:56 +02:00
Lucas Bartholemy
4deea29259 Enh #1737: Changed default min search query token length to 2 chars 2016-05-19 19:23:11 +02:00
Lucas Bartholemy
fda6259fad Merge pull request #1736 from cebe/patch-2 
make unimplemented functions in search class abstract
 2016-05-19 18:53:10 +02:00
Lucas Bartholemy
c88540ac52 Merge pull request #1739 from cebe/patch-3 
Update ContentContainerActiveRecord.php
 2016-05-19 18:52:57 +02:00
Carsten Brandt
431f21660a Update ContentContainerActiveRecord.php 
make `createUrl()` signature compatible with Child classes:

- dd388cb336/protected/humhub/modules/space/models/Space.php (L378)
- dd388cb336/protected/humhub/modules/user/models/User.php (L565)
 2016-05-19 18:51:05 +02:00
buddha87
1f28edb506 Merge pull request #1738 from buddha87/master 
Documentation enhancements
 2016-05-19 18:49:14 +02:00
buddha87
14a219e745 Documentation enhancements 2016-05-19 18:48:08 +02:00
Carsten Brandt
1451c6c4ab make unimplemented functions in search class abstract 
does not make much sense otherwise. This ensures proper implementation of child classes.
 2016-05-19 18:12:51 +02:00
Lucas Bartholemy
dd388cb336 Enh: Allow change of stream default sort order 2016-05-19 17:37:59 +02:00
Lucas Bartholemy
4306b650d7 Added LayoutAddons widget 2016-05-19 16:14:59 +02:00
Lucas Bartholemy
018d7b9a27 Added BaseSidebar class for various sidebars 2016-05-19 15:21:32 +02:00
Lucas Bartholemy
6a1226cb54 Removed duplicate of ImageConverter 2016-05-19 15:11:06 +02:00
Lucas Bartholemy
8761c834da Enh #1732: Added option to overwrite the notification polling time 2016-05-19 14:44:19 +02:00
buddha87
ce4c78e362 Merge pull request #1735 from buddha87/master 
Documentation enhancements
 2016-05-19 14:21:50 +02:00
buddha87
16474755c7 Merge branch 'master' of https://github.com/humhub/humhub 2016-05-19 14:17:16 +02:00
buddha87
8b1604f437 Documentation enhancements 2016-05-19 14:17:05 +02:00
Lucas Bartholemy
d7da514fa3 Added git stable branch notice 2016-05-19 01:14:28 +02:00
Lucas Bartholemy
35af3452aa Fixed: Determine requests hostInfo on given baseUrl 2016-05-19 00:49:19 +02:00
Lucas Bartholemy
0471bdc229 Removed share panel 2016-05-19 00:10:53 +02:00
Lucas Bartholemy
6cc323fb6d Merge branch 'master' of github.com:humhub/humhub 2016-05-18 16:23:03 +02:00
Lucas Bartholemy
10709038f3 Enh: Optimized space header member count 2016-05-18 16:22:37 +02:00
Lucas Bartholemy
98ac3d732c Changed directory member button styles 2016-05-18 16:15:26 +02:00
Lucas Bartholemy
a70b95212b Readded space manage menu widget for 1.0 compatibility 2016-05-18 15:46:10 +02:00
buddha87
95596db15d Only show administrative badge for admin group 2016-05-18 14:57:04 +02:00
buddha87
8a392a80ae Merge pull request #1724 from buddha87/v1.1-dev 
Removed spellchecker for richtext placeholder.
 2016-05-17 21:40:24 +02:00
buddha87
59842bf49a Merge branch 'v1.1-dev' of https://github.com/humhub/humhub into v1.1-dev 2016-05-17 21:38:42 +02:00
buddha87
6694743c8c Admin Layout alignments 2016-05-17 21:38:27 +02:00
buddha87
295c7e7ae9 Removed spellchecker for richtext placeholder. 2016-05-17 21:36:50 +02:00
Lucas Bartholemy
03578dd980 Merge branch 'master' into v1.1-dev 2016-05-17 18:50:38 +02:00