Commit graph

23182 commits

Author SHA1 Message Date
5ed48ba425
Merge pull request #6893 from nupplaphil/issue/fixing_htconfig
Fixing .htconfig loading
2019-03-17 07:36:39 -04:00
b22ff7419e
refactor naming & superfluous check 2019-03-17 09:57:34 +01:00
0104da3c93 Summary has to be converted to HTML / Don't use summary when we have the source 2019-03-17 00:06:31 +00:00
8c6e6b5dea
Fixing .htconfig 2019-03-16 20:31:10 +01:00
1acd5c7d22
- Adding additional legacy .htconfig information 2019-03-16 20:06:53 +01:00
Philipp
54f48c1eb0
Merge pull request #6892 from tobiasd/20190316-issue6891
remove autofocus from search box
2019-03-16 19:15:43 +01:00
988506f192 remove autofocus from search box 2019-03-16 17:09:37 +01:00
23ed4b9f62
Merge pull request #6890 from annando/ap-summary
We now send a summary via AP
2019-03-16 12:43:30 +01:00
ce2e98ea68 Adding a line feed looks nicer 2019-03-16 11:18:36 +00:00
14b56ce0cc Adding the "abstract" element to the imported feed 2019-03-16 10:59:11 +00:00
dfcf1b1e6f We now send a summary via AP. This partially fixes the problem with Mastodon and Articles 2019-03-16 08:46:33 +00:00
ace4d1e4b1
Merge pull request #6889 from tobiasd/20190316-cs
CS translation update THX Aditoo
2019-03-16 02:02:16 -04:00
4836e315b2 CS translation update THX Aditoo 2019-03-16 06:53:40 +01:00
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
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
29b88bfe9b PL translation update THX waldis 2019-03-15 09:53:42 +01:00
542e363a49
Merge pull request #6885 from annando/issue-6167
Issue 6167: Don't distribute uploaded pictures
2019-03-15 07:33:34 +01:00
80c2c5479a Issue 6167: Don't distribute uploaded pictures 2019-03-15 06:05:52 +00:00
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
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
a60a440c9a Fix notice - it's "uri" not "url" 2019-03-14 21:55:18 +00:00
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
cd1fc091cb Only remove when "acct:" is the beginning 2019-03-14 21:18:07 +00:00
09b6978e4c Oeertube or Peertube? The last one sounds better :-) 2019-03-14 20:08:38 +00:00
33ffabcca7 Issue 6874: Allow remote follow via Peertube 2019-03-14 19:45:51 +00:00
cd0d6cb626 Forums now are working with AP as well 2019-03-14 18:44:41 +00:00
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
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
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
65adce3442
Merge pull request #6871 from nupplaphil/issue/6338-php_notices
Fixing preamble in enotify
2019-03-13 16:29:09 -04:00
6872b118a4
Fixing preamble in enotify 2019-03-13 20:44:07 +01:00
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
c5073e2036
Prevent side effects with BBCode::convert in testAutoLinking() 2019-03-13 00:40:54 -04:00
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
1f3b231400
forgot "default" 2019-03-12 08:02:09 +01:00
ddecefe061
EOL 2019-03-12 07:57:01 +01:00
f876c2872d
Adjust codecov 2019-03-12 07:56:26 +01:00
add0b1077e
Merge pull request #6858 from nupplaphil/issue/6788-multiple_notifies
Avoid double updates
2019-03-12 07:24:32 +01:00
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
4b98200315 Added logging 2019-03-12 05:45:02 +00:00
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
1f0c662854 The contact menu now displays the contact and posts link as well 2019-03-11 20:42:32 +00:00
cf17c72fd7
Adapt Logging messages 2019-03-11 21:36:41 +01:00