Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-12-25 04:00:16 +00:00
Code Issues Projects Releases Packages Wiki Activity
25248 commits 3 branches 64 tags 237 MiB
Commit graph

4352 commits

Author SHA1 Message Date
Michael
74f12baac2 Follow up to #7582: Only update the contact when needed 2019-08-31 09:27:19 +00:00
Hypolite Petovan
0c876db30f
Merge pull request #7582 from annando/contact-dba 
Avoid and remove duplicated contact entries
 2019-08-30 03:36:40 -04:00
Michael Vogel
f293e352ec Renamed function parameter 2019-08-30 07:59:18 +02:00
Michael Vogel
3b92f7357c Renamed function 2019-08-30 07:52:21 +02:00
Michael Vogel
438394bc1d Type hints, corrected wrong documentation 2019-08-30 07:38:42 +02:00
Hypolite Petovan
ce7ec11d1d
Merge pull request #7570 from nupplaphil/bug/friendica-7298 
Some code hardenings for semaphore locking
 2019-08-29 15:02:07 -04:00
Michael Vogel
481376dd6f Avoid not performing unarchiving 2019-08-29 08:41:55 +02:00
Michael Vogel
66eab2b44f Don't handle deleted contacts / removed unneeded parameter 2019-08-29 07:22:29 +02:00
Michael Vogel
503a5be06c Fixed query (not all duplicates had been found) 2019-08-29 06:55:36 +02:00
Michael Vogel
ef02a1cb7b Check fpr duplicated contacts upon inserting them 2019-08-29 06:07:07 +02:00
Michael Vogel
141bcf149d Added post update to remove duplicated contacts 2019-08-29 06:06:41 +02:00
Michael Vogel
40a7d6eb42 Merge remote-tracking branch 'upstream/2019.09-rc' into contact-dba 2019-08-29 04:14:01 +02:00
Michael Vogel
90b9ad8bed New contact table functions with check for duplicates 2019-08-28 22:27:48 +02:00
Hypolite Petovan
e6f00455f3
Merge pull request #7578 from annando/archive 
Don't transmit content to already archived contacts
 2019-08-28 11:12:00 -04:00
Michael Vogel
96b895bc3a Changed array name, fixed bug that prevented testing most Diaspora endpoints 2019-08-28 16:54:49 +02:00
Hypolite Petovan
7340f366d7
Merge pull request #7580 from annando/issue-7563 
Issue 7563: Use icons instead of names on posts
 2019-08-28 10:16:33 -04:00
Michael
1c4b96ae26 Moved array to the top 2019-08-28 14:07:21 +00:00
Michael Vogel
3c9834922c Check if the Diaspora endpoint is archived 2019-08-28 16:02:19 +02:00
Hypolite Petovan
58949bf1a7
Merge pull request #7577 from nupplaphil/bug/friendica-7297 
Fixing PHP Fatal Error
 2019-08-28 09:42:49 -04:00
Hypolite Petovan
cc1160a243
Merge pull request #7575 from nupplaphil/bug/friendica-7299 
PHP Notice fixings
 2019-08-28 09:41:51 -04:00
Michael
8b6697b044 Updated lists of software, removed comment 2019-08-28 11:27:38 +00:00
Michael
ed4d08c7f4 Changed detection for specific software 2019-08-28 09:10:25 +00:00
Michael
9cbf320c86 Issue 7563: Use icons instead of names on posts 2019-08-28 06:38:35 +00:00
Michael Vogel
cf170c9c02 Fixed count, added to-do 2019-08-28 06:44:37 +02:00
Philipp Holzer
4b4dbd38d9
Fixing PHP Fatal Error for Database-Reconnects with PDO 2019-08-28 01:40:34 +02:00
Philipp Holzer
4733b1e5e0
Fixing PHP Fatal Error for Model\Contact (usage of non available contact) 2019-08-28 01:40:28 +02:00
Philipp Holzer
8688053a08
remove superfluous comment 2019-08-28 01:02:23 +02:00
Michael Vogel
9b7432781b Don't transmit content to already archived contacts 2019-08-27 21:01:11 +02:00
Philipp Holzer
df7ec0cdf7
php notice fixings 
addons:
- bufferapp (missing errorcode)
- twitter (wrong field name 'nickname')
core:
- bbcode (incomplete attachementdata)
- crypto (uninitialized key)
 2019-08-27 08:27:07 +02:00
Tobias Diekershoff
1c3a5e1e6f added USE statement and changed statement as requested in #7305#discussion_r296461181 2019-08-27 07:10:51 +02:00
Philipp Holzer
62f7510aa7
Fixed wrong app reference 2019-08-27 00:03:05 +02:00
Philipp Holzer
de7c026590
Some code hardenings for semaphore locking 2019-08-26 23:55:54 +02:00
Michael
7d50a086e0 Issue 7559: Merge contact duplicates 2019-08-26 15:51:56 +00:00
Philipp
b914900ff5
Merge pull request #7553 from annando/fatal 
Prevent a fatal error for an empty parameter in "unparseURL"
 2019-08-23 08:44:51 +02:00
Michael Vogel
a892156052 Output better comparable log entries for the worker 2019-08-23 07:23:32 +02:00
Michael Vogel
74d93269da Prevent a fatal error for an empty parameter in "unparseURL" 2019-08-23 07:19:08 +02:00
Hypolite Petovan
20a6b368fb Replace mb_convert_encoding with html_entity_decode for feed item title conversion 
- Prevents already UTF-8 strings to be corrupted
 2019-08-22 06:00:21 -04:00
Jeroen De Meerleer
cf95e0f856 Translating the vcard 2019-08-20 16:38:46 +02:00
Michael
5a1a5a54dc Delivery count now counts the failed delivery attempts as well 2019-08-20 07:39:13 +00:00
Hypolite Petovan
2736aac678 Add missing use statement in Search\Directory 
- Fixes https://github.com/friendica/friendica/issues/7297#issuecomment-522346804
 2019-08-18 15:21:36 -04:00
Hypolite Petovan
9de59d5c4d Add entry title HTML entities conversion in Protocol\Feed 
- Prevents literal entities display in generated post title
 2019-08-18 09:37:36 -04:00
Philipp
0f32ab10d8
Merge pull request #7524 from MrPetovan/bug/7337-check-dead-enumeratePermissions 
Prune unavailable contacts from AP envelope
 2019-08-18 15:17:11 +02:00
Hypolite Petovan
77b754862b
Merge pull request #7533 from nupplaphil/bug/friendica-7299 
Fixing wrong defaults() usage
 2019-08-18 09:16:25 -04:00
Philipp Holzer
bff427174b
Fix parameters for Source 2019-08-18 15:14:03 +02:00
Philipp Holzer
b5cb3bc783
Fixing https://github.com/friendica/friendica/issues/7299#issuecomment-521745931 2019-08-18 15:12:10 +02:00
Philipp Holzer
b63b1570d6
removed superfluous comment 2019-08-18 15:04:36 +02:00
Philipp Holzer
9d3ad8f435
Fix https://github.com/friendica/friendica/issues/7298#issuecomment-522215746 2019-08-18 14:55:24 +02:00
Hypolite Petovan
1a2628f210
Merge pull request #7528 from nupplaphil/bug/fix_locks 
Fix Locks
 2019-08-17 14:41:32 -04:00
Philipp Holzer
d39a6ba444
Auto-remove duplicated, allowed themes during reload 2019-08-17 20:00:11 +02:00
Philipp Holzer
7e82f8dc2e
fix Admin Theme reload 2019-08-17 19:55:14 +02:00
Philipp Holzer
46655eac70
Remove unnecessary parameter 2019-08-17 19:41:59 +02:00
Philipp Holzer
c803dcb6c5
Fix Locks 
- Wrong return of lock releasing with DBA provider
- It's not possible to maintain Semaphore locks, since they aren't accessible by other processes
Should solve https://github.com/friendica/friendica/issues/7298#issuecomment-521996540
 2019-08-17 19:33:36 +02:00
Philipp Holzer
566889fbc0
fix alignment 2019-08-17 11:08:57 +02:00
Philipp Holzer
2c73377b39
Create Core\Process as a base for followup work 2019-08-17 09:09:13 +02:00
Philipp Holzer
90b438e082
Move mode settings to App\Mode 
- Move isAjax() to App\Mode
- Move isTablet() to App\Mode
- Move isMobile() to App\Mode
- Refactor last usage of App->isBackend()
 2019-08-17 09:09:13 +02:00
Hypolite Petovan
cf8177461e Prune unavailable contacts from AP envelope 2019-08-17 00:00:49 -04:00
Hypolite Petovan
828368267c Add check_dead parameter to Item::enumeratePermissions 2019-08-16 23:59:48 -04:00
Michael Vogel
aba23abfaa
Merge pull request #7520 from MrPetovan/bug/7468-contact-search-fan 
Suppress relationship string in template vars for public contact
 2019-08-17 04:42:59 +02:00
Hypolite Petovan
7a73445503
Merge pull request #7519 from nupplaphil/task/add_page 
Add Page class (Frontend code)
 2019-08-16 07:30:06 -04:00
Hypolite Petovan
e463df6418 Add existence check for contact.uid and contact.rel fields in Contact::getContactTemplateVars 2019-08-16 07:29:34 -04:00
Philipp Holzer
eaed327c07
fix indentation 2019-08-16 09:10:05 +02:00
Hypolite Petovan
98b0f97639 Suppress relationship string in template vars for public contact 2019-08-15 21:24:33 -04:00
Michael Vogel
6f944f1e53
Merge pull request #7514 from MrPetovan/bug/7507-allow-protocolless 
Allow protocol-less links
 2019-08-15 22:07:09 +02:00
Philipp Holzer
30b69f1fc4
some fixings 2019-08-15 20:58:57 +02:00
Philipp Holzer
9f68e6b589
Add Page class for Frontend 
- Move frontend logic (stylesheet, footerscript, content) to Page class
 2019-08-15 20:52:42 +02:00
Hypolite Petovan
feb720a3ee
Merge pull request #7518 from nupplaphil/bug/lock_unlink 
Fix Lock-Unlink
 2019-08-15 12:11:01 -04:00
Philipp Holzer
2369ea1d50
Fix Lock-Unlink 
- Check if .sem file exists before unlinking it
- Fixing https://github.com/friendica/friendica/issues/7298#issuecomment-521670482
 2019-08-15 17:55:17 +02:00
Philipp Holzer
822ba67105
Fixing https://github.com/friendica/friendica/pull/7508#issuecomment-521679624 2019-08-15 17:47:08 +02:00
Philipp Holzer
290dd2ab39
moved rest of BaseURL 2019-08-15 17:36:07 +02:00
Philipp Holzer
ccbb0241bf
Removed unnecessary auto-initializing 2019-08-15 17:27:05 +02:00
Philipp Holzer
956439a9f2
reverted wrong indentation 2019-08-15 17:25:03 +02:00
Philipp Holzer
734b63adba
Fixed wrong "BaseUrl" class (=> "BaseURL") 2019-08-15 17:23:35 +02:00
Philipp Holzer
08be92a862
Moved BaseURL to App namespace (because similar type as Arguments/Modules/Modes) 2019-08-15 17:23:00 +02:00
Philipp Holzer
fa1b783052
removed static Logger usage 2019-08-15 17:10:14 +02:00
Philipp Holzer
4f0ee4df27
Move $page initialization into constructor 2019-08-15 17:04:36 +02:00
Philipp Holzer
55f9dba230
Prepare App for further usage 2019-08-15 17:00:07 +02:00
Hypolite Petovan
48caf55cff
Merge pull request #7515 from nupplaphil/task/console_lock 
New Console Command: Lock
 2019-08-15 10:31:34 -04:00
Philipp Holzer
9abfd55d37
modified hint 2019-08-15 16:25:34 +02:00
Philipp Holzer
689a2145f6
Add @see for SO link 2019-08-15 16:24:11 +02:00
Philipp Holzer
f3269bf826
Add hint for getClass 2019-08-15 16:19:23 +02:00
Philipp Holzer
cba9fa2467
Move isBackend logic to App\Mode 2019-08-15 15:51:15 +02:00
Philipp Holzer
d95457cf61
Add Lock test 2019-08-15 14:26:05 +02:00
Philipp Holzer
e2e109b8c1
Fix getAllKeys() method for memcache instances 2019-08-15 14:26:05 +02:00
Philipp Holzer
41e2031e6b
Console Lock 
WIP
 2019-08-15 14:26:04 +02:00
Hypolite Petovan
0f9520f520 Increase specificity of default allowed protocols 2019-08-14 21:42:00 -04:00
Hypolite Petovan
f88435fa4c Add support for protocol-less URLs in BBCode::convert 2019-08-14 21:40:51 -04:00
Hypolite Petovan
425876316f
Merge pull request #7508 from nupplaphil/task/arguments_module_class_2 
Add Arguments & Module class (again)
 2019-08-14 07:52:55 -04:00
Philipp Holzer
6546bf5ad6
fix isBackend() 2019-08-13 19:05:32 +02:00
Philipp
23da053cf8
Merge pull request #7512 from annando/cid-forum 
Use the contact id whenever we are following the contact
 2019-08-13 18:50:10 +02:00
Michael
aab6b739d8 Use the contact id whenever we are following the contact 2019-08-13 15:54:47 +00:00
Philipp Holzer
b1ae58cdc5
fix tests & remove superfluous parameter 2019-08-13 16:29:16 +02:00
Philipp Holzer
4089e17f85
re-add App::isBackend() 2019-08-13 16:29:12 +02:00
Philipp Holzer
0af9747c6c
Add Arguments & Modules class 2019-08-13 16:29:11 +02:00
Hypolite Petovan
f068d00645
Merge pull request #7510 from nupplaphil/bug/Fix_Redis_test 
Fix Redis test
 2019-08-13 06:41:07 -04:00
Hypolite Petovan
8b00f48c47
Merge pull request #7509 from annando/admin-queue 
Improved calculation of deferred tasks
 2019-08-13 06:40:21 -04:00
Philipp Holzer
b28e11fee8
- Remove deprecated Redis::delete() function 2019-08-13 08:54:26 +02:00
Philipp Holzer
31cfac1cfa
Fix Redis test 
- Check if $redis_port is null
 2019-08-13 08:32:08 +02:00
Michael Vogel
afac4b7698 Improved calculation of deferred tasks 2019-08-13 06:43:08 +02:00
Hypolite Petovan
2f752b18e1
Merge pull request #7505 from annando/admin-queue 
Queue numbers corrected, only display 999 queue items
 2019-08-12 19:30:57 -04:00
Michael Vogel
3b0767764b Queue numbers corrected, only display 999 queue items 2019-08-12 07:30:33 +02:00
Hypolite Petovan
fcb1a78352
Revert "Introduce Arguments / Module class" 2019-08-11 18:01:11 -04:00
Philipp
e9fc2af1c3
Merge pull request #7499 from annando/new_defer 
Worker: The retrial value can now skip retrial levels
 2019-08-11 23:27:54 +02:00
Philipp
541cdcd515
Merge pull request #7503 from MrPetovan/bug/fix-private-permissions 
Use contact.network field instead of contact.protocol in Group::expand
 2019-08-11 23:26:34 +02:00
Michael Vogel
e07a17daf6 Added config value 2019-08-11 23:07:06 +02:00
Hypolite Petovan
feb2d94972
Merge pull request #7500 from nupplaphil/task/arguments_module_class 
Introduce Arguments / Module class
 2019-08-11 16:45:31 -04:00
Hypolite Petovan
5feeffbe79 Use network field instead of protocol in Group::expand 
- contact.protocol field isn't systematically populated
 2019-08-11 16:41:00 -04:00
Philipp Holzer
11752d7059
move backend constant 2019-08-11 14:33:25 +02:00
Philipp Holzer
2c5ba7fc15
Introduce Arguments / Module class 
- move from App
- add tests for Arguments/Module class
 2019-08-11 14:24:05 +02:00
Michael Vogel
5c72aeb8d7 Worker: The retrial value can now skip retrial levels 2019-08-11 10:28:52 +02:00
Michael Vogel
35a487ae30 Don't fork worker on frontend by default 2019-08-08 22:42:12 +02:00
Tobias Diekershoff
48b1e172b9
Merge pull request #7487 from MrPetovan/task/7473-trending-tags 
Fix trending tags variable name mistakes in Model\Term
 2019-08-07 06:44:37 +02:00
Hypolite Petovan
66d4e5ce5f Remove wrap length in Babel HTML::toPlaintext display 2019-08-06 21:23:09 -04:00
Hypolite Petovan
246894f233 Ensure trimmed HTML nodes are text nodes in HTML::toBBCode 2019-08-06 21:22:19 -04:00
Hypolite Petovan
19adb9a1a0 Fix trending tags variable name mistakes in Model\Term 2019-08-06 20:52:54 -04:00
Tobias Diekershoff
dc85451b78
Merge pull request #7483 from MrPetovan/task/7474-html-to-bbcode 
Fix bug removing spaces between hashtag links in HTML::toPlaintext
 2019-08-06 16:50:00 +02:00
Hypolite Petovan
79374dbf7a Fix DOMNodeList length compatibility with PHP <7.2 in Content\Text\HTML 2019-08-06 09:00:32 -04:00
Hypolite Petovan
5dbf319e06 Fix bug removing spaces between hashtag links in HTML::toPlaintext 2019-08-06 08:20:48 -04:00
Hypolite Petovan
3e2f0e9ffa Feedback changes 
- Import namespaces in mod/community
- Fix alignment in Content\Feature
- Add phpDoc to Widget\TrendingTags
 2019-08-06 07:37:48 -04:00
Hypolite Petovan
9e8ae520b8 Move trending tags queries to Model\Term 2019-08-06 07:36:51 -04:00
Hypolite Petovan
4c45cb864a Update master translation strings file 
- Fix gettext warning for empty string in Module\Item\Compose
 2019-08-06 07:09:05 -04:00
Hypolite Petovan
c399e40618 Add trending_tags additional feature + usage in mod/community 2019-08-06 07:09:04 -04:00
Hypolite Petovan
a947bd0889 Add Trending Tags widget + template 2019-08-06 07:09:04 -04:00
Hypolite Petovan
6b7dfd0c71
Merge pull request #7465 from nupplaphil/task/dice_cache_lock 
Refactor Cache/Lock to DICE
 2019-08-06 07:05:07 -04:00
Tobias Diekershoff
951444e715
Merge pull request #7482 from annando/image-description 
Support for multiple picture posts in API and connectors
 2019-08-06 08:21:54 +02:00
Michael
27006f577c Support for multiple picture posts 2019-08-06 05:35:21 +00:00
Hypolite Petovan
2ab43f94d8 Revert using LIBXML_NOBLANKS 
- This removed all self-closing tags (img, br, etc...) from HTML sources
 2019-08-05 20:57:03 -04:00
Michael
cbee91a61b Avoid a notice 2019-08-05 16:48:58 +00:00
Michael
bdc07b4213 Added support for image descriptions and multiple image posts to external services 2019-08-05 16:27:45 +00:00
Michael Vogel
a507963c7f
Merge pull request #7474 from MrPetovan/bug/7457-html-bbcode-plaintext 
Fix HTML/BBCode::toPlaintext
 2019-08-04 22:08:53 +02:00
Philipp Holzer
a66580444f
Fixing sort of BaseURL usage for App & Cache usage 2019-08-04 20:01:15 +02:00
Hypolite Petovan
4a85de4c19 Add HTML output panel to babel module 2019-08-04 10:22:49 -04:00
Hypolite Petovan
c3e3e83a52 Improve BBCode:toPlaintext 
- Fix issue where matching literal square brackets were removed with their content
- Fix issue where content without line feeds between BBCode tags would end up compacted in plain text
- Update extr calls to BBCode::toPlaintext in api
 2019-08-04 10:22:23 -04:00
Philipp Holzer
3834d5e129
Renamed __toString() to getName() 2019-08-04 16:14:19 +02:00
Hypolite Petovan
a0f77e1800 Improve HTML::toPlaintext 
- Ignore empty trimmed text nodes
- Ignore anchor links
- Ignore blank tags and avoids adding a doctype to transitional DOM objects
 2019-08-04 10:11:59 -04:00
Philipp Holzer
d2211bd6dd
Removed some leftovers 2019-08-04 15:58:53 +02:00
Philipp Holzer
7cdcad9f6c
Remove unused class variable 2019-08-04 15:54:37 +02:00
Philipp Holzer
19777baa79
- Move constants to the "Cache" class (more transparent than inside the interface) 2019-08-04 15:53:28 +02:00
Philipp Holzer
34e4968c06
Adding possibility to use a different cache-backend for locking and caching 
- Renaming *LockDriver to *Lock since it isn't a "driver" anymore
 2019-08-04 15:42:39 +02:00
Michael
d2b551a616 Merge remote-tracking branch 'upstream/develop' into alt-description 2019-08-04 12:07:21 +00:00
Philipp Holzer
86bf2ee45a
Rename *CacheDriver to *Cache because they don't act as driver anymore 2019-08-04 10:26:53 +02:00
Michael
1b7f96dac8 Partly reverted, real problem fixed 2019-08-04 04:29:52 +00:00
Michael
cb77b1af8c API: We now transmit the text description there as well 2019-08-04 03:45:23 +00:00
Philipp Holzer
d56bd28a07
Refactor Cache/Lock to DICE 
- Refactor Cache classes
- Refactor Lock classes
- Improved test speed (removed some seperate class annotations)
 2019-08-03 20:51:58 +02:00
Michael
6e8057a1c3 Respecting the "alt" description of images during import from HTML 2019-08-03 11:48:47 +00:00
Michael
764c70720c Moved several database stuff out of the transaction to avoid error 1205 2019-08-03 10:36:21 +00:00
Hypolite Petovan
e5321ecc7f
Merge pull request #7458 from annando/fix-7449 
Fix issue 7449: Image permissions are now set like before
 2019-08-02 13:26:57 -04:00
Michael
bcadf19289 "contact-id" has to be set, after "author-id" had been set 2019-08-02 17:17:51 +00:00
Michael
7c10807d1d Clarified description 2019-08-02 16:59:26 +00:00
Michael
9819d31591 Merge remote-tracking branch 'upstream/develop' into contact-id-new 2019-08-02 16:52:34 +00:00
Michael
418009ffea Improved PR 7452: We now respect the "self" contact 2019-08-02 16:46:26 +00:00
Michael
01ef630322 Fixed description 2019-08-02 16:42:24 +00:00
Michael
d95ef96cca Fix issue 7449: Image permissions are now set like before 2019-08-02 16:38:50 +00:00
Hypolite Petovan
2e6b72ba62
Revert "Reworked contact-id generation" 2019-08-01 20:39:42 -04:00
Michael Vogel
e8459cce34
Merge pull request #7381 from MrPetovan/task/7309-frio-compose 
[frio] New Compose page
 2019-08-01 08:15:02 +02:00
Hypolite Petovan
e9f0c4dbfb
Merge pull request #7444 from nupplaphil/task/dice_console 
Use DICE for Console
 2019-07-31 14:07:45 -04:00
Philipp Holzer
5935e69d33
Adding Configuration dependency 2019-07-31 19:43:00 +02:00
Philipp Holzer
a60eb9e33d
Use DICE for Console 
- Use Friendica\Core\Console as Controller for DI-library
- Refactor every console command to use DICE (when possible)
- Adjusting tests
 2019-07-31 19:37:42 +02:00
Michael
88aa777410 Moved user block 2019-07-31 16:09:03 +00:00
Michael
c936232575 Added header 2019-07-31 16:07:50 +00:00
Michael
cdc44e26de Log level changed 2019-07-31 16:05:28 +00:00
Michael
b377906b77 Merge remote-tracking branch 'upstream/develop' into tag-deliver-delete 2019-07-31 14:11:06 +00:00
Michael
0696026380 Improved logging when item had been deliberately deleted after creation 2019-07-31 14:09:27 +00:00
Hypolite Petovan
b8a336cc0d
Merge pull request #7452 from annando/contact-id 
Reworked contact-id generation
 2019-07-31 08:12:00 -04:00
Michael
b4c673a620 We now use a central function for fetching the postdata 2019-07-30 22:26:01 +00:00
Michael
8ddcd8417d Reworked contact-id generation 2019-07-30 22:02:32 +00:00
Michael
7d79d48f6e Fix: The field "contact-id" now contains the correct contact id again 2019-07-30 13:08:14 +00:00
Hypolite Petovan
0b6f231ad3 Replace removed Contact::select method with Contact::selectToArray in Compose module 2019-07-29 20:31:50 -04:00
Hypolite Petovan
f010beaa95 Fix formatting in Model\Group 
- Improve logging call
- Replace removed App->getDatabase call
 2019-07-29 20:31:50 -04:00
Hypolite Petovan
cb38fe4e72 Develop one-liner in Item\Compose 2019-07-29 20:31:49 -04:00
Hypolite Petovan
361958ad04 Replace removed Contact::select by Contact::selectToArray 
- Add explicit DBA::close in Model\Group
 2019-07-29 20:31:49 -04:00
Hypolite Petovan
c149ba2d59 Replace $uid parameter by $obj['uid'] in Item::enumeratePermissions 2019-07-29 20:31:49 -04:00
Hypolite Petovan
9d20705700 Improve compose page template 
- Update title and description of the limited/private panel
- Move CC email addresses outside of the visibility panels
 2019-07-29 20:31:49 -04:00
Hypolite Petovan
3e6018b3f2 Add meta protocol group for private post support 2019-07-29 20:31:48 -04:00
Hypolite Petovan
4e427f615b Only include natively supported protocol contacts in meta-groups 2019-07-29 20:31:48 -04:00
Hypolite Petovan
4f4b538bcf [frio] Add jotnet fields to compose page 
- Move hardcoded descriptions to translation strings
 2019-07-29 20:31:47 -04:00
Hypolite Petovan
c24ca57f21 Add frio-specific /compose module 2019-07-29 20:31:46 -04:00
Hypolite Petovan
0579252362 Add user meta-groups for followers and mutual contacts 
- Both Group::expand and Item::enumeratePermissions now have a user id parameter to expand meta-groups
 2019-07-29 20:31:46 -04:00
Philipp
70ba9e5e0c
Merge pull request #7174 from MrPetovan/task/dba-quote-identifiers 
DBA: Correctly escape identifier names
 2019-07-29 14:37:09 +02:00
Hypolite Petovan
b876a339ff
Merge pull request #7447 from annando/ap-alt-outgoing 
ActivityPub: We now support transmitting alternative image descriptions
 2019-07-29 01:20:05 -04:00
Michael
bcc8ed378c ActivityPub: We now do support transmitting alternative image descriptions 2019-07-29 05:09:11 +00:00
Hypolite Petovan
1ccc1efdcf
Merge pull request #7446 from annando/alt-text 
ActivityPub: Support for incoming picture descriptions
 2019-07-29 00:57:14 -04:00
Michael
ab7db9944d ActivityPub: Support for incoming picture descriptions 2019-07-29 04:35:13 +00:00
Hypolite Petovan
0e0fff3324 Correctly escape identifier names 
- Add support for schema, multiple tables in $table parameters
- Remove Database->formatTableName method
 2019-07-29 00:23:40 -04:00
Michael
e556dfd475 Don't deliver nested comments to Diaspora if the previous comment wasn't from Diaspora 2019-07-28 19:13:17 +00:00
Hypolite Petovan
50f3098495 Revert adding DBA::toArray to Item::selectToArray 2019-07-28 00:12:49 -04:00
Hypolite Petovan
3334a3d497 Fix indent in Model\Item 2019-07-28 00:06:05 -04:00
Hypolite Petovan
a61ce4fed0 Ensure *toArray returns an array 2019-07-28 00:03:42 -04:00
Philipp Holzer
2f5928f43a
Refactoring Profile:: selectors 2019-07-28 00:19:38 +02:00
Philipp Holzer
51d2db3998
merge DBA::selectToArray 2019-07-27 23:57:38 +02:00
Philipp Holzer
7613704d2f
improve Profile model 2019-07-27 23:56:54 +02:00
Philipp Holzer
37d03bbeae
Introduce test optimization 
- Add static connection for whole tests
- Introduce ExtendedPDO class to enable nested transactions
- Add rollback logic for tests to ensure reliability and increase speed
 2019-07-27 23:54:13 +02:00
Philipp Holzer
07aaf292ec
Fix tests 2019-07-27 23:54:13 +02:00
Philipp Holzer
2a87464c97
Replace q() call with Profile::get() method 2019-07-27 23:54:12 +02:00
Philipp Holzer
6c2cf494b5
Remove DependencyFactory 
- Include all necessary classes in `dependencies.config.php`
- Add DI-reference to BaseObject (acts as a global registry)
- Refactor all static "init()" methods to use the global registry

- Refactor Logging for Worker-Logger a little bit
 2019-07-27 23:54:12 +02:00
Hypolite Petovan
8b344141da
Merge pull request #7434 from annando/contact-protocol 
New functions to check if a contact supports that protocol
 2019-07-27 17:47:54 -04:00
Michael
f5cb6148cf Improved documentation 2019-07-27 21:45:36 +00:00
Philipp
b5a9a1f1d3
Merge pull request #7435 from annando/select-to-array 
Added "selectToArray" functions in DBA and Item
 2019-07-27 19:45:32 +02:00
Michael
5d9472dccf Type hints 2019-07-27 17:00:06 +00:00
Michael
f48452dd29 Some more 2019-07-27 16:57:00 +00:00
Michael
580f9cf6c7 Replaced some " with ' 2019-07-27 16:53:48 +00:00
Michael
555c444b4e Moved function to Database.php 2019-07-27 16:08:48 +00:00
Michael
1a3bf05dfb Changed "Contact::select" to "Contact::selectToArray" 2019-07-27 15:57:23 +00:00
Michael
89454fabdb Changed "Photo::select(" to "Photo::selectToArray(" 2019-07-27 15:52:02 +00:00
Michael
ac6bfd3e4c Changed Attach::select to Attach::selectToArray 2019-07-27 15:47:17 +00:00
Michael
975ff86bae Fix: The $contact error is expected to be a single row array 2019-07-27 15:40:43 +00:00
Michael
2be0ceac6b Added "selectToArray" functions in DBA and Item 2019-07-27 14:33:17 +00:00
Michael
264936100f New functions to check if a contact supports that protocol 2019-07-27 11:09:12 +00:00
Hypolite Petovan
eaf217ef7d Update server block admin page to reflect the addition of shell wildcard syntax 2019-07-25 22:37:30 -04:00
Hypolite Petovan
1dbdb9dd15 Update server block console help text to reflect the addition of shell wildcard syntax 2019-07-25 22:37:14 -04:00
Hypolite Petovan
46f7b79c7d Switch server blocklist check to case-insensitive shell wildcard 2019-07-25 22:36:25 -04:00
Philipp
56e0a92d83
Merge pull request #7425 from MrPetovan/task/2fa-ping-disallowed 
2FA: Remove mod/ping from exception list
 2019-07-25 08:49:20 +02:00
Hypolite Petovan
d75e3e1650
Merge pull request #7430 from annando/contact-not-archived 
"all contacts" shouldn't show archived contacts
 2019-07-24 16:00:41 -04:00
Michael
e256876ec1 Support for empty nick names 2019-07-24 19:30:36 +00:00
Michael
aac086bf91 "all" contacts shouldn't show archived contacts 2019-07-24 19:29:45 +00:00
Hypolite Petovan
4ec4a04e49 Remove mod/ping from 2fa exception list 
- Prevent asynchronous calls to redirect to /2fa in case of missing valid 2fa session
 2019-07-23 20:03:08 -04:00
Hypolite Petovan
4821fe1b98 Use template-displayed errors in TwoFactor\Verify 
- Remove the page dependency on jGrowl notices
 2019-07-23 20:02:26 -04:00
Hypolite Petovan
56afc43b21 Extend the use of exceptions in App::runFrontend 
- Replace an explicit header locatiobn + exit with System::externalRedirect
 2019-07-23 20:01:45 -04:00
Hypolite Petovan
3812d3d445 Enable two-factor app-specific passwords for ejabberd 2019-07-23 05:11:33 -04:00
Hypolite Petovan
64b10205bc
Merge pull request #7420 from annando/reshare-contact 
Fix contact issues with fake reshares from Twitter
 2019-07-23 05:05:44 -04:00
Michael
2a213c215e Fix contact issues with fake reshares from Twitter 2019-07-23 04:26:20 +00:00
Hypolite Petovan
8677428edb Remove debug 2019-07-22 17:41:21 -04:00
Hypolite Petovan
cd257dc7e8 Enable app-specific password authentication for API login 2019-07-22 07:56:36 -04:00
Hypolite Petovan
1a164b0dc5 Add two-factor app-specific password settings page 
- Add two-factor app-specific model
- Add link to new page from 2fa settings index page
 2019-07-22 07:56:00 -04:00
Hypolite Petovan
a149d6ec44 Move recovery code model to sub-folder 2019-07-22 07:41:01 -04:00
Hypolite Petovan
1d8b809227
Merge pull request #7414 from annando/fetch-diaspora 
Fetch Diaspora posts by url
 2019-07-22 07:01:42 -04:00
Michael
105378f5a4 Changed regexp 2019-07-22 06:03:18 +00:00
Hypolite Petovan
55e2006312
Merge pull request #7412 from nupplaphil/task/dice 
Introduce DICE
 2019-07-21 11:04:41 -04:00
Philipp Holzer
05102911db
Fix App\Mode determination 2019-07-21 14:40:50 +02:00
Philipp Holzer
7aa9917ca8
Fix DB_UPDATE_VERSION constant 2019-07-21 14:34:42 +02:00
Philipp Holzer
a8e6a57e9b
Fixing installer 2019-07-21 14:21:02 +02:00
Michael
53ffe5a2e1 Fetch Diaspora posts by url 2019-07-21 07:37:50 +00:00
Michael
a11206dbcd Issue 6675: Improved check for follower, removed global setting 2019-07-21 05:56:57 +00:00
Philipp
c6131c057b
Merge pull request #7411 from annando/ap-quote 
Preparation for quoted reshares on AP
 2019-07-21 01:49:22 +02:00
Philipp Holzer
55999730e0
Introduce DICE 
- Adding dice library
- Adding dependency config

- Removing Factories
- Refactoring App\Mode constructor
- Refactoring App\Router constructor
- Refactoring BasePath for DI usage
- Refactoring ConfigFileLoader constructor
- Refactoring Profiler constructor

- Adjust entrypoints (index, console, worker, ..)

- Adding functional test for DI
- Fix tests because of refactorings
 2019-07-21 01:22:10 +02:00
Michael
23830dc45f Preparation for quoted reshares on AP 2019-07-20 21:32:19 +00:00
Hypolite Petovan
6df53624c7 Remove confusing extraneous success_update >= failure_update conditions 2019-07-20 13:34:08 -04:00
Hypolite Petovan
f5e07be04e Fix undefined property notice in L10n\L10n 2019-07-18 21:21:16 -04:00
Hypolite Petovan
3f85a921da Force invite remaining variable to be integer in Content\Widget 
- Addresses https://github.com/friendica/friendica/issues/7297#issuecomment-512786156
 2019-07-18 08:42:07 -04:00
Michael
931c190566 Removed test output 2019-07-18 06:20:54 +00:00
Michael
1553581175 Merge remote-tracking branch 'upstream/develop' into fetch-item 2019-07-18 06:16:40 +00:00
Michael
c771c575a7 Fix PR 7399: Added missing "use" 2019-07-18 06:12:43 +00:00
Michael
41a1c1c3e6 Fetch items by given uri 2019-07-18 06:11:02 +00:00
Michael Vogel
dcebf53ecf
Merge pull request #7402 from MrPetovan/bug/7401-node-settings-style 
Ensures node theme settings are used to render theme embed
 2019-07-18 06:32:40 +02:00
Hypolite Petovan
477a84a8c4 Ensures node theme settings are used to render theme embed 2019-07-17 23:25:22 -04:00
Hypolite Petovan
9b927fa333
Merge pull request #7399 from annando/only-sharer 
Added the option to only receive top level posts from people you follow
 2019-07-17 20:53:28 -04:00
Michael
e247a14d2b Added the option to only receive top level posts from people you follow 2019-07-17 21:37:13 +00:00
Hypolite Petovan
4fc3eb8f06
Merge pull request #7398 from annando/fetch-posts 
Preparation for being able to fetch AP posts by proving the URL
 2019-07-17 16:01:19 -04:00
Michael
a80a6bec74 Preparation for being able to fetch AP posts by proving the URL 2019-07-17 19:36:32 +00:00
Hypolite Petovan
11e4f906c2
Hot-fix: Core\L10n::t method passing parameter bug 
Follow-up to #7379
 2019-07-16 21:18:25 -04:00
Hypolite Petovan
0b97b32a59
Merge pull request #7379 from nupplaphil/task/refactor_l10n_for_test 
Refactor L10n for testing
 2019-07-16 16:03:42 -04:00
Hypolite Petovan
3b1f777d0c
Merge pull request #7391 from annando/warning 
Avoid a warning in Notifier worker
 2019-07-16 16:03:17 -04:00
Michael
379a1a52e0 Avoid a warning 2019-07-16 19:58:47 +00:00
Philipp Holzer
346290cc23
Reverted indention 2019-07-16 21:54:22 +02:00
Philipp Holzer
46a260aa01
Fix indentations 2019-07-16 20:19:56 +02:00
Philipp Holzer
92fb0a82ca
Dynamic config loading 
- Move settings, defaults and dbstructure to directory 'static'
- Dynamic loading of config files (after the static loading)
- Filter out '-sample.config.php' and '-sample.ini.php' files
- Remove unnecessary ConfigFileManager
- Move ConfigFileLoader to Utils
- Add tests for multi-loading for INI, config and sample-filtering
 2019-07-16 20:16:43 +02:00
Philipp Holzer
79e69ee528
Fix language (again ;-) ) 2019-07-16 16:50:49 +02:00
Philipp Holzer
eb024a3718
Refactor L10n for testing 
- Moving L10n to L10n\L10n
- Adding constructor information
- Adding to factory
- simplify/speedup tests
 2019-07-16 16:44:47 +02:00
Philipp
966043712f
Merge pull request #7389 from MrPetovan/bug/7387-local_user-int 
Ensure NULL isn't passed to Feature::isEnabled
 2019-07-16 16:37:38 +02:00
Hypolite Petovan
c6cd2b131d Add transitive type hints in Core\PConfig 2019-07-16 07:45:24 -04:00
Michael
8c2f50eb72 Issue 7315: Set the forum's contact id for forum posts 2019-07-16 05:07:26 +00:00
Michael Vogel
bb83f23e26
Merge pull request #7386 from MrPetovan/bug/7293-hide-registration-link 
Hide registration button on login page when registration are closed
 2019-07-16 05:38:12 +02:00
Hypolite Petovan
68f5b639eb Restore $uid parameter integer type-hint in Config 
- Add integer type-hint to Feature::isEnabled
 2019-07-15 22:00:49 -04:00
Hypolite Petovan
19247b62ae Ensure $uid parameter of Feature::isEnabled to be an integer 2019-07-15 22:00:49 -04:00
Hypolite Petovan
e9511b4f34
Merge pull request #7388 from annando/issue-7315 
Issue 7315: Changed handling of "Group" posts
 2019-07-15 16:32:42 -04:00
Hypolite Petovan
d1c048cd4b
Fix typo in Model\Config\PConfig 2019-07-15 16:32:13 -04:00
Michael
1a213bd8e8 Issue 7315: Changed handling of "Group" posts 2019-07-15 20:05:36 +00:00
Philipp Holzer
f70271aa5d
Allow nullable UID in PConfigCache 2019-07-15 21:14:13 +02:00
Philipp Holzer
d5de5b6789
Bugfixing bad UIDs for PConfig 2019-07-15 21:11:38 +02:00
Philipp Holzer
ebf00e32a1
minor phpdoc fixings 2019-07-15 20:54:33 +02:00
Philipp Holzer
74f7c16585
Fixup phpdoc 2019-07-15 20:19:52 +02:00
Philipp Holzer
9d98a4ce3a
Refactor PConfiguration 2019-07-15 20:13:53 +02:00
Hypolite Petovan
e16c410b59 Hide registration button on login page when registration are closed 2019-07-15 09:11:21 -04:00
Hypolite Petovan
ff99a62584
Merge pull request #7384 from nupplaphil/bug/fixing_config_load 
Fixing initial load config (Simplify Config Part 3a)
 2019-07-15 08:06:29 -04:00
Philipp
e9c6746c3b
Merge pull request #7382 from annando/issue-7367 
Issue 7367: Enhanced check when DFRN delivery can be skipped
 2019-07-15 09:59:16 +02:00
Philipp Holzer
6801e8b5ab
Fixing initial load config 2019-07-15 08:58:37 +02:00
Michael
143566b853 Missing word 2019-07-15 04:36:55 +00:00
Michael
6170ddf58d Issue 7367: Only skip DFRN delivery when both author and owner of the post support AP 2019-07-15 04:33:00 +00:00
Hypolite Petovan
6c68b8359d
Merge pull request #7372 from nupplaphil/task/simplify_config 
Refactor Configuration (Simplify Config Part 3)
 2019-07-14 19:05:09 -04:00
Philipp Holzer
4af08d82b2
Added string type-hint for get() and a test case for it 2019-07-14 23:23:20 +02:00
Hypolite Petovan
7ce48d1b77
Merge pull request #7376 from annando/contact-update 
Contact update overhaul - again
 2019-07-14 17:07:04 -04:00
Philipp Holzer
aa249adf6d
some more minor fixups (phpdoc, unused using) 2019-07-14 22:49:17 +02:00
Philipp Holzer
a654470061
fix phpdoc 2019-07-14 22:41:09 +02:00
Philipp Holzer
b48c22dc1a
minor fixing: phpdoc & type-hint 2019-07-14 22:31:53 +02:00
Philipp Holzer
a2c6240da0
some minor fixings 2019-07-14 22:26:36 +02:00
Philipp Holzer
4913502922
bugfix: add lost changes due merge 2019-07-14 22:12:45 +02:00
Philipp Holzer
c293eadb78
Improve & fixing Tests 2019-07-14 22:12:11 +02:00
Philipp Holzer
486f139342
Move Preload/JIT Configuration logic from Adapter to Core-Configuration 2019-07-14 22:09:07 +02:00
Michael
83729b8c00 "defaults" is replaced 2019-07-14 16:04:52 +00:00
Michael
9ba3ee13a8 Use an insert to avoid duplicates and for analyzing 2019-07-14 10:22:19 +00:00
Michael
5bba0e7d39 Hopefully avoiding duplicated relay entries 2019-07-13 23:53:15 +00:00
Michael
2df17fc0c0 Fix SQL problem with "not null" 2019-07-13 07:39:53 +00:00
Michael
002963f198 Fix wrong variable 2019-07-13 07:29:56 +00:00
Michael
9b8396620b Fix duplicated contacts due to relay probing 2019-07-13 07:25:01 +00:00
Philipp Holzer
8c0f047bc7
Add namespace 2019-07-12 23:08:01 +02:00
Michael
7dfadf7e7e Simplify the contact update in "getIdForURL" 2019-07-12 21:07:47 +00:00
Philipp Holzer
a30200083a
BugFix: forgot configCache in ConfigFactory 2019-07-12 23:05:48 +02:00
Philipp Holzer
c82127ffb7
Splitting ConfigCache & PConfigCache 
- Remove IConfigCache & IPConfigCache
- Add new PConfigCache
- Add missing Logger::init() (bugfixing tests)
 2019-07-12 22:53:37 +02:00
Michael
c34204cf50 Merge remote-tracking branch 'upstream/develop' into contact-update 2019-07-12 20:51:27 +00:00
Hypolite Petovan
b56709d802
Merge pull request #7358 from nupplaphil/bug/installer_db 
Bugfixing DB/Installer (Simplify Config Part 1)
 2019-07-12 16:48:17 -04:00
Michael
8cbdc7939e Fetch more comtact data from probing, remove duplicated contacts 2019-07-12 14:55:23 +00:00
Michael Vogel
807d2665ea Use standard function to update the contact to avoid SQL errors 2019-07-11 22:11:51 +02:00
Michael Vogel
6b25fd5b2f added logging 2019-07-10 05:19:54 +02:00
Michael Vogel
54d96da94a Fix fatal error with incomplete contact data upon delivery 2019-07-10 05:16:50 +02:00
Philipp Holzer
e1d135238a
Revert default password setting & using "HiddenString" even for empty strings 2019-07-09 22:38:54 +02:00
Philipp Holzer
ab7c6499ff
Bugfixing DB/Installer 
- default value with HiddenString
- Fixing checkDB during installation
 2019-07-09 22:22:06 +02:00
Jeroen De Meerleer
01dc0c031c There are no dead nodes anymore 2019-07-09 09:23:36 +02:00
Hypolite Petovan
fe8a53425a
Revert "Changed unavailable to in a relation" 2019-07-08 15:55:08 -04:00
Hypolite Petovan
8e2d1fad17
Merge pull request #7347 from JeroenED/task/relationship-status 
Changed unavailable to in a relation
 2019-07-08 13:02:36 -04:00
Michael
d1435bef61 Add ActivityPub related fields to the "uri" function 2019-07-08 12:00:11 +00:00
Jeroen De Meerleer
6811ee5d16 Merge remote-tracking branch 'friendica.github.com/develop' into task/relationship-status 2019-07-08 07:48:07 +02:00
Michael
6bb418c5a7 Use "received" instead of "created" when displaying posts in creation order 2019-07-07 21:30:33 +00:00
Jeroen De meerleer
dea0bfd01f changed unavailable to In a relation, deleted available 2019-07-07 22:51:05 +02:00
Hypolite Petovan
9b8b2b36cd
Merge pull request #7339 from annando/gcontact-update 
Restructured Contact/GContact handling
 2019-07-07 13:28:20 -04:00
Michael
dda86f6dfc Basepath function now uses the contact field 2019-07-05 06:41:48 +00:00
Michael
be0a102333 Simplified the Contact update 2019-07-04 21:19:23 +00:00
Michael
c9666a9f1d We don't update inside the probing anymore 2019-07-04 19:40:48 +00:00
Michael
8d6aa9914c We now handling the contact type 2019-07-04 19:31:42 +00:00
Michael
ef5be9668f New fields in contact table / don't update on probe 2019-07-04 04:08:55 +00:00
Philipp
f60792348a
Merge pull request #7336 from MrPetovan/bug/globalcommunity-silence-getidforurl 
Use Contact::getIdForURL instead of Probe::uri and manual contact table lookup
 2019-07-03 16:47:37 +02:00
Michael
7b0a9ffd89 Update gcontact when public contact is updated 2019-07-03 05:46:35 +00:00
Hypolite Petovan
50fa6b7e02 Use Contact::getIdForURL instead of Probe::uri and manual contact table lookup 
- Address https://forum.friendi.ca/display/0b6b25a8-215d-1bab-29c9-77a221796252
- Normalize quote style
- Remove deprecated get_app() call
 2019-07-02 19:25:24 -04:00
Michael
80c3a81618 Use the term-date as archive date 2019-07-02 14:46:04 +00:00
Michael
1d7154a7d1 Update the gcontact entry when the public contact entry has changed 2019-07-02 09:06:48 +00:00
Hypolite Petovan
a248da8f2e
Merge pull request #7334 from annando/federated-protocol 
New constant for federated protocols
 2019-07-01 21:52:55 -04:00
Michael
ee8baf00ce Now without array_merge 2019-07-01 22:14:34 +00:00
Michael
9e3aff9ade Removed comment line 2019-07-01 18:09:40 +00:00
Michael
6041f74df6 New constant for federated protocols 2019-07-01 18:00:55 +00:00
Hypolite Petovan
7abc42700c Fix missing App object in Worker\OnePoll 2019-06-30 12:16:18 -04:00
Michael
3121d967c5 Item delivery data must only be stored when there is data 2019-06-29 08:30:48 +00:00
Michael
9bf065c9d8 Merge remote-tracking branch 'upstream/develop' into delivery-statistics 2019-06-28 14:08:54 +00:00
Hypolite Petovan
7b4bba66db
Merge pull request #7323 from annando/contact-discovery 
Removing functionality from OnePoll.php
 2019-06-28 07:08:57 -04:00
Michael
0a15222576 Collect data about used protocols for delivery 2019-06-28 09:03:58 +00:00
Michael
e48fbeda0a restore updating of the public contact 2019-06-28 04:34:01 +00:00
Michael
8838a1f2d1 Avoid overwriting of avatars for feeds 2019-06-28 04:26:49 +00:00
Michael
96651ae76d Fix a missing variable 2019-06-28 02:46:56 +00:00
Michael
d552db5c55 Polling functions are split into several functions 2019-06-27 20:38:09 +00:00
Michael
7e7acf5763 Last old query replaced in OnePoll.php 2019-06-27 16:21:23 +00:00
Michael
d4dc2a129e Replace old database queries 2019-06-27 13:30:26 +00:00
Michael
59b1a1aced Removing many now unused or duplicated tasks from OnePoll 2019-06-27 05:38:16 +00:00
Michael
4db3c79d04 Archive/unarchive the contacts 2019-06-27 05:03:58 +00:00
Michael
9caa8bae35 Unused parts removed, query refurbished 2019-06-26 05:18:11 +00:00
Michael
9b49fd7f3f Changed logging 2019-06-25 17:36:24 +00:00
Dean Townsley
fdbd160141 Add spaces for standards compliance 2019-06-24 21:37:44 -05:00
Dean Townsley
59553ab978 Don't try to auth for public images 2019-06-24 19:45:50 -05:00
Michael Vogel
26accbe3ef
Merge pull request #7296 from MrPetovan/task/smilies-replace 
Limit smilies replacement to BBCode::convert
 2019-06-24 22:05:37 +02:00
Philipp Holzer
91c295b55f
Rebase type-hint based on af9ce6b92a 2019-06-24 09:36:07 +02:00
Philipp Holzer
082634adbc
Moving from DBA to Database 2019-06-24 09:36:07 +02:00
Michael
80f4214d91 Merge remote-tracking branch 'upstream/develop' into contact-discovery 2019-06-24 05:41:10 +00:00
Michael
bca1dc1ca4 Moving functionality to the contact model 2019-06-24 03:25:01 +00:00
Michael
037cf01a15 Merge remote-tracking branch 'upstream/master' into contact-discovery 2019-06-24 03:23:57 +00:00