keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
32401 commits 4 branches 0 tags 179 MiB
Commit graph

1876 commits

Author SHA1 Message Date
Michael
6f350c1e59 Use signed requests for fetching private images 2021-06-28 10:08:51 +00:00
Michael
7e200174d6 Replace attachment links in the body 2021-06-28 04:53:20 +00:00
Michael
dbf9132ea6 Fixed indendation 2021-06-28 01:34:29 +00:00
Michael
b46b7b08ba Reduce the usage of the "proxifyUrl" function 2021-06-27 11:50:10 +00:00
Michael
e6e90abc77 AOI: Send "history" section for trends 2021-06-24 22:15:25 +00:00
Michael
89608d5844 Set CORS header fields to support Halcyon 2021-06-24 18:02:29 +00:00
Michael
9276f6823b New class for external resources 2021-06-24 17:30:22 +00:00
Michael
96809b3fdd API: Improved avatar handling 2021-06-24 07:08:38 +00:00
Michael
6b46fdb54e Don't count the system user as user 2021-06-21 04:03:20 +00:00
Philipp
322f0b3ecf
Cleanup Mastodon Factories 2021-06-20 13:25:45 +02:00
Michael
97891fe05b Context: use the correct "select functionality 2021-06-19 18:27:35 +00:00
Michael
fe07dc828b Fix noscrape publishing and pulling, added header 2021-06-17 11:23:32 +00:00
Michael
ebd4f59d02 Merge remote-tracking branch 'upstream/2021.06-rc' into public-timeline 2021-06-16 21:01:20 +00:00
Hypolite Petovan
7b91bd1d80
Merge pull request #10410 from annando/oauth 
API: Added OAuth revoke, adding documentation to parameters
 2021-06-16 16:32:45 -04:00
Michael Vogel
a256f18159
Update src/Module/OAuth/Token.php 
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
 2021-06-16 22:19:26 +02:00
Michael
6b3476409a Check for REDIRECT_REMOTE_USER as well 2021-06-16 19:39:51 +00:00
Michael
5e22704f7e API: Added OAuth revoke, adding documentation to parameters 2021-06-16 19:24:44 +00:00
Michael
6e789ec19a No need for +1 and -1 2021-06-16 17:57:01 +00:00
Michael
78d4aff878 Set the "Link" header 2021-06-16 15:02:33 +00:00
Michael
11d2440425 New functions for the post-view view 2021-06-16 10:16:01 +00:00
Michael
5211c12b0c Merge remote-tracking branch 'upstream/2021.06-rc' into public-timeline 2021-06-16 05:58:11 +00:00
Michael
0ab24510ef Centzralized functionality to update and publish profile changes 2021-06-15 11:12:44 +00:00
Michael
bf8cb39102 Diaspora relay functionality is removed 2021-06-13 11:15:04 +00:00
Michael
24cc82f396 API: (hopefully) improves speed of the public timeline 2021-06-12 15:19:56 +00:00
Michael
b7f12051a8 Small fixes 2021-06-12 11:19:23 +00:00
Michael
c21cbd936e Changed sorting 2021-06-12 10:12:02 +00:00
Michael
b8da971fac Server statistics: New section for relais and nomads 2021-06-12 08:08:35 +00:00
Michael
6dc2988c0f Return the application fields 2021-06-10 08:05:21 +00:00
Michael
0b9c934cad Simplify the code 2021-06-10 07:02:06 +00:00
Michael
d917ed58a8 API: Tests with various clients, small fixes 2021-06-10 06:26:34 +00:00
Michael
385c03364f The function is now protected again 2021-06-08 20:45:58 +00:00
Michael
e4be1e0cd5 Get rid of "api_user()" function 2021-06-08 20:41:46 +00:00
Michael
2a440c0bae Use "checkAllowedScope" instead of "login" 2021-06-08 12:00:22 +00:00
Michael
5853fe562d Login hasn't got a return value 2021-06-08 09:51:17 +00:00
Michael
9720ee2c20 Rearranged scope check 2021-06-08 09:11:56 +00:00
Michael
11c8dfe73a Unified request for uid 2021-06-08 08:28:14 +00:00
Michael
85217941e3 Simplified code 2021-06-08 08:04:12 +00:00
Michael
126e281165 Improved documentation 2021-06-08 06:39:23 +00:00
Michael
acbe9ebf9e API: New classes for OAuth and basic auth 2021-06-08 06:32:24 +00:00
Michael
8e12c1d39b Added note about missing parameters 2021-06-07 07:45:20 +00:00
Michael
dc9b5df072 API: The endpoints "followers" and "following" are swapped 2021-06-07 04:44:12 +00:00
Michael
ace89197ff Display the forum posts in the new format. 2021-06-05 20:29:19 +00:00
Michael
5ddd2f3ab5 Coding standards 2021-06-03 05:18:22 +00:00
Michael
4206c5d363 API: some more endpoints added 2021-06-03 04:47:02 +00:00
Michael
9c59bcb6a5 Support OAuth for the legacy API 2021-06-02 22:11:21 +00:00
Michael
4d19a6f0e3 Simplify the code 2021-06-02 07:15:42 +00:00
Michael
a2be7e386f API: Lim it the elements for the context 2021-06-02 07:11:18 +00:00
Michael
842cbbaf09 Added notifications for follow requests 2021-06-01 21:13:16 +00:00
Michael
49459821be Renamed function 2021-06-01 14:23:12 +00:00
Michael
3f0937dd42 API: Show activity notifications 2021-06-01 05:51:03 +00:00
Hypolite Petovan
15581ba91f
Merge pull request #10338 from annando/issue-9923 
Issue 9923: Fix DB Error 1055
 2021-05-30 07:48:49 -04:00
Michael
c05c447d0f Avoid warning "array_merge(): Expected parameter 2 to be an array, null given" 2021-05-29 22:48:06 +00:00
Michael
6c90005363 Issue 9923: Fix DB Error 1055 2021-05-29 21:28:40 +00:00
Michael Vogel
1ca58968f2
Apply suggestions from code review 
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
 2021-05-29 14:32:31 +02:00
Michael
c3c6f3c8d3 Code style conventions 2021-05-29 10:40:47 +00:00
Michael
97356ed617 API: Unified request parameter handling 2021-05-28 06:10:32 +00:00
Michael
ce8e5012e9 Fix reshare of Diaspora posts only with pictures 2021-05-27 19:58:18 +00:00
Michael
8b3884b2de API: Bookmarked posts are starred, not pinned 2021-05-27 07:51:30 +00:00
Michael
32d0d45adf Issue 10287: Don't show ignored and blocked posts 2021-05-24 10:51:21 +00:00
Michael
a69e128fe4 Merge remote-tracking branch 'upstream/2021.06-rc' into http-input-data 2021-05-23 20:17:50 +00:00
Hypolite Petovan
0238a15809
Merge pull request #10295 from nupplaphil/bug/php7_cs 
Fix PHP 7.0 Coding Standards
 2021-05-23 07:38:38 -04:00
Michael
8f9033633c Issue 10287: Make block and ignore work for the API as well 2021-05-23 08:56:24 +00:00
Philipp
965cd8b096
Fix PHP 7.0 Coding Standards 2021-05-22 23:47:35 +02:00
Michael
6f44476c56 Merge remote-tracking branch 'upstream/2021.06-rc' into http-input-data 2021-05-22 20:26:32 +00:00
Michael
ede808f449 Fixes "Undefined index: upubkey" by replacing the profile load mechanism 2021-05-22 15:50:05 +00:00
Michael
a5c8c4d8b7 Fixes notice 2021-05-22 15:41:25 +00:00
Michael
6fe916a390 API: improved mail handling 2021-05-22 13:37:04 +00:00
Michael
081652e09a Wrong class path 2021-05-21 18:00:03 +00:00
Michael
bcb2073c9a New class to process HTTP input data 2021-05-21 17:36:51 +00:00
Michael
f5f919aead Coding standards 2021-05-20 06:58:15 +00:00
Michael
e10f3f26b9 Removed unused parameter 2021-05-20 04:44:45 +00:00
Michael
db8b0b9666 The next mail endpoint is done 2021-05-20 04:39:45 +00:00
Michael
8a3db0226b Coding standards 2021-05-20 03:53:48 +00:00
Michael
66ad777f4b Supporting all parameters 2021-05-19 22:33:40 +00:00
Michael
d46150f1dc Whitespaces ... 2021-05-19 22:18:30 +00:00
Michael
ae6dae3b23 Whitespace removed 2021-05-19 22:10:05 +00:00
Michael
70259965df API: Support for private mails 2021-05-19 21:56:50 +00:00
Michael
fcc18de9c5 Unneeded spaces removed 2021-05-19 16:09:09 +00:00
Michael
ab96e694df Removed unused use 2021-05-19 16:07:37 +00:00
Michael
1c7d1c7c47 New endpoint "verify_credentials" added 2021-05-19 09:35:08 +00:00
Michael
b3b9c51dbe Reduced log level 2021-05-19 07:02:12 +00:00
Michael
50ca38a0f7 Harmonized API parameters for all timeline endpoints 2021-05-19 06:55:08 +00:00
Michael
e3d227f3c9 API: Parameter cleanup 2021-05-19 06:18:42 +00:00
Michael
e5c1b90668 API: Reworked request parameter handling 2021-05-18 19:26:46 +00:00
Michael
f935c1cf73 Restructured variable handling 2021-05-18 08:38:04 +00:00
Michael
724a61390f Coding standards 2021-05-18 07:23:18 +00:00
Michael
2252949bca Style stuff ... 2021-05-18 07:18:31 +00:00
Michael
f31fdf4391 Spaces 2021-05-18 07:13:32 +00:00
Michael
8ae29eabe8 Min is max 2021-05-18 07:02:50 +00:00
Michael
0a6127ea6e Set maximum value 2021-05-18 07:01:23 +00:00
Michael
ce427b248e Central function to process request parameters 2021-05-18 06:31:22 +00:00
Michael
32e7ddf21b Improved parameter assignment 2021-05-18 04:54:37 +00:00
Michael
71a398277d Improved query 2021-05-17 22:44:42 +00:00
Michael
59cff3511b Standards 2021-05-17 22:31:35 +00:00
Michael
c9110e03e1 API: Search endpoint 2021-05-17 22:22:51 +00:00
Michael
dd16bccbc8 Fix for sending content via connectors 2021-05-16 14:30:15 +00:00
Michael
14c1f7167a API: We now can upload photos 2021-05-16 09:56:02 +00:00
Michael
49207a8624 Added scope check 2021-05-16 07:37:11 +00:00
Michael
1cc341033f API: We now can post statuses via API 2021-05-15 22:40:57 +00:00
Michael
f001f52e39 API: Fix relationships 2021-05-15 15:02:15 +00:00
Michael
78dab01696 "UpdateCredentials" dummy added (currently not working) 2021-05-15 12:13:03 +00:00
Michael
9c427cc05d Unused use 2021-05-15 10:59:22 +00:00
Michael
6a5083d918 Fixed message, relationships endpoint added 2021-05-15 10:55:41 +00:00
Michael
b34ee320b0 API: Many item related endpoints added 2021-05-15 10:08:47 +00:00
Michael
45c2cc3887 API: Account actions 2021-05-14 21:51:32 +00:00
Michael
0aaaf8d6ef API: Support OAuth client credentials 2021-05-14 06:05:01 +00:00
Michael
8b841dfa50 Fix connection issues with AndStatus 2021-05-13 22:00:40 +00:00
Michael
3aa883f1e3 API: List handling, dummy endpoints 2021-05-13 21:15:32 +00:00
Michael
b18073d5a8 Repurposed OAuth frontend handling, store the scope 2021-05-13 14:58:55 +00:00
Michael
132e08edb8 Whitespaces ... 2021-05-13 11:33:07 +00:00
Michael
7975bc244d Refine OAuth flow 2021-05-13 11:26:56 +00:00
Michael
494e852c1a Removed old comment 2021-05-12 15:41:05 +00:00
Michael
9125d296a1 Improved error messages 2021-05-12 14:00:15 +00:00
Michael
8a5560ec8f Simplified null check 2021-05-12 12:40:45 +00:00
Michael
4a6d33e182 HTTP_AUTHORIZATION should be enough 2021-05-12 12:34:55 +00:00
Michael
8dccb66dec Display the application name 2021-05-12 12:19:15 +00:00
Michael
19a81d25d5 Added documentation headers 2021-05-12 12:08:30 +00:00
Michael
87f7e26638 Added documentation 2021-05-12 12:00:24 +00:00
Michael
daa832fcf9 Formatting 2021-05-12 11:54:43 +00:00
Michael
c3f28252ff Indention 2021-05-12 10:50:01 +00:00
Michael
a23d108fa7 Session variable needs to be removed afterwards 2021-05-12 06:51:59 +00:00
Michael
6ca42512e9 OAuth connections now have to be ackknowledged 2021-05-12 06:50:27 +00:00
Michael
c22846339a Improved error reporting 2021-05-12 05:30:21 +00:00
Michael Vogel
e99117ac22
Update src/Module/OAuth/Authorize.php 
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
 2021-05-12 03:53:40 +02:00
Michael
4476634f6c Fix list of accounts 2021-05-11 23:39:08 +00:00
Michael
f5e98c8ecf Redirect at login does work 2021-05-11 21:04:45 +00:00
Michael
8eacfbc570 Fix context order / notice fixed 2021-05-11 19:53:19 +00:00
Michael
bade0a2345 Improved cards handling, simplified Bearer handling 2021-05-11 19:15:05 +00:00
Michael
7d8c152aaf Check the start of the string 2021-05-11 13:17:48 +00:00
Michael
74f3c885bf use "random_bytes" instead of "openssl_random_pseudo_bytes" 2021-05-11 13:12:12 +00:00
Michael
cfb9b73205 Store creation date 2021-05-11 08:16:40 +00:00
Michael
0f4920dca8 Unused use 2021-05-11 06:34:31 +00:00
Michael
a3d1423562 unused use 2021-05-11 06:33:18 +00:00
Michael
c9e6fea74b Code style 2021-05-11 06:31:48 +00:00
Michael
82003bbe47 Login prototype 2021-05-11 06:30:20 +00:00
Michael
6644d117f6 Indentions 2021-05-09 22:29:04 +00:00
Michael
585d283ff9 Preparation for Oauth client registration 2021-05-09 22:23:21 +00:00
Michael
a696b7f427 Renamed functions 2021-05-09 18:44:08 +00:00
Michael
591619e1d3 Unused use removed 2021-05-09 13:01:56 +00:00
Michael
1c6e915514 Media is now supported as well 2021-05-09 12:59:23 +00:00
Michael
6ac74f9cc9 Unused use removed 2021-05-09 12:05:22 +00:00
Michael
6cd7215d87 Formatting ... 2021-05-09 12:04:00 +00:00
Michael
6d3c82e54e Formatting 2021-05-09 12:01:44 +00:00
Michael
66be56e081 Some more formatting 2021-05-09 12:00:08 +00:00
Michael
6e9dd7641f Some more code styling 2021-05-09 11:58:27 +00:00
Michael
f5c7f9670f Remove blanks 2021-05-09 11:54:34 +00:00
Michael
cc5d4db6a3 Notifications are now supported as well 2021-05-09 11:50:05 +00:00
Michael
5bb5c44bd9 API: added account related endpoints 2021-05-09 09:35:51 +00:00
Michael
1e3182a896 And more formatting 2021-05-08 19:30:09 +00:00
Michael
a0e455a493 Again formatting 2021-05-08 19:28:20 +00:00
Michael
4b4298b0f8 Some more formatting 2021-05-08 19:26:57 +00:00
Michael
cce0d0c21b Formatting 2021-05-08 19:25:20 +00:00
Michael
3bbf543d25 API: Some more endpoints 2021-05-08 19:21:52 +00:00
Michael
7d1c43cf65 Formatting 2021-05-08 12:28:04 +00:00
Michael Vogel
31d70e02e0
Update src/Module/BaseApi.php 
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
 2021-05-08 14:23:47 +02:00
Michael
054f6dedc1 /followes and /following is supported 2021-05-08 11:46:24 +00:00
Michael
d842a4ff87 Suggestions are now supported as well 2021-05-08 11:03:50 +00:00
Michael
c97cfd8a44 Removed unused use 2021-05-08 09:19:16 +00:00
Michael
6236870aa4 Add all required HTTP methods 2021-05-08 09:14:19 +00:00
Michael
4fdc1ae13a "/statuses/id" is now supported 2021-05-08 05:55:06 +00:00
Michael
9300395c6e "verify_credentials" is now partially supported 2021-05-08 02:52:44 +00:00
Michael
d39983c8b7 We now support lists as well 2021-05-08 02:21:01 +00:00
Michael
0ea2241eed Support the "only_media" parameter 2021-05-08 01:52:23 +00:00
Michael
0468b7b3f9 Formatting 2021-05-07 21:35:07 +00:00
Michael
0a25349fbf Formatting 2021-05-07 21:33:42 +00:00
Michael
dd38cc330f API: We now support two more timeline api endpoints 2021-05-07 21:28:48 +00:00
Michael
95f741c427 Improve data of shared posts 2021-05-07 06:26:41 +00:00
Hypolite Petovan
0a1f4d81c8 Prevent self block/ignore in Module\Contact 2021-05-04 08:59:13 -04:00
Michael
10a6f0a98f API: New function to fetch current user id 2021-05-03 05:25:54 +00:00
Tobias Diekershoff
f57ddee31c the command was missing from the worker queue overview 2021-05-02 09:55:19 +02:00
Michael
c9a00fcb1c Issue 10156: Fix endless scroll with filed posts 
Fixes #10156
 2021-04-20 20:51:09 +00:00
Michael
5d61599964 Fix notices 
See https://github.com/friendica/friendica/issues/9749#issuecomment-774666356
and https://github.com/friendica/friendica/issues/9747#issuecomment-785262156
 2021-04-10 16:19:22 +00:00
Hypolite Petovan
acbcc56754 Prevent settings/userexport to be used by anonymous users 
- Add forbidden exceptions in module methods
- Add runtime exceptions in individual export methods
 2021-04-01 19:29:21 -04:00
Balázs Úr
befc2af504
Merge branch '2021.03-rc' into copyright-2021 2021-03-29 08:45:21 +02:00
Balázs Úr
054c301ef0 Update copyright 2021-03-29 08:40:20 +02:00
Michael
f4649b9f0e Issue 4755: Use the system mail address as sender 2021-03-27 21:23:31 +00:00
Michael
45c80ab52f Added support for Mobilizon on the federation page 2021-03-25 18:52:50 +00:00
Michael
5bbcb8bdf4 ActivityPub: Delete Comments 2021-03-24 22:22:14 +00:00
Hypolite Petovan
393de1a283 Use system.allowed_oembed config to allow iframe source 2021-03-14 14:19:35 -04:00
Hypolite Petovan
93823ecef5 Move HTML purification to own method in Content\Text\HTML 2021-03-14 14:19:33 -04:00
Michael
acffafe6b9 Merge remote-tracking branch 'upstream/2021.03-rc' into issue-10019 2021-03-13 12:30:41 +00:00
Hypolite Petovan
e8929efbea
Merge pull request #10040 from annando/file-permissions 
Only set file permissions when configured
 2021-03-13 07:19:30 -05:00
Michael
0bc1ebe5bf Only set file permissions when configured 2021-03-13 11:37:11 +00:00
Michael
ffb92e3355 Integrate fetching of the content type into "getSiteinfo" 2021-03-13 07:03:26 +00:00
Michael
262ee2b0b1 Issue 10019: Fix embedding of media objects 2021-03-12 23:04:51 +00:00
fabrixxm
225a37af9a Installer: install themes as last action 
this will register theme hooks
 2021-03-12 18:21:50 +01:00
Roland Häder
5de0008b48
Removed default values. 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2021-03-11 12:45:59 +01:00
Roland Häder
15fd6822e4 Ops, missing ";" 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2021-03-11 12:41:33 +01:00
Roland Häder
736045c67d Code changes for #10020: 
Added ability to set chmod (default: 0640) for "proxified" files (downloaded to
/proxy/ directory). This allows customization, e.g. if people want 0600 instead
without changing the code.

Signed-off-by: Roland Häder <roland@mxchange.org>
 2021-03-11 12:41:33 +01:00
Michael Vogel
5e98a38ac9
Merge pull request #10027 from MrPetovan/task/9950-improve-maintenance-page 
Improve maintenance page
 2021-03-10 20:19:55 +01:00
Hypolite Petovan
4489d14b06
Remove admin condition to display the maintenance reason 2021-03-10 12:20:02 -05:00
Hypolite Petovan
2d91db9e76 Add /.well-known/security.txt route and module 2021-03-10 09:58:48 -05:00
Hypolite Petovan
064ff693fd Add custom message to the maintenance module display 2021-03-10 09:50:20 -05:00
Michael
972c9f7bc0 Issue 9743: Added translatable texts 2021-03-08 21:17:27 +00:00
Michael
e515ac11ed Don't check for table_open_cache when pdo_emulate_prepares is activated 2021-03-08 10:38:53 +00:00
Michael
7510e854de Issue 8547: Improve page load speed 2021-03-07 20:15:25 +00:00
Michael
98ffcdd085 Issue 9925: Make query compatibly to MySQL 8 2021-03-07 07:54:02 +00:00
Michael
d2c734c025 Issue 9986: Improve contact search 2021-03-06 21:52:26 +00:00
Michael
ab3fed9643 Fix link preview with videos 2021-02-27 21:02:06 +00:00
Michael
99a145f7cf Fixes several database errors, removes "relation" handling 2021-02-25 05:13:49 +00:00
Tobias Diekershoff
beccd12a2b Issue 9064: referring INSTALL.txt now points to doc/INSTALL.md 2021-02-23 09:57:33 +01:00
Michael
1792046a4f post/thread views are renamed, search bugs fixed 2021-02-22 19:47:08 +00:00
Michael
2bb8e7a56f Prohibit combined usage of "star" and "mention" 2021-02-21 12:18:50 +00:00
Michael
ab34cbbfec Reset "star" and "mention" on new order 2021-02-21 11:14:35 +00:00
Michael
92a8a399de Improved indexes, avoiding SQL errors, improving speed 2021-02-20 20:07:25 +00:00
Hypolite Petovan
3859b7ba10 Move /parse_url module to /parseurl 
- Update oexchange module to use BBCode::embedURL instead of a self-request
- Remove mod/parse_url.php file
- Restrict ParseUrl module to authenticated users
 2021-02-18 09:06:27 -05:00
Michael
312c01a517 Several speed improvements (magiclink, caching, indexes) 2021-02-17 18:59:19 +00:00
Michael
60a6dfa23c Fix several database issues 2021-02-16 22:04:03 +00:00
Michael
751232d679 Merge remote-tracking branch 'upstream/develop' into no-item 2021-02-14 22:44:38 +00:00
Michael
ce6ad1aa73 Get rid of the "item" table, enhanced "post" tables 2021-02-13 19:56:03 +00:00
Hypolite Petovan
b2680bffb0 Babel: Support tweet URL 2021-02-09 23:26:02 -05:00
Michael
8f27715d8b "item" is replaced whenever possible at the moment 2021-02-06 13:42:21 +00:00
Michael
5e846dd7c2 The thread table is replaced by post-thread and post-thread-user 2021-02-04 05:51:25 +00:00
Michael
be3dfb4ffe Merge remote-tracking branch 'upstream/develop' into post-thread-user 2021-02-01 19:31:39 +00:00
Michael
c1d99d6c4c Most user-item traces removed 2021-01-31 23:37:34 +00:00
Hypolite Petovan
15e9f219e7 Add new item/{id}/follow module and POST route 
- It is meant to replace mod/subthread
 2021-01-31 17:36:18 -05:00
Hypolite Petovan
b31fc3bfa9 Move GET starred/{id} to POST item/{id}/star 2021-01-31 14:21:57 -05:00
Hypolite Petovan
6d31c11e57 Move GET item/ignore/{id} to POST item/{id}/ignore 2021-01-31 12:56:44 -05:00
Hypolite Petovan
151db1104a Move GET /like/{id} to POST /item/{id}/activity/{verb} 2021-01-31 08:41:04 -05:00
Hypolite Petovan
188f7b0eb0 Move GET pinned/{id} to POST item/{id}/pin 2021-01-30 18:42:23 -05:00
Michael
c3398511b4 New table "post-content" 2021-01-30 22:03:53 +00:00
Michael
8eb3bddc2a Reduce the parameter chaos by splitting the update function 2021-01-30 13:31:59 +00:00
Michael Vogel
199f72ee3c
Merge pull request #9823 from MrPetovan/task/9677-2fa-remember-device 
Add "Remember this device" feature to two factor authentication
 2021-01-27 22:32:08 +01:00
Hypolite Petovan
a7791bebc2
Merge pull request #9870 from annando/uri-id 
"uri-id" instead of "uri" or "id"
 2021-01-27 11:45:19 -05:00
Michael
ef0400fc19 "uri-id" instead of "uri" or "id" 2021-01-27 10:01:42 +00:00
Extarys
d5a066400d style: tab to space 2021-01-25 12:02:49 -05:00
Extarys
68a2c4c885 pwa: add fields 2021-01-25 11:46:27 -05:00
Hypolite Petovan
82e094179c Rename notify classes according the feature name, not the table name 2021-01-24 09:33:23 -05:00
Hypolite Petovan
a2556e7c67 Remove leading space in displayed public tags in profile page 2021-01-23 15:55:21 -05:00
Hypolite Petovan
5a949911ba Add trusted browsers user setting module 
- Add trusted browsers help section
 2021-01-23 05:42:59 -05:00
Hypolite Petovan
50f97e977a Added support for trusted browser during authentication 2021-01-23 05:42:59 -05:00
Hypolite Petovan
3e257d4266 Move all two-factor authentication classes in Security\TwoFactor 2021-01-23 05:42:58 -05:00
Hypolite Petovan
2343d7bb73 Replace obsolete call to Item::selectFirstThreadForUser in Module\Item\Ignore 2021-01-22 16:03:36 -05:00
Michael
0c14f41873 Use an exception 2021-01-21 21:53:19 +00:00
Michael
fbcc59cc1d Some more removed functionality from FileTag class 2021-01-21 20:25:06 +00:00
Michael
d2ea3eabfb Replace legacy file/category handling 2021-01-21 07:16:41 +00:00
Michael
b892db0cf3 All item selects are now done by the post class 2021-01-19 07:23:01 +00:00
Michael
4157db5473 "item" is replaced by "post-view" / postupdate check added 2021-01-17 20:32:13 +00:00
Michael
2c65b81182 Fix notice "Undefined index: internal-verb" 2021-01-17 08:15:18 +00:00
Michael
2b1d0b9db8 "selectForUser" and "" selectFirstForUser" is now moved to Post 2021-01-16 22:37:27 +00:00
Michael
2fa692bcce New post class in the rest of the classes 2021-01-16 04:16:09 +00:00
Michael
a81ac835a1 The frontend worker is removed 2021-01-01 23:05:26 +00:00
Hypolite Petovan
beaef12296 Add missing first file/line in exception template 2020-12-30 21:15:01 -05:00
Michael
447bac077e Simplify the resizing 2020-12-26 21:24:36 +00:00
Michael
997319a41f Use the raw data instead of an object 2020-12-26 19:31:39 +00:00
Michael
7f56e2e7a9 Improve photo loading speed 2020-12-26 18:51:36 +00:00
Michael Vogel
71bd6c674b
Merge pull request #9701 from MrPetovan/bug/9636-frio-mobile-intros-buttons 
[frio] Improve display of introduction action buttons on mobile
 2020-12-23 19:50:16 +01:00
Hypolite Petovan
241cd32b14 Replace obsolete calls to $APP->is_mobile in templates 2020-12-23 03:25:55 -05:00
Hypolite Petovan
cab40636bd Add expected contact field in Module\Contact\Poke 
- Address PHP Notice: Undefined index: photo in src/Module/Contact/Poke.php on line 94
 2020-12-23 02:48:38 -05:00
Hypolite Petovan
2ef5bf1e21 Use correct request parameter type for poke privacy 2020-12-22 01:02:42 -05:00
Hypolite Petovan
043e2224b0 Add mentions to poke posts 2020-12-22 01:02:06 -05:00
Hypolite Petovan
b0234f4ef9 Remove autocomplete from 2FA code input fields 2020-12-21 00:25:21 -05:00
Hypolite Petovan
fbd0cefdf7 Add translation to Yourself option in view as select in profile 
- Address https://github.com/friendica/friendica/issues/9682
 2020-12-20 02:08:17 -05:00
Hypolite Petovan
a991f3dfcf Add translation to required labels for install checks 
- Remove unused checks loop in install_base template
 2020-12-20 02:08:13 -05:00
Hypolite Petovan
65f74da45b Add translation to required labels on input fields 
- Normalize display of required label
- Remove unused field_richtext template
 2020-12-19 22:52:45 -05:00
Hypolite Petovan
fc19d98392
Merge pull request #9680 from annando/issue-9402 
Issue 9402: Avoid message "invalid storage backend settings" on empty value
 2020-12-19 13:07:02 -05:00
Michael Vogel
e66fba9757 Issue 9402: Avoid message "invalid storage backend settings" on empty value 2020-12-19 18:17:12 +01:00
Michael
944b0eadb7 Issue 9457: Fix remembering "personal" and "starred" 2020-12-19 16:48:12 +00:00
Hypolite Petovan
0dac6e9d34 Add general information header translation to admin site template 2020-12-17 22:52:30 -05:00
Michael
a331a8cf0a Delete removed contacts 2020-12-15 22:56:46 +00:00
Michael
c3d0ab56a5 Issue 9584: Only search posts from federated networks 2020-12-12 19:55:47 +00:00
Michael Vogel
809035b872
Merge pull request #9635 from MrPetovan/bug/notices 
Batch of notice fixes
 2020-12-09 06:51:54 +01:00
Michael
2cb71341b2 Fixes "Unknown column '729' in 'field list'" 2020-12-08 21:23:10 +00:00
Hypolite Petovan
c7a2988454 Check for the existence of array key before using it in Protocol\ActivityPub\Transmitter 
- Address https://github.com/friendica/friendica/issues/9252#issuecomment-739534960
 2020-12-08 10:08:49 -05:00
Hypolite Petovan
99828c0fea Suppress notice message when guid isn't supplied in Module\Admin\Item\Source 
- https://github.com/friendica/friendica/issues/9252#issuecomment-740052103
 2020-12-08 10:00:09 -05:00
Michael
a49a35f459 Centralized fetching of the default avatar 2020-12-07 06:43:43 +00:00
Michael Vogel
f9994548c1
Merge pull request #9621 from MrPetovan/bug/9611-bbcode-convert-html-purify 
Add HTML Purify to BBCode::convert
 2020-12-05 19:27:59 +01:00
Hypolite Petovan
a382798999 Add some more result panels to Babel 2020-12-04 07:29:48 -05:00
Michael
9f96f3ef34 Moved updating personal contacts to updatecontact 2020-12-04 05:53:11 +00:00
Michael
bda5d43f1e New "remote self" option: Native Reshare 2020-11-28 22:53:58 +00:00
Michael
b6f349076c Fix order of reshared items on the profile page 2020-11-28 06:23:17 +00:00
Hypolite Petovan
f0d6f8c45e
Merge pull request #9597 from annando/api-endpoints 
API: Mastodon endpoints added as "unimplemented"
 2020-11-26 09:34:36 -05:00
Michael Vogel
615eece22f
Update src/Module/Api/Mastodon/Unimplemented.php 
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
 2020-11-26 14:35:06 +01:00
Michael
db5cd6e66c API: Mastodon endpoints added as "unimplemented" 2020-11-26 07:02:31 +00:00
Michael
818c064c0a The notifications parameters are now simplified 2020-11-25 19:56:39 +00:00
Michael
3ffd40c7da OnePoll reworked, improved "failed" behaviour 2020-11-22 14:42:24 +00:00
Michael
b52ba79620 Contacts can now be updated from every theme 2020-11-22 08:15:17 +00:00
Michael
aec9f1ebf0 Remove unused config variable 2020-11-21 15:15:58 +00:00
Hypolite Petovan
b2666e7794 Escape user name in introduction fields help text 
- HTML help text aren't escaped in the template

# Conflicts:
#	src/Module/Notifications/Introductions.php
 2020-11-16 18:21:11 -05:00
Hypolite Petovan
a69c98e32f
Merge pull request #9535 from annando/ap-relay 
Relay code reworked to support AP delivery
 2020-11-15 20:27:08 -05:00
Michael
0384bf3e76 Relay code reworked to support AP delivery 2020-11-15 23:28:05 +00:00
Hypolite Petovan
0c3a5c815e Remove obsolete references to item.parent-uri 2020-11-14 10:08:50 -05:00
Hypolite Petovan
42db861759
Merge pull request #9527 from annando/fetch-object-by-url 
Fix: Fetch object by URL
 2020-11-11 13:14:20 -05:00
Michael
ba38ab2c55 Fix: Fetch object by URL 2020-11-11 17:55:33 +00:00
Hypolite Petovan
4fce6a919f Suppress notice when network page is empty 2020-11-11 03:05:12 -05:00
Michael Vogel
7765bd8e43
Merge pull request #9512 from MrPetovan/bug/9501-admin-users-fixes 
[frio] Improve admin user list display
 2020-11-10 07:07:59 +01:00
Hypolite Petovan
8fe5da930a Only set the current notify as seen when user enabled detailed notifications 2020-11-09 11:41:21 -05:00
Hypolite Petovan
a35707ec8f Improve admin user field is_deletable to check user.account_removed 2020-11-09 10:08:33 -05:00
Hypolite Petovan
ae00111f5b Fix redirect/form paths in Module\Admin\Users\Index|Active 2020-11-08 20:09:10 -05:00
Hypolite Petovan
388c0b69d6 Split admin/users into 6 separate modules 
- They now feature working pagination
 2020-11-08 12:53:12 -05:00
Hypolite Petovan
213716d44c Remove unused code in Module\Register 2020-11-08 12:53:12 -05:00
Hypolite Petovan
126ef0ae82 [frio] Add link to settings in account delegation page 2020-11-08 12:53:12 -05:00
Michael
43749c3069 The "attach" field is now deprecated 2020-11-07 08:22:59 +00:00
Michael
d383f49f1e The "[attach]" field is replaced by the "post-media" table 2020-11-06 04:14:29 +00:00
Michael
4965d6aa54 The profile page does now shows reshared items 2020-11-03 19:24:47 +00:00
Michael
ba4685dfb1 API: Support for reshared items 2020-11-01 11:01:57 +00:00
Michael
c030275815 API: accounts and trends 2020-10-31 22:32:26 +00:00
Michael
db8be13bbf Fix order on network page 2020-10-30 22:13:14 +00:00
Michael
46bd1704df Fix notice "Undefined index: network" and warning "strpos(): Empty needle" 2020-10-29 13:28:27 +00:00
Michael
2f3918c3a3 Issue 9457: Fix network order for starred and mention 2020-10-26 06:54:10 +00:00
Hypolite Petovan
59cb53b011
Merge pull request #9455 from annando/remote-self 
Move "remote self" to the contact settings
 2020-10-24 18:15:02 -04:00
Michael
89509f02e4 Move "remote self" to the contact settings 2020-10-24 21:42:49 +00:00
Michael
d639912f38 Disable the "proc_open" option when it isn't available 2020-10-24 19:33:38 +00:00
Michael
8bd45ab857 "commented" is the default 2020-10-24 13:44:31 +00:00
Michael
adb660f1ad Issue 9451: We now do store the tab in a config again 2020-10-24 13:11:44 +00:00
Hypolite Petovan
4719af6724
Merge pull request #9440 from annando/one-click-follow 
Follow/Unfollow contact with a single click
 2020-10-20 11:09:56 -04:00
Michael
33575a94fa Follow/Unfollow contact with a single click 2020-10-20 03:49:58 +00:00
Hypolite Petovan
feabf80476
Merge pull request #9437 from nupplaphil/task/httprequest_head 
Add HTTPRequest::head() function
 2020-10-19 08:36:00 -04:00
Hypolite Petovan
335cd76baf
Merge pull request #9431 from annando/network-order 
Network: Fix continuous load issues
 2020-10-19 07:23:22 -04:00
Philipp
a74d88c4ee
Remove 'headers' option occurrences and add a warning if used. 2020-10-18 22:31:26 +02:00
Philipp
a6fc9cd32e
Remove $binary flag for HTTPRequest::get(), HTTPRequest::fetch(), HTTPRequest::fetchAll() (deprecated since PHP 5.1.3) 2020-10-18 20:56:31 +02:00
Michael
90b5421c01 Use $get 2020-10-18 04:05:52 +00:00
Michael Vogel
7db4fa6bf4
Apply suggestions from code review 
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
 2020-10-17 21:24:51 +02:00
Michael
14274bc204 Store the selected network tab in a session variable 2020-10-17 18:52:05 +00:00
Michael
a24ae975a9 Network: Fix continuous load issues 2020-10-17 07:31:03 +00:00
Hypolite Petovan
5abe069cba Remove Widget::accounts in favor of Widget::accounttypes 2020-10-13 22:30:40 -04:00
Hypolite Petovan
4d15cc01e2 Move network module to src/ 
- Update ForumManager to use a base URL
- Split network module into Conversation\Network and Search\Filed modules
- Implement boundaries pager in network module
- Allow no selection in filter widgets
 2020-10-13 07:52:13 -04:00
Hypolite Petovan
9537a6d0f7 Remove unused App->force_max_items property 2020-10-13 07:52:13 -04:00
Hypolite Petovan
4427876c05 Implement correct behavior for min_id in boundary pagination 
- The previous behavior of since_id systematically showed the most recent results
 2020-10-13 00:11:39 -04:00
Michael
dbdc8c91f6 Diaspora announce / Renaming share buttons 2020-10-11 19:58:28 +00:00
Hypolite Petovan
e3cf708dd8
Merge pull request #9401 from annando/accounttype 
Filter for account type for contacts
 2020-10-10 07:16:32 -04:00
Michael
b3e14fd07d Only allow editing of mail/feed contact details 2020-10-10 10:06:34 +00:00
Michael
4b9cbac23e Filter for account type for contacts 2020-10-09 19:08:50 +00:00
Michael
00974324fe Don't show failed contacts 2020-10-07 20:06:15 +00:00
Michael
a79f750a9e Fix refresh after comment/like 2020-10-07 04:01:52 +00:00
Michael
5998c3995e Issue-9358 (now for real) commenting and updating on contact now work 2020-10-06 18:47:23 +00:00
Michael
f255749c6a Issue 9358: liking and commenting on the community page now gives a feedback 2020-10-06 05:18:54 +00:00
Michael
6c3ffb75a6 Issue 9366: filter account types on the network page 2020-10-05 16:48:28 +00:00
Michael
cb5a9ae286 Issue 9363: Display the latest post update version 2020-10-04 20:46:42 +00:00
Hypolite Petovan
b812065499
Merge pull request #9343 from vinzv/9337-fix-pwa-manifest 
Adding bigger icons and updating one used for PWA
 2020-10-03 15:06:14 -04:00
Vinzenz Vietzke
b830c42ec1 Add link to 512px icon, fix missing link 2020-10-03 20:25:10 +02:00
Hypolite Petovan
2bfd9851d3
Merge pull request #9314 from annando/suggestions 
New function for contact suggestions
 2020-10-03 13:32:21 -04:00
Michael
d504789c34 Reduce the amount of contact updates 2020-10-03 10:52:34 +00:00
Vinzenz Vietzke
2d0e0cd310 Adding bigger icons and updating one used for PWA 2020-10-02 23:11:45 +02:00
Philipp
97f07b7518
Merge pull request #9334 from annando/endless-scroll 
Endless scrolling for searches and contact comments
 2020-10-01 23:04:56 +02:00
Michael Vogel
eacc806c4b
Merge pull request #9327 from nupplaphil/task/security_restructure 
Restructure Security classes
 2020-10-01 19:49:51 +02:00
Michael
88a0e976da Endless scrolling for searches and contact comments 2020-09-30 19:14:13 +00:00
Michael
5dd426f526 Added option to stay on the local machine when clicking on a contact link 2020-09-30 17:30:26 +00:00
Philipp
8318a0b640
Move ExAuth, FKOAuth1 & FKOAuthDataStore to own namespace Friendica\Security 2020-09-30 11:14:01 +02:00
Tobias Diekershoff
c06197377f
Merge pull request #9322 from annando/issue-9305 
Issue 9305: Relay deny tags are added
 2020-09-30 07:21:59 +02:00
Michael
15e61e78ac Issue 9305: Relay deny tags are added 2020-09-29 19:48:26 +00:00
Tobias Diekershoff
c317acc53b Hotfix releases were not detected in the admin panel 2020-09-29 08:06:05 +02:00
Michael
fb50a43ac0 New function for contact suggestions 2020-09-28 21:33:40 +00:00
Michael
52e150551e Fix notice "Undefined index: accounttype" 2020-09-28 11:27:48 +00:00
Hypolite Petovan
178e506917
Merge pull request #9304 from annando/suggestions 
Functionality to add suggestions
 2020-09-27 17:16:29 -04:00
Michael
61fee84c15 Functionality to add suggestions 2020-09-27 18:58:02 +00:00
Michael
7ca7bf2b35 Simplified code in the uexport 2020-09-27 14:08:41 +00:00
Tobias Diekershoff
96147d331b
Merge pull request #9293 from annando/issue-9288 
Issue 9288: Endless scrolling on the community page
 2020-09-27 14:26:52 +02:00
Michael
845ab4b764 Prevent empty fields on contact export via CSV 2020-09-27 10:27:31 +00:00
Michael
4ba42bc06a Issue 9281: User export now exports data 2020-09-27 10:24:15 +00:00
Michael
9586577c5a Restructured code 2020-09-27 05:46:07 +00:00
Michael
08016710d4 Unused code fragment removed 2020-09-27 05:31:39 +00:00
Michael
de9cd9881c We don't seem to need the date formatting 2020-09-27 05:27:52 +00:00
Michael
55aa9c1cca Issue 9288: Endless scrolling on the community page 2020-09-27 05:25:32 +00:00
Hypolite Petovan
f1830b84cd
Merge pull request #9287 from annando/fix-noscrape 
Fix: Noscrape hadn't always returned a key
 2020-09-26 16:26:45 -04:00
Michael Vogel
78b5be12a3 Fix: Noscrape hadn't always returned a key 2020-09-26 22:13:00 +02:00
Michael
3efbf1beb7 Fix notice 2020-09-26 18:59:31 +00:00
Michael
4a40a40ed1 Merge remote-tracking branch 'upstream/develop' into hide-sharer 2020-09-26 18:05:15 +00:00
Michael
c0ddcfb0cd Hide own contacts 2020-09-26 18:01:10 +00:00
Michael
3ffb90cf07 Improve naming, make widget collapsable 2020-09-26 14:13:14 +00:00
Hypolite Petovan
4657a8c97a
Merge pull request #9280 from annando/account-selector 
Account selector for the community page
 2020-09-26 08:45:28 -04:00
Michael
f936d93730 Moved "selected" check into the template 2020-09-26 12:13:30 +00:00
Michael
5a48002575 Account selector for the community page 2020-09-26 11:05:18 +00:00
Michael
b522f20702 Issue 9268: Don't show posts from followers on community page 2020-09-26 09:09:56 +00:00
Michael
b0c9c9b7cb Relay settings are now valid for the ActivityRelay as well 2020-09-22 15:48:44 +00:00
Hypolite Petovan
a852455d0e Merge remote-tracking branch 'friendica/stable' into develop 
# Conflicts:
#	composer.lock
 2020-09-20 15:32:58 -04:00
Hypolite Petovan
c8f385727e
Improve log message language in Module/Search/Index.php 
Co-authored-by: Steffen K9 <admin@libranet.de>
 2020-09-20 11:19:03 -04:00
Michael
2bd1e8cf65 Corrected comment 2020-09-20 09:38:31 +00:00
Michael
6bdc55e13e Issue 9246: Don't perform fulltext searches on URL 2020-09-20 09:37:05 +00:00
Michael
bf2ca5fcf9 Issue 9229: Show unfollow with known contacts 2020-09-19 20:47:05 +00:00
Michael
38635b1544 Issue 8961: Move default value for site settings to settings.config.php 2020-09-19 17:52:11 +00:00
Michael
e6884a934c Fix Notice: "Undefined variable: r" 2020-09-19 16:47:00 +00:00
Michael
6020e824a8 Don't set count to 0 2020-09-19 12:07:17 +00:00
Michael
86592daaa1 Include more field in the fulltext search 2020-09-19 10:45:11 +00:00
Michael
dfeae25e6d Issue 9231: Speed up full text search 2020-09-19 08:26:50 +00:00
Michael
03157cc2f2 Issue 9165: Make pager work for search 2020-09-17 21:10:59 +00:00
Michael
efb461583b Move default setting to the configuration file 2020-09-16 06:08:30 +00:00
Michael
351d14d6f5 Replaced the defunct relay server at another place as well 2020-09-16 05:29:33 +00:00
Michael
6a505372fa Changed name for the sample relay server 2020-09-16 05:20:38 +00:00
Philipp
cdb61be06f
Rewrite Process Model/Core 2020-09-15 18:16:44 +02:00
Tobias Diekershoff
56bbf9015a silkevicious found a typo 2020-09-15 15:38:31 +02:00
Hypolite Petovan
fe545cef74
Merge pull request #9184 from nupplaphil/task/asn1_composer 
Replace library/asn1.php & ASNValue with phpseclib
 2020-09-14 02:06:47 -04:00
Michael
50b5483ee1 Ability to set the database version 2020-09-13 15:57:24 +00:00
Philipp
11ef3895f5
Replace library/asn1.php with phpseclib 2020-09-12 20:44:36 +02:00
Hypolite Petovan
bbefc61a0c Use Arguments->getCommand() where it makes more sense than getQueryString() 
- Remove a couple of intermediary query string variables
 2020-09-12 09:09:15 -04:00
Hypolite Petovan
043e04f484 Remove confirm template obsolete uses (except for contacts) 
- Remove obsolete explode_querystring() function
- Remove $extra_inputs template variable
 2020-09-12 09:09:15 -04:00
Philipp
61014feec3
Fix ContactEndpoint & tests 2020-09-12 10:01:13 +02:00
Hypolite Petovan
fb7f7435c0 Merge branch 'bug/phpinfo-accessible-hotfix' into 2020.09-rc 
# Conflicts:
#	src/Module/Admin/DBSync.php
#	src/Module/Admin/Logs/Settings.php
#	src/Module/Admin/Themes/Details.php
#	src/Module/Admin/Themes/Embed.php
 2020-09-08 14:07:46 -04:00
Hypolite Petovan
ee8689cc89 Merge branch 'bug/phpinfo-accessible-hotfix' into develop 
# Conflicts:
#	src/Module/Admin/DBSync.php
#	src/Module/Admin/Logs/Settings.php
#	src/Module/Admin/Themes/Details.php
#	src/Module/Admin/Themes/Embed.php
 2020-09-08 14:06:14 -04:00
Hypolite Petovan
3efa8648c5 Fix security vulnerability in admin modules 
- The Module\BaseAdmin::post method checked credentials but didn't abort the process when it failed
- Created Module\BaseAdmin::checkAdminAccess method
 2020-09-08 12:27:43 -04:00
Hypolite Petovan
9bc2c5a52e Normalize use of form security tokens in Admin modules 
# Conflicts:
#	src/Module/Admin/Logs/Settings.php
 2020-09-08 12:27:36 -04:00
Hypolite Petovan
2ce15cae1a Use router parameters in Admin modules 
- Remove 10 @TODO tags

# Conflicts:
#	src/Module/Admin/DBSync.php
#	src/Module/Admin/Themes/Details.php
#	src/Module/Admin/Themes/Embed.php
 2020-09-08 12:27:15 -04:00
Michael
07ccfb212b Merge remote-tracking branch 'upstream/2020.09-rc' into api-count 2020-09-07 14:29:02 +00:00
Michael
f56e765158 Issue 9153 Use "info" instead of "notice" on successful operations 2020-09-07 10:17:42 +00:00
Michael
8d0d6bcd0c Issue 8882: Fixes permissions of pinned posts 2020-09-06 15:05:42 +00:00
Michael
db6282b5e2 API: Counts added, local query improved 2020-09-06 07:12:04 +00:00
Tobias Diekershoff
0bc4829af2
Merge pull request #9139 from annando/timeline-parameters 
API: Fix the timeline parameters
 2020-09-05 08:20:46 +02:00
Michael
c3ed31bb8f API: Fix the timeline parameters 2020-09-05 05:38:12 +00:00
Tobias Diekershoff
3a0e1eea04 Tyoi reported by silkevicious on Transifex 2020-09-04 14:17:58 +02:00
Michael Vogel
560746eb3b
Merge pull request #9125 from MrPetovan/bug/8999-fix-new-pm 
Fix new private message recipient input
 2020-09-03 21:45:31 +02:00