2843 Commits

Author SHA1 Message Date
Lucas Bartholemy
ae9951e02f Enh: Javascript HumHub Client - better handle ajax redirects 2017-02-13 19:35:24 +01:00
Lucas Bartholemy
c049a3d4a5 Added FileHelper methods createLink & getContentContainer 2017-02-13 19:32:39 +01:00
Lucas Bartholemy
64e50d5889 File StorageManager setContent method broken 2017-02-13 19:31:16 +01:00
buddh4
a063b031b0 Fixed Firefox acceptance test for travis issue. 2017-02-12 18:40:45 +01:00
buddh4
0cf52671b7 Merge branch 'master' of https://github.com/humhub/humhub
# Conflicts:
#	protected/humhub/docs/CHANGELOG.md
2017-02-12 18:29:16 +01:00
buddha87
46c5045d42 Fixed Firefox acceptance test issue. 2017-02-12 16:10:04 +01:00
buddha87
4d896467f8 Fixed Firefox acceptance test issue. 2017-02-12 15:54:18 +01:00
Lucas Bartholemy
63195d1bf8 Added 'renderGalleryLink' link method to PreviewImage converter 2017-02-11 12:15:33 +01:00
Lucas Bartholemy
7d0b7241ec Enh: Added 'show_in_stream' column in file table to hide output in wall entries 2017-02-11 12:13:50 +01:00
Lucas Bartholemy
e17e516f07 Fixed typo in stream error 2017-02-11 11:07:27 +01:00
buddh4
6bf3f30074 Fixed edit of richtext with only emoji's. 2017-02-10 17:23:46 +01:00
buddh4
e19fb0fdc3 Merge branch 'master' of https://github.com/humhub/humhub
# Conflicts:
#	protected/humhub/docs/CHANGELOG.md
2017-02-10 16:49:09 +01:00
buddh4
f6c20a65fd Allow id based richtext features. Use of Yii WidgetEvent in after run events. 2017-02-10 16:47:03 +01:00
Lucas Bartholemy
f2c84e70f9 Added .editorconfig code style configuration file 2017-02-10 00:02:42 +01:00
Lucas Bartholemy
78c4aed2c1 Added missing parent::init() call in ProfileHeader 2017-02-10 00:01:48 +01:00
Lucas Bartholemy
1465a1ebfb Moved user configuration params 'minUsernameLength' + 'adminCanChangeProfileImages' to user module class 2017-02-09 23:58:25 +01:00
Lucas Bartholemy
29c394c4fa Enh: Added new version check as ActiveJob 2017-02-09 23:01:04 +01:00
Lucas Bartholemy
5e3346361c Added logging table cleanup job 2017-02-09 22:49:32 +01:00
Lucas Bartholemy
2bb10d6ef5 Merge branch 'master' of github.com:humhub/humhub 2017-02-09 22:36:49 +01:00
Lucas Bartholemy
d8ae0750c0 Fixed typo in queue error message 2017-02-09 22:36:30 +01:00
HumHub Translations
e7b8f1eb37 Enh: Updated Translations (translate.humhub.org) 2017-02-09 19:56:10 +01:00
Lucas Bartholemy
bd8a0f4d6f Translation message rebuild & combined directory message categories 2017-02-09 18:40:14 +01:00
Lucas Bartholemy
2d35f44b7e Combined all directory translation messages in base category 2017-02-09 18:17:45 +01:00
Lucas Bartholemy
b250924f88 Regenerated translation message files 2017-02-09 17:21:20 +01:00
Lucas Bartholemy
a67900324b Updated translation message archives 2017-02-09 17:17:04 +01:00
Lucas Bartholemy
9981e4c240 Merge branch 'transl-fr' of https://github.com/Becold/humhub into Becold-transl-fr
# Conflicts:
#	protected/humhub/messages/fr/base.php
#	protected/humhub/modules/user/messages/fr/base.php
2017-02-09 16:46:33 +01:00
Lucas Bartholemy
83d88ced88 Merge branch 'master' of github.com:humhub/humhub 2017-02-09 16:29:35 +01:00
Lucas Bartholemy
4e7af75493 update spelling for internalAllowAnonymousRegistration (danielkesselberg) 2017-02-09 16:29:23 +01:00
Lucas Bartholemy
87bcdd7757 Merge pull request #2241 from benmag/patch-1
Correct PHP Version hint
2017-02-09 16:24:57 +01:00
Lucas Bartholemy
a06430ebe4 Merge pull request #2246 from glombers/patch-1
Update error.php
2017-02-09 16:19:01 +01:00
Lucas Bartholemy
a4eee7e345 Merge pull request #2247 from glombers/patch-2
Update base.php
2017-02-09 16:18:19 +01:00
Lucas Bartholemy
734376cb23 Make sure AppDynamicAsset is included after AppAsset 2017-02-09 16:11:39 +01:00
buddh4
e67a5c2452 Asset Rebuild. 2017-02-09 15:55:32 +01:00
buddh4
3a027c8989 Fixed markdown comment rendering. + Added collapsable text to comments. 2017-02-09 15:25:01 +01:00
Webus
cbcd85c7df Update base.php
Update base.php Polish language
2017-02-08 23:55:00 +01:00
Webus
5b75a904ea Update error.php
Update error.php Polish language
2017-02-08 23:50:05 +01:00
Lucas Bartholemy
0d9bf69102 Fix: TimeAgo locale not loaded in production mode, added AppDynamicAsset 2017-02-08 23:48:06 +01:00
buddh4
ce76ef0bb9 Fixed Markdown space issue. 2017-02-08 18:27:21 +01:00
buddh4
162bd64671 Fixed search links. 2017-02-08 16:49:11 +01:00
buddh4
7d9f5cd1dc Merge branch 'master' of https://github.com/humhub/humhub 2017-02-08 16:33:10 +01:00
buddh4
1808381e1e Fixed confirm modal + guest user js issues. 2017-02-08 16:32:36 +01:00
Lucas Bartholemy
f74ec8a2f6 Added release date to CHANGELOG.md 2017-02-08 16:11:48 +01:00
buddh4
dc302d8286 Removed client validation in password-recovery form. 2017-02-08 14:47:01 +01:00
buddh4
8cf508e810 Merge branch 'master' of https://github.com/humhub/humhub 2017-02-08 14:46:21 +01:00
buddh4
ee74441921 Fixed guest ActivityStream. 2017-02-08 14:46:03 +01:00
Lucas Bartholemy
710fc99beb Added missing Exception import 2017-02-08 14:40:43 +01:00
Lucas Bartholemy
800049e093 Better error handling on foreign key migrations 2017-02-08 14:40:26 +01:00
Lucas Bartholemy
e2019bb3e4 Merge branch 'master' of github.com:humhub/humhub 2017-02-08 12:42:16 +01:00
Lucas Bartholemy
d62b208802 Fixed PolymorphicRelation caching problem 2017-02-08 12:41:58 +01:00
buddh4
dfbc33335b Merge branch 'master' of https://github.com/humhub/humhub 2017-02-08 12:28:26 +01:00