buddha87
|
99203d02bf
|
New dev/prod asset.
|
2016-09-12 19:56:27 +02:00 |
|
Lucas Bartholemy
|
eff2f87626
|
Fixed wall entry creation
|
2016-09-12 19:04:30 +02:00 |
|
buddha87
|
46bd8ce9fc
|
assets gitignore
|
2016-08-24 13:01:58 +02:00 |
|
buddha87
|
926a14baa9
|
Fixed production asset management
|
2016-08-23 22:29:34 +02:00 |
|
buddha87
|
600d587cc8
|
Enh: Asset Management Enhancement with yii asset command support minif/uglify.
|
2016-08-21 19:58:55 +02:00 |
|
buddha87
|
056f4440a5
|
Testing enhancements
|
2016-08-17 16:04:52 +02:00 |
|
buddha87
|
b90f34b8a4
|
Testing enhancements
|
2016-07-14 23:32:49 +02:00 |
|
Lucas Bartholemy
|
1f6d020437
|
Merge branch 'master' into v1.2-dev
|
2016-06-05 23:06:57 +02:00 |
|
buddha87
|
9cfb77f166
|
Added Validation Events to HForm + Invite alignments
|
2016-06-05 23:03:19 +02:00 |
|
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 |
|
buddha87
|
14ba96987d
|
Documentation fixes.
|
2016-06-05 18:49:41 +02:00 |
|
Lucas Bartholemy
|
dcc69c892d
|
Merge pull request #1767 from mriedmann/master
Suggest a fix for #1766
|
2016-06-03 14:30:39 +02:00 |
|
Lucas Bartholemy
|
c582fefe11
|
Merge pull request #1764 from 3cst4sy/cherrypick
Some more translations
|
2016-06-03 13:44:29 +02:00 |
|
Lucas Bartholemy
|
e7b2e9fd6c
|
Merge pull request #1769 from sima-land/master
fix russian translation
|
2016-06-03 13:43:27 +02:00 |
|
HumHub Translate
|
c551a98da6
|
Enh: Updated Translations (translate.humhub.org)
|
2016-06-03 13:41:13 +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 |
|
Daha62
|
c5137cd2b5
|
Merge pull request #1 from sima-land/fix-ru-translation
Fix ru translation
|
2016-06-03 15:07:27 +05:00 |
|
Kharlova Daria
|
2258cb98ca
|
small fixes
|
2016-06-03 15:04:09 +05:00 |
|
Kharlova Daria
|
1f1a04119a
|
fix russian translation
|
2016-06-03 14:45:40 +05:00 |
|
Michael Riedmann
|
9543adf3a6
|
Fixed #1766 (#1)
Fixed issue "No module-update possible if runtime-folder is on other volume "
|
2016-06-03 10:52:09 +02:00 |
|
Lucas Bartholemy
|
240416407b
|
Fixed #1758: Delete space broken
|
2016-06-03 08:31:59 +02:00 |
|
xtc
|
a520881a7c
|
Add localization
|
2016-06-02 16:04:25 +02:00 |
|
xtc
|
712cffa4e0
|
Merge upstream/master into cherrypick
|
2016-06-02 16:03:18 +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 |
|