5458 Commits

Author SHA1 Message Date
buddh4
87b6e1909f Updated composer.lock 2018-08-03 14:11:16 +02:00
buddh4
95df4b984a Merge branch 'master' of https://github.com/humhub/humhub 2018-08-03 13:27:57 +02:00
buddh4
c7b379f2b9 Enh: Added AbstractRichTextEditor::layout in order to change richtext style
Enh: Added `block` type RichText for non focus menu style
2018-08-03 13:27:37 +02:00
Lucas Bartholemy
e6fdec8cd3 Removed error logs when no PolymorphicRelation exists 2018-08-03 12:37:31 +02:00
Lucas Bartholemy
13ef8c2bca Improved logging 2018-08-03 11:07:56 +02:00
Lucas Bartholemy
18b1b396ca - Fix: Newly created profile fields cannot be updated 2018-08-03 11:06:12 +02:00
Lucas Bartholemy
af71a471c9 Merge branch 'master' of github.com:humhub/humhub 2018-08-03 10:04:09 +02:00
Lucas Bartholemy
c0ade8386b Fixed file can edit detection 2018-08-03 10:03:34 +02:00
buddh4
741415133e Fix: List style of Richtext embedded in media lists broken 2018-08-02 22:16:41 +02:00
buddh4
cfa33f450c Enh: Enhanced plain menu richtext style 2018-08-02 21:50:13 +02:00
buddh4
747e4c1a13 Small doc alignment 2018-08-02 14:10:18 +02:00
buddh4
0eb6d8003e Merge branch 'master' of https://github.com/humhub/humhub 2018-08-02 13:42:27 +02:00
buddh4
c8ffdf1b48 Extended Stream Filter Documentation 2018-08-02 13:42:00 +02:00
Daniel Kesselberg
1c3eb22d42
Fix typo
Restore ;
2018-08-01 21:38:03 +02:00
Daniel Kesselberg
e55ef62b8d
Fix conflict
Import Searchable as SearchableInterface
2018-08-01 21:36:51 +02:00
Lucas Bartholemy
c14c0636d9 Merge branch 'master' of github.com:humhub/humhub 2018-07-31 15:56:50 +02:00
Lucas Bartholemy
cb6e82d067 ActivityMail fixes 2018-07-31 15:56:40 +02:00
buddh4
7f99dcdec8 Merge branch 'master' of https://github.com/humhub/humhub
# Conflicts:
#	protected/humhub/docs/CHANGELOG.md
2018-07-31 14:34:35 +02:00
buddh4
29af026e34 Fix: Click to topics lead on streams without topic filter throws javascript error. (https://github.com/humhub/humhub-modules-polls/issues/49) 2018-07-31 14:33:04 +02:00
Lucas Bartholemy
782a4e0fb6 - Fix: Mail summaries not correctly triggered by cron 2018-07-31 14:27:39 +02:00
buddh4
373063c718 Developer doc enhancements 2018-07-31 14:08:58 +02:00
buddh4
98db926c86 Merge branch 'master' of https://github.com/humhub/humhub 2018-07-31 14:08:38 +02:00
buddh4
0c777b63af Enh: Added PolymorphicRelation::strict to throw exceptions when accessing invalid polymorphic relations 2018-07-31 14:08:18 +02:00
buddh4
995fc0f67d
Merge pull request #3224 from acs-ferreira/patch-3
Upgrade npm globally (Travis)
2018-07-31 11:57:00 +02:00
buddh4
efb7a5d41e Updated build.md 2018-07-31 02:06:53 +02:00
buddh4
a65e4e85e9 Small fixes in content.md developer doc 2018-07-31 01:43:53 +02:00
buddh4
684e6aa2d7 Developer documentation navigation alignment. 2018-07-31 01:27:51 +02:00
buddh4
cc0f0f029a Developer documentation enhancements. 2018-07-31 01:19:27 +02:00
buddh4
20c169a63d Developer doc enhancements 2018-07-30 22:40:15 +02:00
buddh4
a59888f724 Merge branch 'master' of https://github.com/humhub/humhub 2018-07-30 15:53:01 +02:00
buddh4
2e9858a8da Fixed developer documentation link. 2018-07-30 15:52:41 +02:00
Lucas Bartholemy
945b63c371 Prepare Beta.3 Release v1.3.0-beta.3 2018-07-30 15:45:18 +02:00
Lucas Bartholemy
be625382c4 Merge branch 'master' of github.com:humhub/humhub 2018-07-30 15:13:50 +02:00
Lucas Bartholemy
ed31ac624e Fixed typo 2018-07-30 15:13:37 +02:00
buddh4
bbdc3ef327 Added travis error log output 2018-07-30 15:02:55 +02:00
buddh4
62a81c2d5f Developer doku update. 2018-07-30 14:59:38 +02:00
buddh4
d3a7d404ad Update richtext to 1.0.6 2018-07-30 14:56:58 +02:00
buddh4
25d6a4e2ea Fixed RequestDeclined Notification missing requireSource = false 2018-07-30 13:33:58 +02:00
Lucas Bartholemy
73f04d0e24 - Fix: Source serialization of Notification ActiveJob
- Enh: Added 'requireSource' & 'requireOriginator' flags in SocialActivities
2018-07-30 13:08:03 +02:00
buddh4
7b981d6caa Developer doc enhancements. 2018-07-30 12:49:10 +02:00
buddh4
4d7c09423a Updated developer docs. 2018-07-27 13:09:24 +02:00
buddh4
75a66c4ce1 Fixed: Space and User Admin Filterbar padding 2018-07-27 11:33:29 +02:00
buddh4
04f9b16e81 Enh: Styled user deletion view 2018-07-27 11:28:33 +02:00
buddh4
9e77103c1e Merge branch 'master' of https://github.com/humhub/humhub 2018-07-27 11:03:59 +02:00
buddh4
b5cde8f302 Fix: Aligned select2 include path
Fix: Use default markdown code background color for highlight.js
2018-07-27 11:03:34 +02:00
buddh4
fb816164ce Developer doc module.md and content.md enhancements 2018-07-26 23:17:18 +02:00
buddh4
315f99d104 Fix #2700: Prevent GroupManager access to system admin group management 2018-07-26 19:51:06 +02:00
buddh4
24d086a150 Fix: Comment edit cancel edit context item not shown 2018-07-26 17:52:29 +02:00
buddh4
7cd373f4fa Fixed tour humhub:ready listener not removed
Added tour acceptance tests
2018-07-26 17:14:51 +02:00
buddh4
9825a9a224 - Fix: introduction tour not working
- Chng: Moved static js dependencies from `static/resources` into `static/js`
2018-07-26 16:16:53 +02:00