4073 Commits

Author SHA1 Message Date
Lucas Bartholemy
9d9a81c4f2
Merge pull request #2828 from cebe/composer-config
improve composer-asset-plugin config
2017-11-30 23:21:38 +01:00
buddh4
69a1897061
Merge pull request #2837 from cebe/patch-1
Fixed reference to license files
2017-11-26 19:42:31 +01:00
Carsten Brandt
8e8f3a4755
Fixed reference to license files 2017-11-23 13:49:24 +01:00
Carsten Brandt
958d940da6
improve composer-asset-plugin config
- Make sure to be compatible with newer versions of the plugin

  > The "extra.asset-installer-paths" option is deprecated, use the
  > "config.fxp-asset.installer-paths" option

- Improve performance of dependency resolution:
  120d35506e (diff-b5d0ee8c97c7abd7e3fa29b9a27d1780)
2017-11-17 11:16:08 +01:00
buddh4
a5559da7a9 Fix: Only include content with stream_channel = default into spacechooser update count. 2017-11-14 18:09:40 +01:00
buddh4
b0e2999eea Fix: Added ManageSpaces and SystemAdmin check to UserGroupAccessValidator 2017-11-10 18:08:08 +01:00
Lucas Bartholemy
83c6b7de31
Merge pull request #2816 from githubjeka/patch-1
fix typos in doc of Permission
2017-11-10 01:49:10 +01:00
Evgeniy Tkachenko
b563d81560
fix typos in doc of Permission 2017-11-09 12:27:25 +03:00
HumHub Translations
43f5f8f06c Enh: Updated Translations (translate.humhub.org) 2017-11-02 12:27:16 +01:00
Lucas Bartholemy
d38b5646c1 Fixed typo 2017-10-26 23:44:37 +02:00
Lucas Bartholemy
c8f1cfb8a1 Fixed typo in the documentation 2017-10-26 23:40:43 +02:00
Lucas Bartholemy
8092cc1d2d Fixed Fixed activity module cleanup 2017-10-25 22:15:07 +02:00
Lucas Bartholemy
f39bf4f4ed Fixed activity module cleanup 2017-10-25 16:51:57 +02:00
Lucas Bartholemy
25884d7e1a Merge pull request #2802 from acs-ferreira/master
Clean and format core Activity module
2017-10-25 09:23:15 +02:00
Lucas Bartholemy
86269a2d88 Merge branch 'master' into master 2017-10-25 09:18:55 +02:00
Carlos Ferreira
e9cf895bc3 Clean and format core Activity module 2017-10-24 19:32:30 +02:00
buddh4
b2c9ba9de7 Merge pull request #2801 from acs-ferreira/patch-4
Clean and use statements
2017-10-23 19:50:22 +02:00
Carlos Ferreira
395ca7b3e2 Clean and use statements 2017-10-23 18:49:33 +02:00
Lucas Bartholemy
15c34329b0 Prepare 1.2.3 release v1.2.3 2017-10-23 16:56:07 +02:00
Carlos Ferreira
b63802838b Some clean and use statements 2017-10-23 13:55:08 +02:00
buddh4
a64dda63bb Fixed StreamCest test + rebuild prod assets. 2017-10-23 13:32:09 +02:00
buddh4
a0752b67a6 Removed travis debug mode 2017-10-23 13:04:52 +02:00
buddh4
3dc8c59833 Fixed AccessControl documentation 2017-10-23 13:01:57 +02:00
buddh4
0025a001c3 Merge branch 'master' of https://github.com/humhub/humhub
# Conflicts:
#	protected/humhub/docs/CHANGELOG.md
2017-10-23 11:36:18 +02:00
buddh4
52c73221e2 Enh: Added ContentActiveRecord::silentContentCreation for disabling ContentCreated Activity/Notification on ContentActiveRecord level
Enh: Now the `NewContent` live event is always fired with `sourceClass` and `sourceId` information and a `silent` flag for silent content creations
2017-10-23 11:26:08 +02:00
Lucas Bartholemy
057e7d57ee Fix #2783: E-Mail notification link broken when guest mode is enabled (Buliwyfa) 2017-10-23 02:04:24 +02:00
Lucas Bartholemy
30193f99c2 Added FXP Composer Plugin Update note 2017-10-23 02:02:43 +02:00
buddh4
fda218fa72 Merge pull request #2546 from githubjeka/success-messages
Enh: Remove success flash messages
2017-10-23 01:53:02 +02:00
buddh4
d40f1b12ef Enh: Added apple-mobile-web-app-* and mobile-web-app-capable meta tags to head.php 2017-10-23 01:49:30 +02:00
Lucas Bartholemy
c279124d69 Updated CHANGELOG.md 2017-10-22 12:03:49 +02:00
Lucas Bartholemy
101b0b8eb3 Merge pull request #2786 from leuprechtroman/iconv_test
Add check for php iconv extension to the setup
2017-10-22 11:58:23 +02:00
Lucas Bartholemy
aeee7476d5 Merge pull request #2775 from leuprechtroman/master
[RFC] Adding a null check to comment/notifications/NewComment::getCommentedRecord()
2017-10-22 11:26:44 +02:00
Lucas Bartholemy
6bbc1ed5dc Also use new userModel variable for user title 2017-10-22 11:20:43 +02:00
Lucas Bartholemy
8b861428b5 Merge pull request #2788 from githubjeka/account
optimize code and add phpDoc to \user\widgets\views\accountTopMenu.php
2017-10-22 11:18:01 +02:00
Lucas Bartholemy
7427d1268a Merge pull request #2787 from githubjeka/comment
Fix phpDoc for \humhub\modules\comment\models\Comment
2017-10-22 11:17:24 +02:00
Lucas Bartholemy
77cb0147ea Merge branch 'master' into comment 2017-10-22 11:17:15 +02:00
HumHub Translations
c129d4da7c Enh: Updated Translations (translate.humhub.org) 2017-10-22 10:59:29 +02:00
HumHub Translations
caf445c413 Merge branch 'master' of github.com:humhub/humhub 2017-10-22 10:59:15 +02:00
HumHub Translations
7f008ec096 Enh: Updated Translations (translate.humhub.org) 2017-10-22 10:59:05 +02:00
buddh4
7be5ce3596 Fix stream image max-width + small cleanup. 2017-10-21 00:28:12 +02:00
buddh4
e02b0298e8 Build Prod assets 2017-10-21 00:25:07 +02:00
buddh4
37e5599480 Added data-file-* attributes to download links, for intercepting file downloads 2017-10-21 00:23:56 +02:00
buddh4
10d5cb28c8 Fix #2781 grunt build-asset not working because of clipboard.js dependency 2017-10-21 00:19:00 +02:00
buddh4
403820895c Fix: Added closing html video tags 2017-10-20 23:06:20 +02:00
buddh4
7377dd6ca7 Fixed Admin Space Settings for private Spaces
Fix wrong Comment date issue in notification mails
2017-10-20 23:01:42 +02:00
buddh4
e920bed7bb Fixed default space visibility/policy settings 2017-10-20 21:40:32 +02:00
buddh4
0b51200b8c Fixed wrong Comment date issue in notification mails 2017-10-20 20:48:13 +02:00
buddh4
8bce26e7dc Fix #2791, #2749: Force private join policy on private spaces + non changeable post visibility 2017-10-20 20:26:36 +02:00
buddh4
c68cde86b1 Fix #2792 use of wrong log badge colors 2017-10-20 18:57:04 +02:00
buddh4
ec12392241 Merge pull request #2793 from hagalaz/patch-1
preload="metadata" + add .webm
2017-10-20 18:51:25 +02:00