buddha87
|
08fea57851
|
Merge branch 'v1.2-dev' of https://github.com/humhub/humhub into v1.2-dev
|
2016-06-05 20:06:27 +02:00 |
|
buddha87
|
5baf8b8e62
|
UserSettingMenu in authentication settings
|
2016-06-05 19:20:43 +02:00 |
|
buddha87
|
dcd41d049d
|
Don't overwrite baseUrl if set to null (failed testing on windows)
|
2016-06-05 19:19:57 +02:00 |
|
buddha87
|
c733cf17b6
|
Enhanced testing
|
2016-06-05 19:12:12 +02:00 |
|
Lucas Bartholemy
|
689d5ee34f
|
Fixed 1.1 merge
|
2016-06-03 13:28:33 +02:00 |
|
Lucas Bartholemy
|
beb208f460
|
Merge branch 'master' into v1.2-dev
# Conflicts:
# protected/humhub/docs/guide/README.md
# protected/humhub/modules/content/controllers/ContentController.php
# protected/humhub/modules/dashboard/components/actions/DashboardStream.php
# protected/humhub/modules/dashboard/controllers/DashboardController.php
# protected/humhub/modules/space/controllers/SpaceController.php
# protected/humhub/modules/stream/widgets/views/stream.php
# protected/humhub/views/layouts/main.php
# themes/HumHub/css/theme.css
|
2016-06-03 13:11:57 +02:00 |
|
Lucas Bartholemy
|
ca2bf611c9
|
improve check of required classes during urlify migration
|
2016-06-01 05:59:13 +02:00 |
|
Lucas Bartholemy
|
d86e61b0a2
|
Fixed notification grouping
v1.1.0-beta.1
|
2016-05-31 18:26:47 +02:00 |
|
Lucas Bartholemy
|
eb4f53684d
|
Minor documentation enhancements
|
2016-05-31 09:21:32 +02:00 |
|
buddha87
|
8b77b7653d
|
Fixed Migration foreignkey drop
|
2016-05-30 16:04:40 +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 |
|