Commit graph

24645 commits

Author SHA1 Message Date
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
Philipp 6cf959e2bd
Merge pull request #7554 from annando/worker-log
Output better comparable log entries for the worker
2019-08-23 08:43:42 +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 8ad109b05f
Merge pull request #7551 from vinzv/frio-migrate-forkawesome
Replaced FontAwesome by ForkAwesome
2019-08-22 14:59:15 -04:00
Vinzenz Vietzke 0d4b60a851 Replaced FontAwesome by ForkAwesome
Migrated from manual installed files in frameworks/ to composer based install
Migrated paths to new view/asset/ structure
2019-08-22 20:45:41 +02:00
Philipp d850c14f42
Merge pull request #7550 from MrPetovan/bug/7350-feed-title-entities
Replace mb_convert_encoding with html_entity_decode for feed item title conversion
2019-08-22 12:44:19 +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
Hypolite Petovan 5a9607f4e4
Merge pull request #7549 from vinzv/7542-frio-admin-user-icon-hard-recognize
adapt usage of admin user icon to match every other occurrence
2019-08-21 19:11:36 -04:00
Hypolite Petovan 73c535f6dd
Merge pull request #7546 from annando/fix-db
Fix table structure definition
2019-08-21 19:10:59 -04:00
Vinzenz Vietzke 0965da00b7 adapt usage of admin user icon to match every other occurrence
fixes #7542
2019-08-22 00:39:00 +02:00
Michael a483ea8acb Increasing database version number 2019-08-21 21:11:37 +00:00
Hypolite Petovan a0ef733c7e
Merge pull request #7547 from tobiasd/20190821-lng
DE translation update
2019-08-21 11:07:29 -04:00
Tobias Diekershoff b9f0ac4dfd DE translation update 2019-08-21 17:04:48 +02:00
Michael e430b074ce Fix table structure definition 2019-08-21 06:18:32 +00:00
Hypolite Petovan a47ed18a98
Merge pull request #7544 from JeroenED/bugfix/profile-translation
Profile vcard translation
2019-08-20 11:02:50 -04:00
Jeroen De Meerleer cf95e0f856 Translating the vcard 2019-08-20 16:38:46 +02:00
Hypolite Petovan f775fedc4a
Merge pull request #7543 from annando/queue-failed
Delivery count now counts the failed delivery attempts as well
2019-08-20 05:18:17 -04:00
Michael 5a1a5a54dc Delivery count now counts the failed delivery attempts as well 2019-08-20 07:39:13 +00:00
Philipp 4c4ed63dca
Merge pull request #7541 from vinzv/patch-2
Update Install.md
2019-08-20 00:00:41 +02:00
vinzv adee1be5f0
Update Install.md
fixing broken link to https://github.com/friendica/friendica/blob/master/config/local-sample.config.php
2019-08-19 23:39:00 +02:00
Philipp 0a82fe4211
Merge pull request #7540 from vinzv/patch-1
Update SSL.md
2019-08-19 23:37:32 +02:00
vinzv 65946259f2
Update SSL.md
fixed broken link to https://github.com/AlfredSK
2019-08-19 23:24:36 +02:00
Philipp 262a3f607b
Merge pull request #7539 from vinzv/frio-replace-exclamation-mark-with-bell
switched exclamation mark to bell
2019-08-19 21:14:29 +02:00
Vinzenz Vietzke e5c93339e3 further occurrences switched 2019-08-19 18:13:07 +02:00
Vinzenz Vietzke 607ab2eda0 switched exclamation mark to bell
as discussed in #7536
2019-08-19 17:51:24 +02:00
Hypolite Petovan 2064470b13
Merge pull request #7538 from vinzv/7536-frio-show-notification-icon-in-mobile-view
move notification to top nav on mobile view
2019-08-19 11:36:10 -04:00
Vinzenz Vietzke 7f463960d6 Merge branch '7536-frio-show-notification-icon-in-mobile-view' of https://github.com/vinzv/friendica into 7536-frio-show-notification-icon-in-mobile-view 2019-08-19 17:28:46 +02:00
Vinzenz Vietzke 6a50947db6 move notification to top nav on mobile view
closes #7536
2019-08-19 17:28:33 +02:00
Vinzenz Vietzke 631a9a2f3d Merge branch '7536-frio-show-notification-icon-in-mobile-view' of https://github.com/vinzv/friendica into 7536-frio-show-notification-icon-in-mobile-view 2019-08-19 17:24:50 +02:00
Vinzenz Vietzke 44d93415bf move notification to top nav on mobile view
closes #7536
2019-08-19 17:24:36 +02:00
Vinzenz Vietzke 32c8f51db3 move notification to top nav on mobile view
closes #7536
2019-08-19 17:16:14 +02:00
Philipp 1ba1f32005
Merge pull request #7537 from tobiasd/20190819-vier
fix vier mobile display
2019-08-19 11:56:16 +02:00
Tobias Diekershoff b02669eee9 fix vier mobile display 2019-08-19 10:34:42 +02:00
Tobias Diekershoff 468d3adec6 we are in 2019.09 RC phase now 2019-08-19 09:31:37 +02:00
Philipp d1e1cb2172
Merge pull request #7535 from MrPetovan/bug/fatal-errors
Add missing use statement in Search\Directory
2019-08-18 22:06:21 +02: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
Philipp 1fd1849641
Merge pull request #7534 from MrPetovan/bug/7350-feed-title-entities
Add entry title HTML entities conversion in Protocol\Feed
2019-08-18 15:59:58 +02: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
Hypolite Petovan efcdb3e000
Merge pull request #7532 from nupplaphil/bug/friendica-7298
Fix GContact warning
2019-08-18 09:08:03 -04: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
Hypolite Petovan fc2825b280
Merge pull request #7530 from nupplaphil/bug/theme_reload
Fix Admin Theme reload
2019-08-17 14:41:20 -04:00
Philipp Holzer d39a6ba444
Auto-remove duplicated, allowed themes during reload 2019-08-17 20:00:11 +02:00