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,405 Commits 102 Branches 157 Tags
Commit Graph

2405 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lucas Bartholemy
eb4f53684d Minor documentation enhancements 2016-05-31 09:21:32 +02:00
Lucas Bartholemy
04d7d8a75c Merge branch 'master' of github.com:humhub/humhub 
# Conflicts:
#	protected/humhub/modules/comment/messages/en_uk/models_comment.php
#	protected/humhub/modules/post/messages/en_uk/models_Post.php
 2016-05-30 12:38:55 +02:00
Lucas Bartholemy
f82fef503f Fixed comment wording 2016-05-30 12:37:16 +02:00
Lucas Bartholemy
f7844dcdd5 Fixed post wording 2016-05-30 12:00:19 +02:00
HumHub Translate
bc9a0c32e6 Enh: Updated Translations (translate.humhub.org) 2016-05-30 09:47:05 +02:00
Lucas Bartholemy
d735f2e6aa Removed old translation files 2016-05-30 09:43:23 +02:00
Lucas Bartholemy
f36587ae15 Auto translated duplicates 2016-05-30 09:20:24 +02:00
HumHub Translate
2139877c46 Enh: Updated Translations (translate.humhub.org) 2016-05-30 07:57:29 +02:00
HumHub Translate
082103f9c4 Enh: Updated Translations (translate.humhub.org) 2016-05-25 18:33:46 +02:00
Lucas Bartholemy
6f15a954c8 Fixed problem at user group migration on invalid mappings 2016-05-25 18:22:47 +02:00
Lucas Bartholemy
e0e25ea54b Fixed GitHub e-mail address lookup 2016-05-25 17:19:37 +02:00
Lucas Bartholemy
6cc7e4b185 Fixed account deletion without password 2016-05-25 17:04:41 +02:00
Lucas Bartholemy
ad19e380d4 Fixed Facebook/Github auth client name parsing 2016-05-24 18:42:35 +02:00
Lucas Bartholemy
72e9ff9b94 Merge branch 'v1.1-dev' of github.com:humhub/humhub into v1.1-dev 2016-05-24 17:16:17 +02:00
Lucas Bartholemy
3a734c15d4 Changed version to 1.1.0-beta.1 2016-05-24 17:15:54 +02:00
Lucas Bartholemy
236bcde151 Merge branch 'master' into v1.1-dev 
# Conflicts:
#	protected/humhub/modules/admin/messages/de/views_setting_mailing.php
 2016-05-24 17:14:37 +02:00
Lucas Bartholemy
dbebbe0cf4 Added loader to User/Space module admin buttons 2016-05-24 15:50:04 +02:00
Lucas Bartholemy
8ded616151 Improved module enabled/disable via ModuleManager 2016-05-24 15:43:21 +02:00
HumHub Translate
cac76c9aa9 Enh: Updated Translations (translate.humhub.org) 2016-05-24 15:22:51 +02:00
Lucas Bartholemy
90c703ea26 Merge pull request #1745 from cebe/v1.1-dev 
use intl for translating country names
 2016-05-24 08:18:00 +02:00
Carsten Brandt
fc2a077c8f use intl for translating country names 
instead of user contributed translations.
Data is already there.

fixes #1744
 2016-05-23 23:20:23 +02:00
Lucas Bartholemy
2873020b6f Merge pull request #1746 from cebe/fix-comment 
allow sending image-only comments
 2016-05-23 21:29:56 +02:00
buddha87
1379a55bee Merge pull request #1748 from buddha87/v1.1-dev 
Fixed: canEdit error for guest user
 2016-05-23 21:01:52 +02:00
buddha87
a6b0ff7df9 Fixed: canEdit error for guest user 2016-05-23 21:00:28 +02:00
buddha87
9c6d60d28f Merge pull request #1747 from buddha87/v1.1-dev 
User Account Setting refactor + Authclient / Default text
 2016-05-23 19:53:21 +02:00
buddha87
f038f62446 Merge branch 'v1.1-dev' of https://github.com/humhub/humhub into v1.1-dev 2016-05-23 19:49:48 +02:00
buddha87
014c90b3db User Account Setting refactor + Authclient / Default text + Functional testing fixes 2016-05-23 19:49:23 +02:00
Carsten Brandt
25fb5e4844 allow sending image-only comments 
fixes #1541
 2016-05-23 17:08:22 +02:00
Lucas Bartholemy
30811e5842 Fixed error on profile creation when no user is mapped yet 2016-05-23 14:15:51 +02:00
Lucas Bartholemy
5c8ce9bc1b Enh: Added searchable flags to profile fields 2016-05-23 13:03:50 +02:00
Lucas Bartholemy
c846a02193 Show some search results, when no keyword was given 2016-05-23 12:20:21 +02:00
buddha87
c07f747d4e Merge pull request #1743 from buddha87/v1.1-dev 
User account settings styling
 2016-05-22 18:49:50 +02:00
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