mirror_php/humhub
1
0
Fork 0
mirror of https://github.com/humhub/humhub.git synced 2025-01-17 14:18:27 +01:00
Code Issues Projects Releases Wiki Activity
4,117 Commits 102 Branches 157 Tags
Commit Graph

4117 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lucas Bartholemy
b8a78b1431 Merge branch 'refactor-search-rebuild-batch' of https://github.com/helnokaly/humhub into helnokaly-refactor-search-rebuild-batch 
# Conflicts:
#	protected/humhub/modules/user/Events.php
 2017-10-14 00:47:50 +02:00
Lucas Bartholemy
07c9b48ec5 Fix: Make sure own profile content is always visible to user 2017-10-14 00:37:43 +02:00
Lucas Bartholemy
bc0c5ab5e6 Merge pull request #2667 from githubjeka/local-config 
added local environments to gitignore
 2017-10-14 00:26:31 +02:00
Lucas Bartholemy
13c5a53d3c - Chg: Switched from Composer FXP plugin to Asset Packagist repository 
- Enh: Committed composer.lock
 2017-10-14 00:22:23 +02:00
buddh4
19909553bb Merge pull request #2642 from artturik/patch-1 
undefined var fix in JSONResponse.php
 2017-10-14 00:21:54 +02:00
Lucas Bartholemy
7bd631932e Merge branch 'master' into v1.3-dev 2017-10-13 22:46:28 +02:00
Lucas Bartholemy
02e6e27311 Merge branch 'v1.3-dev' of github.com:humhub/humhub into v1.3-dev 2017-10-13 22:44:04 +02:00
Lucas Bartholemy
5d8841a00f Added own CHANGELOG_DEV.md for dev branch 2017-10-13 22:43:52 +02:00
Lucas Bartholemy
e1b57893de Merge pull request #2597 from pelletiermaxime/patch-1 
Fix search index containing index for select fields
 2017-10-13 22:37:51 +02:00
Lucas Bartholemy
c6ff344f10 Merge branch 'master' of github.com:humhub/humhub 2017-10-13 22:34:27 +02:00
Lucas Bartholemy
6180acfab2 Fix ActiveQueryUser User model usage 2017-10-13 22:34:13 +02:00
Lucas Bartholemy
3399d61066 Enh: Added file search indexing 2017-10-13 22:30:42 +02:00
Lucas Bartholemy
568ea2718f Merge pull request #2751 from dockrize/patch-1 
Fix SSL Rewrite Rule
 2017-10-13 21:22:55 +02:00
Lucas Bartholemy
fdf96f5a57 Merge pull request #2778 from Felli/patch-4 
Add small note
 2017-10-13 21:21:38 +02:00
Lucas Bartholemy
c8733af506 Merge pull request #2549 from acs-ferreira/humhub-bootstrap-tour-update 
Update bootstrap-tour to v0.11.0
 2017-10-13 21:20:42 +02:00
Sarah Tsumayoi
a9afb95eca Add small note 
Add a small note about using the community for questions about customizing.
 2017-10-14 01:54:55 +09:00
Lucas Bartholemy
a061076bf4 Fix: MarkdownEditor cursor position after inserting file/image 2017-10-12 21:11:26 +02:00
Lucas Bartholemy
782549f206 Updated CHANGELOG.md 2017-10-11 01:42:57 +02:00
Lucas Bartholemy
7131b41bf4 Merge branch 'master' of github.com:humhub/humhub 2017-10-11 01:42:33 +02:00
Lucas Bartholemy
f857a29de7 Enh: Added new User::isVisible and ActiveQueryUser::visible methods 
Enh: Added new ActiveQueryEvent class
 2017-10-11 01:42:06 +02:00
buddh4
e948ef111c Fixed type hints in doc 2017-10-10 13:45:26 +02:00
buddh4
4be55b0b3a Fix: Global target filter excluded 2017-10-10 13:42:42 +02:00
buddh4
497146a49c Enh: Added BaseNotification:priority to mark high priority notifications 2017-10-10 13:41:33 +02:00
buddh4
01c2d2f07a Fix html issue in notificationSettingsForm 2017-10-10 13:40:02 +02:00
buddh4
172bc490b6 Fix: humhub\modules\live\Module::getLegitimateContentContainerIds behaviour with friendship module enabled 2017-10-10 11:45:47 +02:00
Roman Leuprecht
c32244e661 removed unnecessary space 2017-10-09 22:36:28 +02:00
Roman Leuprecht
567cdc2d6d Added style fixes 2017-10-09 22:33:41 +02:00
Roman Leuprecht
d896cad571 Adding a [DELETED] Placeholder in case the source of a new notification is missing 2017-10-09 22:32:30 +02:00
Roman Leuprecht
e5e0b25c7a Merge remote-tracking branch 'upstream/master' 2017-10-09 22:25:44 +02:00
Roman Leuprecht
8b98a30f8b This fixes the problem with the null access but that is only a symptom. We still need to find the root cause why this notification exists and is not deleted if it's source does not exist. 2017-10-09 21:38:25 +02:00
Lucas Bartholemy
019ab911d4 Added storageManagerClass doc property 2017-10-08 19:10:58 +02:00
Lucas Bartholemy
eb65095c78 Minor query improvement 2017-10-08 17:07:23 +02:00
Lucas Bartholemy
d39a11785b Use ActiveQuery instead of manual check enabled 2017-10-08 17:03:33 +02:00
Lucas Bartholemy
9d6519d79d Rebuild assets 2017-10-08 14:42:05 +02:00
Lucas Bartholemy
7e4fdcee42 Merge branch 'master' of github.com:humhub/humhub 2017-10-08 14:33:15 +02:00
Lucas Bartholemy
c39815bf01 Also update new message count if space entry is moved 2017-10-08 14:33:02 +02:00
HumHub Translations
79c32c0cee Enh: Updated Translations (translate.humhub.org) 2017-10-08 12:53:39 +02:00
HumHub Translations
e1810516fa Enh: Updated Translations (translate.humhub.org) 2017-10-08 12:50:33 +02:00
Lucas Bartholemy
fec5770366 Better handle empty keywords (special characters) 2017-10-08 12:48:49 +02:00
Lucas Bartholemy
e6a117f43b Updated changelog 2017-10-08 12:47:47 +02:00
Lucas Bartholemy
bc4b1cb649 Merge branch 'master' of github.com:humhub/humhub 2017-10-08 12:47:06 +02:00
Lucas Bartholemy
4d43edf219 Enh: Show space administrators and moderators in member snippet 2017-10-08 12:45:56 +02:00
HumHub Translations
f15d580778 Enh: Updated Translations (translate.humhub.org) 2017-10-07 11:26:33 +02:00
buddh4
b437373595 Enh: Added MobileTargetProvider abstraction for mobile push notifications 
Enh: Added `humhub:notification:udpateCount` js event
 2017-10-06 18:35:56 +02:00
buddh4
1100c92cbb Fixed Chrome acceptance tests 2017-10-06 18:08:48 +02:00
HumHub Translations
aba480be64 Enh: Updated Translations (translate.humhub.org) 2017-10-05 21:01:28 +02:00
Lucas Bartholemy
980267db98 Improved notification mail handling/manipulation (e.g. attachments) 2017-10-05 01:06:04 +02:00
Lucas Bartholemy
ee019f7b21 Merge branch 'master' of github.com:humhub/humhub 2017-10-04 22:57:54 +02:00
Lucas Bartholemy
7c9aa795d7 Date Input Format fixes 2017-10-04 22:57:39 +02:00
buddh4
0aa23c111d Merge pull request #2762 from devantoine/patch-1 
Use FileManager::findAll() instead of non existing FileManager::getAll()
 2017-10-04 12:49:12 +02:00