5413 Commits

Author SHA1 Message Date
buddh4
7dc40c862c Fix: prevent user serialization for SocialActivity 2018-07-19 14:02:23 +02:00
buddh4
5658832972 Merge branch 'master' of https://github.com/humhub/humhub 2018-07-18 17:22:00 +02:00
buddh4
b704652b28 Removed redundant npm install in .travis.yml 2018-07-18 17:21:43 +02:00
Lucas Bartholemy
0394326473 Merge branch 'master' of github.com:humhub/humhub v1.3.0-beta.2 2018-07-18 17:10:32 +02:00
Lucas Bartholemy
bd5db35f67 Prepare beta.2 release 2018-07-18 17:10:18 +02:00
buddh4
9c07b2fd80 Added production asset build to .travis.yml 2018-07-18 17:08:49 +02:00
buddh4
8f2535b6db Removed production assets from repository. 2018-07-18 17:02:29 +02:00
buddh4
c7c502eec4 Theme rebuild 2018-07-18 16:16:12 +02:00
buddh4
8cbf8cd21b Fix: File upload errors not handled by richtext 2018-07-18 16:15:06 +02:00
buddh4
f3e90cec98 Replaced pjax:success with humhub:ready events 2018-07-18 16:14:07 +02:00
buddh4
ab7fb45955 Fix: Profile/Space image upload not working after full page reloads 2018-07-18 16:13:08 +02:00
buddh4
aab89578a4
Merge pull request #3219 from githubjeka/userpickerfield
BC break for itemKey of UserPickerField
2018-07-18 15:42:25 +02:00
githubjeka
32405b73c9 fixes for UserPickerFieldTest 2018-07-18 14:19:27 +03:00
buddh4
376b2479a9 Small cleanup + changelog update + composer.lock update 2018-07-18 13:13:52 +02:00
buddh4
17c319475b Reverted prosemirror paragraph padding 2018-07-18 13:12:15 +02:00
buddh4
78fa8c20ed Fix: Upload preview for comments not cleared after submit 2018-07-18 12:39:00 +02:00
githubjeka
801c18404b UserPickerFieldTest 2018-07-18 13:36:15 +03:00
buddh4
57a99349c1 Small cleanup 2018-07-17 19:32:07 +02:00
buddh4
c3392a16a9 - Enh: Use of new richtext version 1.0.4 see https://github.com/humhub/humhub-prosemirror/blob/master/docs/CHANGELOG.md
- Enh: Added max-height for post/comment/edit richtext
2018-07-17 19:31:23 +02:00
Lucas Bartholemy
fc0b9d7ae0 Enh #3194: Added integrity check for notification originator 2018-07-17 17:32:19 +02:00
Lucas Bartholemy
f213698fb5 Fix: Space homepage doesn't allow custom pages on first position 2018-07-17 13:04:40 +02:00
Lucas Bartholemy
b9c7817485 Added contentcontainer_id to comment image 2018-07-16 19:05:56 +02:00
buddh4
b4cfc86a49 Fix: Wrong permission check on force invite check 2018-07-16 19:00:48 +02:00
Lucas Bartholemy
2dedbdadd5 Enh: Added id data attribute on contentcontainer links 2018-07-16 18:08:47 +02:00
buddh4
435b505ffb Merge branch 'master' of https://github.com/humhub/humhub
# Conflicts:
#	protected/humhub/docs/CHANGELOG.md
2018-07-16 16:59:22 +02:00
buddh4
4372da76ee Fix: Skip soft delete validation 2018-07-16 16:56:06 +02:00
Lucas Bartholemy
39583626a6 Fix: Added user dn to ldap attributes on login 2018-07-16 16:55:59 +02:00
Lucas Bartholemy
e80ba29558 Add user dn on login attributes 2018-07-16 16:50:11 +02:00
Lucas Bartholemy
fb3e357c52 Fixed url handling markdown 2018-07-16 14:29:53 +02:00
Lucas Bartholemy
ee0efccfd5 Updated CHANGELOG.md 2018-07-16 11:39:11 +02:00
buddh4
ab94133f07 Removed duplicate Yii import 2018-07-16 11:16:07 +02:00
buddh4
8a2d39b68f Merge branch 'master' of https://github.com/humhub/humhub 2018-07-16 11:14:43 +02:00
buddh4
28548fe659 Fixed missing Yii import in humhub\modules\comment\Events 2018-07-16 11:14:19 +02:00
Lucas Bartholemy
e5ee451bec Fixed missing import 2018-07-16 11:06:06 +02:00
buddh4
a66ff9b4a0 Merge branch 'master' of https://github.com/humhub/humhub 2018-07-16 11:02:30 +02:00
buddh4
f4b2c0590a Fix: Error thrown for empty url links in humhub\libs\Markdown when used in console environment 2018-07-16 11:02:06 +02:00
Lucas Bartholemy
ad9ee1b676
Merge pull request #3215 from acs-ferreira/patch-1
Small clean
2018-07-16 11:01:53 +02:00
buddh4
abd3c06785 Updated security and updating documentation. 2018-07-16 00:15:18 +02:00
Carlos Ferreira
e4d4b334e6
Update OverviewController.php 2018-07-16 00:01:19 +02:00
buddh4
80aa0269b9 Reworked get started docs 2018-07-15 23:54:16 +02:00
buddh4
eab8dafc11 Fix: move profile content not possible 2018-07-15 23:48:32 +02:00
Carlos Ferreira
f06ed03430
Update Events.php 2018-07-15 23:44:12 +02:00
Carlos Ferreira
8ffb16acef
Update ContentTopicButton.php 2018-07-15 23:43:22 +02:00
Carlos Ferreira
de2d4db0b9
Update TopicPicker.php 2018-07-15 23:42:53 +02:00
Carlos Ferreira
ed70e61242
Update TopicLabel.php 2018-07-15 23:41:55 +02:00
Carlos Ferreira
730d6f300f
Update ContentTopicsForm.php 2018-07-15 23:39:45 +02:00
Carlos Ferreira
dfd186a1fe
Update Topic.php 2018-07-15 23:39:15 +02:00
Carlos Ferreira
5977e464a5
Update ContentTopicController.php 2018-07-15 23:38:02 +02:00
Carlos Ferreira
21e9d334f6
Update groups.php 2018-07-15 23:35:29 +02:00
Carlos Ferreira
b2b08ba7db
Update userPosts.php 2018-07-15 23:32:57 +02:00