buddha87
62f7eaef99
Merge branch 'v1.2-dev' of https://github.com/humhub/humhub into v1.2-dev
2016-09-19 11:47:12 +02:00
buddha87
547e07befb
Test alingments
2016-09-19 11:46:11 +02:00
buddha87
ae73029fc5
Test alignments
2016-09-19 11:39:23 +02:00
Lucas Bartholemy
5825b0998f
Merge branch 'master' into v1.2-dev
...
# Conflicts:
# protected/humhub/docs/guide/dev-testing.md
2016-09-19 11:04:22 +02:00
Lucas Bartholemy
fca23a3302
Merge branch 'v1.2-dev' of github.com:humhub/humhub into v1.2-dev
2016-09-19 10:54:26 +02:00
buddha87
1bb209791b
Merge branch 'master' of https://github.com/humhub/humhub
2016-09-18 20:44:13 +02:00
buddha87
297618e6a7
Updated docs
2016-09-18 20:43:51 +02:00
Lucas Bartholemy
9bd281acfe
Enh: Added base sidebar widget class
2016-09-17 21:23:21 +02:00
Lucas Bartholemy
a5139ed5b5
Enh: Added ShowMorePager widget
2016-09-17 21:03:06 +02:00
buddha87
3bcc3e67ad
Small JS cleanup
2016-09-15 14:20:46 +02:00
buddha87
f8b6bfac34
Cleaner htmlEncode in richTextEditor.php
2016-09-15 14:14:30 +02:00
buddha87
bb56775bcd
Fixed richtext self-xss + past html tags
2016-09-15 14:05:11 +02:00
buddha87
fcc5d5e7fe
Fixed proxy password compatibility mapping
2016-09-13 19:20:16 +02:00
buddha87
07dd1d024d
Merge branch 'master' of https://github.com/humhub/humhub
2016-09-13 19:12:38 +02:00
buddha87
4e5f7e0bf8
Fixed #1990 invalid proxy password setting key
2016-09-13 19:12:18 +02:00
buddha87
99203d02bf
New dev/prod asset.
2016-09-12 19:56:27 +02:00
Lucas Bartholemy
8a736d1c81
Merge branch 'master' into v1.2-dev
...
# Conflicts:
# protected/humhub/config/common.php
# protected/humhub/modules/content/components/actions/ContentContainerStream.php
# protected/humhub/modules/space/models/Membership.php
# protected/humhub/modules/space/views/space/home.php
# protected/humhub/modules/stream/actions/Stream.php
# protected/humhub/modules/stream/widgets/StreamViewer.php
# protected/humhub/modules/user/models/User.php
# protected/humhub/tests/codeception/acceptance/modules/user/LoginCept.php
# themes/HumHub/css/theme.css
2016-09-12 19:29:05 +02:00
Lucas Bartholemy
eff2f87626
Fixed wall entry creation
2016-09-12 19:04:30 +02:00
Lucas Bartholemy
b872896b04
Merge pull request #1987 from helnokaly/master
...
Show user container's display name for posts posted on others' profiles …
2016-09-12 19:00:53 +02:00
Hany El Nokaly
4327a097d9
Show profile's display name for posts posted on others' profiles when viewing from dashboard
2016-09-12 15:22:33 +02:00
Lucas Bartholemy
b60b25f3ef
Merge pull request #1934 from 3cst4sy/cherrypick
...
Enhanced regex for @ token in posts
2016-09-11 17:35:24 +02:00
Lucas Bartholemy
195681b936
Merge pull request #1946 from Daha62/subscription-count
...
fix following count
2016-09-10 10:09:57 +02:00
Lucas Bartholemy
d59e3970a4
Merge pull request #1940 from Daha62/hide-change-email-tab
...
hides change-email tab
2016-09-10 10:03:55 +02:00
Lucas Bartholemy
933996f670
Merge pull request #1985 from Daha62/fix-user-profileBanner-error
...
Fix user profile banner error.
2016-09-09 20:25:47 +02:00
Kharlova Daria
384b35e7c5
Fix user profile banner error.
2016-09-09 12:00:57 +05:00
Lucas Bartholemy
7e62449956
Merge pull request #1944 from Daha62/remove-401-exception-from-logging
...
remove exceptions from logging
2016-09-07 14:22:19 +02:00
Lucas Bartholemy
0fd63d5586
Enh: Make UserListBox pagination size customizable
2016-09-07 10:08:47 +02:00
buddha87
49881503a6
Fixed #1942 remove additional spaces on chrome + trim content
2016-09-01 16:41:17 +02:00
buddha87
8968251b96
Enh: Added $sendInviteMailsInGlobalLanguage option to translate invite emails to either default or user language.
2016-09-01 12:33:52 +02:00
Lucas Bartholemy
5e1ce9301c
Merge pull request #1969 from cebe/fix-file-upload-new-model
...
Fixed file upload list to work with new models
2016-08-30 16:16:47 +02:00
Carsten Brandt
0794af98f5
Fixed file upload list to work with new models
...
When using FileUploadList in a form with normal validation (not client
validation) all uploaded files are lost after a validation error occurs.
This fixes the widget to keep files in that case, i.e. when
$model->isNewRecord is true, it will take the file list from the post
field assigned to the record instead of from the database.
2016-08-30 13:04:34 +02:00
Lucas Bartholemy
1e85e1391e
Merge pull request #1957 from cebe/customize-stream-action
...
allow customization of Stream action via events
2016-08-29 07:53:33 +02:00
Carsten Brandt
c122eb13e7
added @since annotation
2016-08-26 15:01:10 +02:00
Carsten Brandt
340bede945
allow customization of Stream action via events
...
added before and after action events that can be used to modify the
stream action filter.
2016-08-26 14:23:30 +02:00
buddha87
91575fae78
Fixed: lightbox align arrow position
2016-08-24 13:41:28 +02:00
buddha87
b726ef8854
Merge branch 'master' of https://github.com/humhub/humhub
2016-08-24 13:24:47 +02:00
buddha87
bcd4495140
Fixed ekko lightbox for mobile devices.
2016-08-24 13:24:21 +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
Kharlova Daria
ac78facecf
fix following count
2016-08-19 17:20:38 +05:00
Kharlova Daria
45cb8ed4d9
remove exceptions from logging
2016-08-19 11:28:38 +05:00
Kharlova Daria
628d46edf2
hides change-email tab
2016-08-18 14:20:32 +05:00
buddha87
056f4440a5
Testing enhancements
2016-08-17 16:04:52 +02:00
xtc
a990296c8a
Enhanced regex for @ token in posts
2016-08-17 14:36:25 +02:00
Lucas Bartholemy
0a6225b2b2
Changed version to 1.1.0
2016-08-16 18:05:37 +02:00
HumHub Translate
911198ea9f
Enh: Updated Translations (translate.humhub.org)
2016-08-16 17:51:03 +02:00
buddha87
e8d7ee5fad
Merge pull request #1928 from sima-land/translation-update
...
Translation ru
2016-08-15 11:59:01 +02:00
Kharlova Daria
312ca66106
translation update
2016-08-15 11:45:28 +05:00
Lucas Bartholemy
7ffd60eca3
Merge pull request #1921 from cebe/stream-action-params
...
added Stream::$streamActionParams to customize stream Url
2016-08-15 08:43:11 +02:00
