Commit graph

23852 commits

Author SHA1 Message Date
Philipp
048501be34
Merge pull request #7017 from annando/reshare-known-contact
Don't show a reshare in the top of a message if we know the author
2019-04-19 15:09:34 +02:00
Michael
0d49d0593d Don't show a reshare in the top of a message if we know the author 2019-04-19 07:47:00 +00:00
Michael Vogel
c72bac8928
Merge pull request #7011 from nupplaphil/issue/setlogger_fix
SetLogger fix
2019-04-17 09:52:55 +02:00
Philipp Holzer
0d08d5dabc
SetLogger fix 2019-04-14 18:40:39 +02:00
Philipp
34748e8ffd
Merge pull request #7009 from MrPetovan/bug/6952-fix-save-to-folder
Prevent full page to load on save to folder modal
2019-04-14 16:53:12 +02:00
Hypolite Petovan
e01cb50892
Merge pull request #7010 from nupplaphil/task/basepath_hardening
Basepath Hardening
2019-04-14 10:46:06 -04:00
Philipp Holzer
b93db8ec2e
Add new test 2019-04-14 16:20:12 +02:00
Philipp Holzer
1480380af6
Basepath Hardening 2019-04-14 16:17:58 +02:00
Hypolite Petovan
e0911efc87
Merge pull request #7006 from nupplaphil/feature/install_enhancement
Adding basepath/url settings to the installer
2019-04-14 09:20:19 -04:00
Hypolite Petovan
187ea9ab21 Update BaseModule::rawContent to add sample implementation 2019-04-14 08:57:55 -04:00
Hypolite Petovan
b4b67aa136 Change Module\Filer::content to rawContent to prevent full page to load in modal 2019-04-14 08:57:27 -04:00
Philipp Holzer
462973b002
Bugfix BaseURL 2019-04-14 14:53:57 +02:00
Philipp Holzer
03e149270b
bugfix 2019-04-14 14:40:26 +02:00
Philipp Holzer
58c9566c3d
code style & install-403 fix 2019-04-14 14:24:01 +02:00
Philipp Holzer
d579d9e1d0
Add basepath to vagrant config file 2019-04-14 14:24:01 +02:00
Philipp Holzer
d90eb6a811
Remove php_path duplicate in auto-install 2019-04-14 14:24:00 +02:00
Philipp Holzer
5c57f2b09a
adapt help for tests 2019-04-14 14:24:00 +02:00
Philipp Holzer
288af6c896
remove test config 2019-04-14 14:24:00 +02:00
Philipp Holzer
8fe606660d
trim whitespaces 2019-04-14 14:23:59 +02:00
Philipp Holzer
f2b2451bcc
adding annotation 2019-04-14 14:23:59 +02:00
Philipp Holzer
3a0664d827
fixing auto install tests 2019-04-14 14:23:58 +02:00
Philipp Holzer
677cb205f5
fix auto install 2019-04-14 14:23:58 +02:00
Philipp Holzer
90a38a00d8
Adding basepath, urlpath, hostname and ssl_policy to installation 2019-04-14 14:23:06 +02:00
Philipp
19f474f50d
Merge pull request #7007 from MrPetovan/bug/7001-prevent-ajax-page_end
Remove obsolete hack in file browser template
2019-04-14 09:23:09 +02:00
Hypolite Petovan
608c80819c Remove obsolete hack in file browser template 2019-04-13 19:05:14 -04:00
Hypolite Petovan
edc4cfdcd6
Merge pull request #7005 from nupplaphil/issue/dba_logger_fix
DBA & Logger fix
2019-04-13 17:02:15 -04:00
Philipp Holzer
f17d6e88fd
fix loglevel 2019-04-13 21:03:07 +02:00
Philipp Holzer
e2f69a04b9
trim whitespaces 2019-04-13 20:57:21 +02:00
Philipp Holzer
fbd056327a
DBA-Logger fix 2019-04-13 20:46:58 +02:00
Philipp
c3f49b7151
Merge pull request #7003 from MrPetovan/bug/7001-prevent-ajax-page_end
Only call page_end hooks for standalone pages (no Ajax)
2019-04-13 18:07:42 +02:00
Hypolite Petovan
a55efbab7a Only call page_end hooks for standalone pages (no Ajax) 2019-04-13 10:32:15 -04:00
Hypolite Petovan
49d12b5fae Remove probing in magic link construction
- Use Contact::getProbeDataFromDatabase and Contact::magicLinkByContact instead of Contact::getIdForURL and Contact::magicLinkbyId in Contact::magicLink
- Add default value for $cid parameter in Contact::getProbeDataFromDatabase
2019-04-12 08:50:44 -04:00
Hypolite Petovan
2133decf4c
Merge pull request #6996 from BinkaDroid/patch-1
fixing error "json not defined" in frio
2019-04-12 08:32:29 -04:00
BinkaDroid
2dbeae701f
fixing error "json not defined" in frio
when trying to attach video-link to post
2019-04-11 21:37:58 +02:00
Hypolite Petovan
75387ea171
Merge pull request #6991 from fabrixxm/fix/invalid-storage-on-legacy
Allow set empty string storage class for legacy
2019-04-11 09:04:48 -04:00
Philipp
33ec318ca6
Merge pull request #6995 from MrPetovan/bug/6937-fix-checkBackend
Fix check backend
2019-04-11 12:53:06 +02:00
Hypolite Petovan
900074d117 Move App->checkBackend after module determination
- Update App->checkBackend to remove dependency to App properties
2019-04-11 05:27:26 -04:00
Hypolite Petovan
9162f714e0 Add uri to missing session data logging context in Session handlers 2019-04-11 05:26:37 -04:00
fabrixxm
d2e43619b3 Code standards 2019-04-11 10:44:28 +02:00
Hypolite Petovan
6a2c0b3cc7
Merge pull request #6989 from nupplaphil/task/basePath_baseUrl_fix
Automatic BaseURL determination fix
2019-04-11 04:07:20 -04:00
Philipp Holzer
dc48690ed5
Remove hostname blacklisting 2019-04-11 00:09:59 +02:00
fabrixxm
5a07afbc14 Use direct logic 2019-04-10 20:57:22 +02:00
Philipp Holzer
1dd1684885
Hardening save method in BaseURL 2019-04-10 20:38:39 +02:00
Philipp
a65a30b303
Merge pull request #6993 from annando/cron-interval
Added missing "cron_interval" default value
2019-04-10 11:14:42 +02:00
Michael
2711284827 Added missing "cron_interval" default value 2019-04-10 06:41:57 +00:00
fabrixxm
47aa9daf5a Tweak storage selection in admin page
Don't call `StorageManager::setBackend()` on save when legacy is selected,
dont't show legacy option in selectbox after backend is changed from legacy
2019-04-10 08:40:50 +02:00
fabrixxm
72bee45079 Revert b2794bb2c 'Allow set empty string storge class for legacy' 2019-04-10 08:35:44 +02:00
Hypolite Petovan
20bc12157e
Merge pull request #6992 from annando/fix-warning
Fix warnings
2019-04-09 15:03:05 -04:00
Michael
4e9316fc15 Fix warnings 2019-04-09 17:58:28 +00:00
fabrixxm
b2794bb2c9 Allow set empty string storge class for legacy
Legacy storage is defined by an empty string.
`StorageManager::setBackend()` now accept an empty string as a valid
backend storage.
2019-04-09 16:32:15 +02:00