mirror_php/humhub
1
0
Fork 0
mirror of https://github.com/humhub/humhub.git synced 2025-02-23 10:48:43 +01:00
Code Issues Projects Releases Wiki Activity
3,269 Commits 117 Branches 157 Tags
Commit Graph

3269 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
buddh4
2de4b0a202 Merge branch 'master' of github.com:humhub/humhub 
# Conflicts:
#	protected/humhub/modules/file/resources/js/humhub.file.js
 2017-02-15 10:27:26 +01:00
Lucas Bartholemy
fea2cc4801 Added missing class import 2017-02-15 10:18:49 +01:00
Lucas Bartholemy
4a2eeeacb4 Make modules asset path method public 2017-02-15 10:13:48 +01:00
Lucas Bartholemy
ab014fb5ed Enh: Moved UploadAction::getFileResponse method to FileHelper::getFileInfos 2017-02-15 10:00:53 +01:00
Lucas Bartholemy
5b8fdb3bfd Enh: Added custom file handler positions 2017-02-15 09:49:24 +01:00
Lucas Bartholemy
33e87a9be9 Merge pull request #2263 from larkinscott/master 
Create .codeclimate.yml
 2017-02-14 19:03:42 +01:00
Lucas Bartholemy
f023716e25 Enh: Added data-action-process to handle modal processes, added upload file event (humhub:file:created) 2017-02-14 18:27:32 +01:00
buddh4
237b043b47 Merge branch 'master' of github.com:humhub/humhub 2017-02-14 16:30:09 +01:00
buddh4
684ec2dcb0 Enhanced file upload handling. 2017-02-14 16:29:51 +01:00
Lucas Bartholemy
823894656c Enh: Added possibility to create own file handlers (edit, create, import, export) 2017-02-14 16:13:11 +01:00
Lucas Bartholemy
6d8adcdb7d Enh: Added flash variable (executeJavascript)to execute js on the next page load 2017-02-14 15:25:14 +01:00
buddh4
ceb2c634fe Merge branch 'master' of github.com:humhub/humhub 
# Conflicts:
#	protected/humhub/docs/CHANGELOG.md
 2017-02-14 12:49:55 +01:00
Lucas Bartholemy
ca2cea6862 Improvements for not logged in users without guest mode 2017-02-14 12:47:09 +01:00
buddh4
799cd2c32c Changelog edit 2017-02-14 12:43:13 +01:00
buddh4
8b5e95dd7d Enh: Added data-action-confirm for confirming actions + space module management migration. 2017-02-14 12:41:34 +01:00
Lucas Bartholemy
949d478e29 Enhanced modal load handling 2017-02-14 11:41:47 +01:00
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
buddh4
8108e6890e Updated min Yii version to 2.0.11 2017-02-10 16:45:13 +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
30eb200965 Merge branch 'Becold-transl-fr' 2017-02-09 16:47:11 +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
86071de985 Merge pull request #2239 from acidjames/patch-1 
[security] Update .htaccess
 2017-02-09 16:25:17 +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