friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity
23,269 Commits 2 Branches 63 Tags 237 MiB
Commit Graph

23269 Commits

Author SHA1 Message Date
Hypolite Petovan 69f2556f67
Merge pull request #6888 from annando/issue-6167-a 
Issue 6167: Don't publish non visible content
 2019-03-15 19:22:46 -04:00
Michael 4ff837488f Issue 6167: Don't publish non visible content 2019-03-15 20:31:07 +00:00
Philipp 3024ed4d21
Merge pull request #6886 from tobiasd/20190315-pl 
PL translation update THX waldis
 2019-03-15 10:56:27 +01:00
Tobias Diekershoff 29b88bfe9b PL translation update THX waldis 2019-03-15 09:53:42 +01:00
Tobias Diekershoff 542e363a49
Merge pull request #6885 from annando/issue-6167 
Issue 6167: Don't distribute uploaded pictures
 2019-03-15 07:33:34 +01:00
Michael 80c2c5479a Issue 6167: Don't distribute uploaded pictures 2019-03-15 06:05:52 +00:00
Tobias Diekershoff b0a0d4af6b
Merge pull request #6884 from annando/issue-6521 
Issue 6521: Don't show notifications on posts that the user deleted
 2019-03-15 06:50:08 +01:00
Michael 3b7be251d5 Issue 6521: Don't show notifications on posts that the user deleted 2019-03-15 05:23:45 +00:00
Philipp eb4fb97348
Merge pull request #6882 from annando/follow-peertube 
Issue 6874: Follow peertube
 2019-03-14 23:39:04 +01:00
Philipp 96ffb213d3
Merge pull request #6883 from annando/uri-not-url 
Fix notice - it's "uri" not "url"
 2019-03-14 23:38:36 +01:00
Michael a60a440c9a Fix notice - it's "uri" not "url" 2019-03-14 21:55:18 +00:00
Hypolite Petovan 78271f0593
Merge pull request #6881 from annando/ap-forum 
Forums now are working with AP as well
 2019-03-14 17:42:49 -04:00
Michael cd1fc091cb Only remove when "acct:" is the beginning 2019-03-14 21:18:07 +00:00
Michael 09b6978e4c Oeertube or Peertube? The last one sounds better :-) 2019-03-14 20:08:38 +00:00
Michael 33ffabcca7 Issue 6874: Allow remote follow via Peertube 2019-03-14 19:45:51 +00:00
Michael cd0d6cb626 Forums now are working with AP as well 2019-03-14 18:44:41 +00:00
Tobias Diekershoff e109125888
Merge pull request #6880 from friendica/MrPetovan-BBCode-code-spans 
Add inline spans to code block extraction in BBCode::convert
 2019-03-14 14:30:53 +01:00
Hypolite Petovan ee4585ec71
Add inline spans to code block extraction in BBCode::convert 
- Fixes autolinker replacing URLs inside of code spans
 2019-03-14 09:03:31 -04:00
Philipp 140391fff1
Merge pull request #6878 from friendica/MrPetovan-convert-attachment 
Swap attachment conversion and autolinking in BBCode::convert
 2019-03-14 09:05:54 +01:00
Hypolite Petovan 4cafe11d4d Swap attachment conversion and autolinking in BBCode::convert 
- Fixes a rare display bug where an attachment description ends with a text URL
 2019-03-13 23:13:10 -04:00
Hypolite Petovan 65adce3442
Merge pull request #6871 from nupplaphil/issue/6338-php_notices 
Fixing preamble in enotify
 2019-03-13 16:29:09 -04:00
Philipp Holzer 6872b118a4
Fixing preamble in enotify 2019-03-13 20:44:07 +01:00
Tobias Diekershoff 337e606648 adding changes till 2019-03-13 2019-03-13 10:33:50 +01:00
Philipp c8331eb068
Merge pull request #6857 from friendica/MrPetovan-patch-autolinker-domain 
Remove new lines from domain name part of autolinker regular expression in Util\Strings
 2019-03-13 07:05:52 +01:00
Hypolite Petovan c5073e2036
Prevent side effects with BBCode::convert in testAutoLinking() 2019-03-13 00:40:54 -04:00
Hypolite Petovan e98658bbf7
Merge pull request #6863 from nupplaphil/task/adjust_codecov 
Adjust codecov
 2019-03-12 09:21:51 -04:00
Philipp f755683d8f
forgot h 2019-03-12 08:49:21 +01:00
Philipp Holzer 1f3b231400
forgot "default" 2019-03-12 08:02:09 +01:00
Philipp Holzer ddecefe061
EOL 2019-03-12 07:57:01 +01:00
Philipp Holzer f876c2872d
Adjust codecov 2019-03-12 07:56:26 +01:00
Tobias Diekershoff add0b1077e
Merge pull request #6858 from nupplaphil/issue/6788-multiple_notifies 
Avoid double updates
 2019-03-12 07:24:32 +01:00
Tobias Diekershoff 2ae5c2287a
Merge pull request #6862 from annando/probe-timeout 
Fix for falsely detected AP profile in case of timeout
 2019-03-12 07:19:03 +01:00
Michael 4b98200315 Added logging 2019-03-12 05:45:02 +00:00
Michael 997b98e345 Fix for falsely detected AP profile in case of timeout 2019-03-12 05:21:04 +00:00
Philipp db1af5af53
Merge pull request #6859 from annando/block-contact 
The contact menu now displays the contact and posts link as well
 2019-03-11 22:24:30 +01:00
Michael 1f0c662854 The contact menu now displays the contact and posts link as well 2019-03-11 20:42:32 +00:00
Philipp Holzer cf17c72fd7
Adapt Logging messages 2019-03-11 21:36:41 +01:00
Philipp Holzer 8a358d5c98
Add Logger entry 2019-03-11 21:27:36 +01:00
Philipp Holzer 9a60eab152
Skip update if already done 2019-03-11 21:21:01 +01:00
Hypolite Petovan fedf29e023
Add tests for bug #6857 2019-03-11 15:27:22 -04:00
Hypolite Petovan 8f96e383a7
Remove new lines from domain name part of autolinker regular expression in Util\Strings 
- Fixes issue where the autolinker would include the next paragraph is a pathless URL was followed by new lines.
 2019-03-11 14:37:56 -04:00
Hypolite Petovan 4b5843ae30
Merge pull request #6856 from tobiasd/20190311-lng 
EN GB, EN US and IT translation updates
 2019-03-11 13:10:55 -04:00
Tobias Diekershoff 78271d50ef EN GB translation update THX AndyH3 2019-03-11 17:51:46 +01:00
Tobias Diekershoff 2bc937d093 EN US translation update THX AndyH3 2019-03-11 17:51:32 +01:00
Tobias Diekershoff 70c0557b77 IT translations THX Fabio 2019-03-11 17:50:39 +01:00
Philipp 6f3359cbcd
Merge pull request #6851 from annando/fix-mentions-again 
Fix mentions - again
 2019-03-11 08:21:32 +01:00
Michael 694cf50509 Fix mentions - again 2019-03-11 06:41:48 +00:00
Tobias Diekershoff d311f99a2b
Merge pull request #6850 from MrPetovan/bug/fatal-errors 
Fix fatal error when using Logger::devLog
 2019-03-11 06:00:51 +01:00
Hypolite Petovan 579d42a215 Fix fatal error when using Logger::devLog 
- Error message is "Call to a member function log() on null in src/Core/Logger.php:304"
 2019-03-10 22:19:12 -04:00
Philipp 7b91c26c31
Merge pull request #6849 from annando/followup-6834 
Follow up to 6834: Don't store item when the server is blocked
 2019-03-10 23:31:59 +01:00