mirror_php/humhub
1
0
Fork 0
mirror of https://github.com/humhub/humhub.git synced 2025-03-15 20:49:46 +01:00
Code Issues Projects Releases Wiki Activity
584 Commits 134 Branches 158 Tags
Commit Graph

584 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
andystrobel
8ba3bda5e8 Added space names from posts on dashboard 2014-10-04 18:18:56 +02:00
andystrobel
b953fa9c41 Merge branch 'feature/make_content_editable' into develop 2014-10-04 15:19:29 +02:00
andystrobel
6894e3c11b Some clean ups and modifications to the editing feature 2014-10-04 15:17:24 +02:00
andystrobel
38f80684fa Integrated editing feature for posts 2014-10-04 15:10:06 +02:00
andystrobel
2d378e3404 Integrated comment editing feature 2014-10-03 21:02:45 +02:00
andystrobel
2d6c39a80f Renamed MentionWidget to HEditorWidget, Optimized code 2014-09-25 13:33:01 +02:00
andystrobel
1ae48ef2ae Added Hearteyes emoij 2014-09-24 19:09:30 +02:00
andystrobel
dfe2e594c7 Updated Mention Widget to displayed well in activities, notifications and mails 2014-09-24 18:39:09 +02:00
andystrobel
3745f39f0c Connected new search for user and spaces to mention widget 2014-09-24 16:32:04 +02:00
andystrobel
40138ebd97 Merge branch 'develop' of https://github.com/humhub/humhub into develop 2014-09-24 15:53:20 +02:00
Lucas Bartholemy
db91bd5740 Added result type to mentioning search 2014-09-24 15:51:38 +02:00
andystrobel
940d4f7295 Merge branch 'develop' of https://github.com/humhub/humhub into develop 
Conflicts:
	protected/modules_core/comment/widgets/views/form.php
	protected/modules_core/wall/widgets/views/contentForm.php
 2014-09-24 15:33:15 +02:00
andystrobel
7798f20fa1 Merge branch 'feature/mention' into develop 2014-09-24 14:53:20 +02:00
andystrobel
9baaa121f5 Optimized mention plugin and removed editor functions 2014-09-24 14:48:42 +02:00
Lucas Bartholemy
b98825276d Mentioning Search 2014-09-24 09:20:56 +02:00
andystrobel
9bc91b7ffb Integrate summer note text editor 2014-09-23 13:55:29 +02:00
Lucas Bartholemy
c625dc7a9b File uploader cleanups, allow files also in comments 2014-09-19 12:44:51 +02:00
Lucas Bartholemy
fafb5e4910 Allow specifc file extension instead of define forbidden (#146) 2014-09-19 07:50:20 +02:00
Lucas Bartholemy
e8b655b126 Prevent httpd from serving dotfiles (.htaccess, .svn, .git, etc. 2014-09-19 00:47:39 +02:00
Lucas Bartholemy
5f779db8a8 File module optimizations 2014-09-19 00:42:41 +02:00
andystrobel
2fbcfebf51 Integrated small text formatting option 2014-09-18 19:44:01 +02:00
andystrobel
bee8254129 Initial commit of the mention widget for users, spaces and emojis 2014-09-17 17:09:25 +02:00
luke-
6781ba7d29 Merge pull request #179 from humhub/master 
Merge master changes to develop
 2014-09-16 18:52:51 +02:00
Lucas Bartholemy
205ffb214f Fixed notification cleanup on user delete (#178) 2014-09-16 16:35:06 +02:00
Lucas Bartholemy
599b95030b Added Thai language files (th) 2014-09-16 06:39:06 +02:00
Lucas Bartholemy
869955b3c6 Changed ldap help text 2014-09-16 06:17:12 +02:00
Lucas Bartholemy
4369ff5ac3 Updated version to 0.9.1 v0.9.1 2014-09-15 13:27:38 +02:00
Lucas Bartholemy
c154bcb671 Updated translation files (yiic message command) 2014-09-15 13:26:59 +02:00
Lucas Bartholemy
11f4b61061 Updated translations (translate.humhub.org) 2014-09-15 13:15:11 +02:00
luke-
9274a701b3 Merge pull request #167 from geekdevs/feature_ci_security_wrapper 
Updated to latest version of CI_Security. Fixes #157
 2014-09-15 12:40:10 +02:00
luke-
6a9a443b91 Merge pull request #170 from alirezastack/master 
Yii::t for "Model & Id Parameter required" exception in commentControlle...
 2014-09-15 12:36:22 +02:00
Alireza Hoseini
a5a9086f22 Yii::t for "Model & Id Parameter required" exception in commentController 2014-09-15 11:43:46 +04:30
Pavel Dubinin
63aed080b8 Updated to latest version of CI_Security. Wrote a wrapper around it so that it's easier to update in future 2014-09-13 07:03:22 +03:00
Lucas Bartholemy
91641c7fee Fixed: Allow MySQL Password Special Characters (#143) 2014-09-13 01:44:25 +02:00
luke-
62383083d2 Update installation.md 
#154
 2014-09-12 15:39:12 +02:00
Lucas Bartholemy
62e78bafd6 Show language name instead language code in default language selector. 2014-09-12 13:52:02 +02:00
Lucas Bartholemy
859a067153 Display current default language on user profiles when not overwritten 2014-09-12 13:44:21 +02:00
Lucas Bartholemy
1f565ba9f6 Fixed: Default language not written to local config 2014-09-12 11:32:05 +02:00
Lucas Bartholemy
b880a304b5 Merge branch 'develop' of github.com:humhub/humhub into develop 
Conflicts:
	protected/modules_core/space/messages/de/widgets_views_spaceChooser.php
	protected/modules_core/user/messages/de/views_auth_login.php
	protected/modules_core/user/messages/de/views_auth_recoverPassword.php
 2014-09-11 17:46:16 +02:00
luke-
aaf6aaa8b4 Merge pull request #159 from bibabu512/master 
removed dead code ($success), changed the connection state detection.
 2014-09-11 17:40:28 +02:00
luke-
25cd4388e3 Merge pull request #148 from avstudnitz/feature_german_translation 
Feature german translation
 2014-09-11 17:35:11 +02:00
Daniel Kesselberg
0c4fa8c2c3 removed dead code ($success), changed the connection state detection. 2014-09-11 17:02:15 +02:00
luke-
34784b8769 Merge pull request #138 from jetwes/master 
Added Internalization for some placeholders
 2014-09-11 17:01:39 +02:00
luke-
13872a7aca Merge pull request #155 from bibabu512/master 
set update_at to NOW() if new record and userId = 0
 2014-09-11 16:30:22 +02:00
Daniel Kesselberg
b8946ac14f set update_at to NOW() if new record and userId = 0 2014-09-11 14:47:36 +02:00
Lucas Bartholemy
061c52b283 Added Contributing Infos 2014-09-11 14:41:11 +02:00
andystrobel
2efe225282 Fixed blank emails for outlook.com and some broken content links #85 #147 2014-09-11 14:08:35 +02:00
Lucas Bartholemy
a09f6c2d4a Updated translations 2014-09-11 11:31:41 +02:00
Andreas von Studnitz
d47a240155 Small changes to German translations regarding spaces 2014-09-10 09:19:49 +02:00
Andreas von Studnitz
e4c23e32c2 Added lots of German Translations concerning spaces 2014-09-10 09:19:37 +02:00