Commit graph

4310 commits

Author SHA1 Message Date
Michael
38ff8b5f88 Merge remote-tracking branch 'upstream/develop' into twitter-notice 2018-10-27 13:03:03 +00:00
Michael
6bc8103ca2 Avoid a notice in twitter.php 2018-10-27 12:40:59 +00:00
Michael Vogel
b53157370a
Merge pull request #762 from MrPetovan/task/move-pager-out-of-app
[forumdirectory] Use Content\Pager instead of App->pager
2018-10-25 21:42:51 +02:00
Hypolite Petovan
d4340af4fc [forumdirectory] Use new Pager constructor and renderFull signatures 2018-10-24 20:18:22 -04:00
Hypolite Petovan
d3ab209676
Merge pull request #763 from nupplaphil/replacing_goaway
Bugfix - Replacing goaway()
2018-10-24 14:28:58 -04:00
Philipp Holzer
d197bf4c2b
Bugfix - Replacing goaway() 2018-10-24 20:09:36 +02:00
Hypolite Petovan
6f421a74c6 [forumdirectory] Use Content\Pager instead of App->pager 2018-10-24 02:38:54 -04:00
Hypolite Petovan
2aa373a75d
Merge pull request #761 from vinzv/develop
resize images to 300px for frio compliance
2018-10-23 10:48:11 -04:00
Vinzenz Vietzke
b9c39e50b3 resize images to 300px for frio compliance 2018-10-23 16:38:01 +02:00
Michael Vogel
229cf2304f
Merge pull request #759 from MrPetovan/task/move-dbstructure-to-php
[various] Move dbstructure to php
2018-10-22 23:19:25 +02:00
Tobias Diekershoff
cbb75b2329
Merge pull request #760 from MrPetovan/bug/5913-fix-twitter-share
[twitter] Add missing parameter to converShare
2018-10-21 16:41:59 +02:00
Hypolite Petovan
9222681d18 [twitter] Add missing parameter to converShare 2018-10-21 08:45:53 -04:00
Hypolite Petovan
6c9788aa04 [public_server] Move NULL_DATE to DBA::NUL_DATETIME
- Remove useless DBA::escape when used with database constant
2018-10-21 02:54:09 -04:00
Hypolite Petovan
13f2734f42 [advancedcontentfilter] Move NULL_DATE to DBA::NULL_DATETIME 2018-10-21 02:53:07 -04:00
Hypolite Petovan
7a376aeaad
Merge pull request #758 from nupplaphil/move_global_functions_3
Move Global Functions - Part 3
2018-10-20 13:19:49 -04:00
Philipp Holzer
e67d810ecd
Move Global Functions - Part 3
- Replaced every CACHE_ definition
2018-10-20 18:22:13 +02:00
Hypolite Petovan
2ac21ef32a
Merge pull request #756 from JonnyTischbein/move_include_security
Move include/security to /src/Core/Authentication.php and /src/Util/Security.php
2018-10-19 08:58:31 -04:00
Michael Vogel
fdc45bdcba
Merge pull request #757 from MrPetovan/feature/3218-twitter-normalize-mentions
[twitter] Shorten foreign share mention
2018-10-18 05:50:04 +02:00
Hypolite Petovan
18a742546c [twitter] Shorten foreign share mention 2018-10-17 22:28:28 -04:00
Michael Vogel
e743cecbe8
Merge pull request #754 from MrPetovan/feature/3218-twitter-normalize-mentions
[twitter] Normalize mentions/foreign reshares
2018-10-17 22:01:15 +02:00
Jonny Tischbein
0bb8fdfde2 renaming and moving from security to Model/Item and BaseModule 2018-10-17 21:34:15 +02:00
Jonny Tischbein
e7f4dc8454 Move include/security to /src/Core/Authentication.php and /src/Util/Security.php 2018-10-17 18:58:05 +02:00
Hypolite Petovan
4eff144765 [twitter] Add support for $is_quote_share in twitter_convert_share 2018-10-17 08:19:47 -04:00
Michael Vogel
0f540002db
Merge pull request #755 from MrPetovan/bug/5932-fix-php-notices
[buffer] Fix Undefined offset: 504 notice
2018-10-17 14:01:00 +02:00
Hypolite Petovan
68f344baa0 [buffer] Fix Undefined offset: 504 notice 2018-10-17 07:48:32 -04:00
Tobias Diekershoff
1818c9b86c
Merge pull request #753 from MrPetovan/bug/5932-fix-php-notices
[statusnet] Fix Undefined variable: id
2018-10-17 07:32:29 +02:00
Hypolite Petovan
8153276e63 [twitter] Add custom handling for foreign reshares 2018-10-17 01:15:15 -04:00
Hypolite Petovan
2f91ce87b7 [twitter] Add custom handling for mentions 2018-10-17 01:14:57 -04:00
Hypolite Petovan
2454a963e0 [statusnet] Fix Undefined variable: id 2018-10-16 20:06:44 -04:00
Tobias Diekershoff
fd3eb35c33
Merge pull request #751 from MrPetovan/bug/twitter-fix-media_id_string-notice
[twitter] Fix Undefined property: stdClass::$media_id_string notice
2018-10-14 17:43:11 +02:00
Tobias Diekershoff
440e929898
Merge pull request #752 from MrPetovan/bug/fromgplus-fix-undefined-published
[fromgplus] Fix Undefined property: stdClass::$published notice
2018-10-14 17:42:27 +02:00
Hypolite Petovan
375f625e83 [fromgplus] Fix potentially missing attachments property in activity 2018-10-14 09:27:44 -04:00
Hypolite Petovan
b040bee1d0 [fromgplus] Fix Undefined property: stdClass::$published notice 2018-10-14 07:17:15 -04:00
Hypolite Petovan
da86118283 [twitter] Fix Undefined property: stdClass::$media_id_string notice 2018-10-14 07:10:08 -04:00
Hypolite Petovan
5b01292e68
Merge pull request #749 from annando/notices
Statusnet: One notice removed
2018-10-13 19:32:39 -04:00
Hypolite Petovan
0361bc0461
Merge pull request #748 from nupplaphil/remove_global_functions
Remove z_root()
2018-10-13 19:32:25 -04:00
Michael
f17f7cc5bf Statusnet: One notice removed 2018-10-13 17:53:46 +00:00
Philipp Holzer
e4afd1c120
remove z_root() 2018-10-13 19:07:22 +02:00
Michael Vogel
a8282d143e
Merge pull request #747 from MrPetovan/bug/mastodoncustomemojis-fix-notice
[mastodoncustomemojis] Ensure enoji array keys are set
2018-10-12 14:57:47 +02:00
Hypolite Petovan
39bb3ed6eb [mastodoncustomemojis] Ensure enoji array keys are set 2018-10-12 08:53:43 -04:00
Michael Vogel
cb4241af69
Merge pull request #745 from tobiasd/20181011-diaspora_getHostName
Adoption of get_hostname changes for diaspora bridge
2018-10-11 13:39:52 +02:00
Tobias Diekershoff
3f6239bb2b some more get_hostname to getHostName changes 2018-10-11 13:24:39 +02:00
Tobias Diekershoff
574bf66564 diaspora addon getHostName adoption 2018-10-11 13:16:54 +02:00
Michael Vogel
30c1542893
Merge pull request #744 from nupplaphil/friendica-5879
Bugfixing for CurlResult
2018-10-11 07:45:11 +02:00
Philipp Holzer
2e8d9ba39b
Bugfixing for CurlResult 2018-10-11 07:40:57 +02:00
Hypolite Petovan
ce2af45897
Merge pull request #743 from nupplaphil/rename_App_Methods
rename App Methods
2018-10-10 08:17:48 -04:00
Philipp Holzer
1454abfdb4
rename App Methods
- rename get_baseurl() to getBaseURL()
2018-10-10 00:04:49 +02:00
Hypolite Petovan
cac6cbc235
Merge pull request #742 from annando/ap
Activate ActivityPub for Mastodon Custom Emojis
2018-10-02 11:42:52 -04:00
Michael
ee13b836d8 Activate ActivityPub for Mastodon Custom Emojis 2018-10-02 15:28:31 +00:00
Michael Vogel
81409f0ef4
Merge pull request #737 from MrPetovan/task/add-new-highlightjs-addon
[highlightjs] Add new addon
2018-10-01 17:41:11 +00:00