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

23514 Commits

Author SHA1 Message Date
Philipp 98bcb76d67
Merge pull request #7054 from AlfredSK/patch-1 
Fix parenthesis encoding in admin.php
 2019-04-28 11:59:05 +02:00
Steffen K9 0719f6436b
Fix parenthesis encoding in admin.php 
Parenthesis in admin, site, worker, frontend worker have wrong encoding.
 2019-04-28 11:02:11 +02:00
Michael Vogel 8f8730a39e
Merge pull request #7052 from MrPetovan/bug/atom-display-security 
Move item feed display after permission checking in mod/display
 2019-04-28 08:34:43 +02:00
Hypolite Petovan e0deb633f0 Move item feed display after permission checking in mod/display 2019-04-28 01:13:39 -04:00
Philipp 427a79056f
Merge pull request #7046 from friendica/MrPetovan-patch-httpExit-Module-Photo 
Fix "Illegal string offset 'title'/'description'" notice in Module\Photo
 2019-04-26 22:56:14 +02:00
Hypolite Petovan 71b221a84d
Fix "Illegal string offset 'title'/'description'" notice in Module\Photo 
See https://forum.friendi.ca/display/097d37de-265c-c35b-f385-e0b584714020
 2019-04-26 15:39:42 -04:00
Philipp 4276926d8d
Merge pull request #7045 from annando/ap-parse 
AP: Parsing of messages from Pleroma should work now again
 2019-04-26 12:24:33 +02:00
Michael eef85584c2 AP: Parsing of messages from Pleroma should work now again 2019-04-26 06:17:37 +00:00
Hypolite Petovan dc154ac07d
Merge pull request #7043 from annando/ap-workaround-context 
Workaround for systems who don't use a correct context in ActivityPub
 2019-04-25 10:01:54 -04:00
Michael af92f46a2d Workaround for systems who don't use a correct context in ActivityPub 2019-04-25 13:30:30 +00:00
Tobias Diekershoff a17eb1e04c
Merge pull request #7042 from annando/apcontact-update 
Follow up to #7036: Automatically update AP contacts
 2019-04-25 08:05:13 +02:00
Michael 0e29ec200f Follow up to #7036: Automatically update AP contacts 2019-04-25 05:24:53 +00:00
Michael Vogel 3f7b21ef28
Merge pull request #7041 from MrPetovan/bug/fatal-errors 
Remove failing require to non-existent file in Worker\CronJobs
 2019-04-25 04:04:25 +02:00
Hypolite Petovan 838f5762ac Remove failing require to non-existent file in Worker\CronJobs 2019-04-24 18:30:51 -04:00
Hypolite Petovan 9bc87e408f
Merge pull request #7039 from annando/api-reshare-quote 
API: Reshares and Quotes should now work in any combination
 2019-04-24 18:28:20 -04:00
Hypolite Petovan 27f86263c0
Merge pull request #7040 from annando/fix-ap-probe 
Probing of Pleroma contacts does work again
 2019-04-24 17:39:25 -04:00
Michael d4b7e00837 Cleaning up transmitted fields (only needed for the root entry) 2019-04-24 21:28:56 +00:00
Michael d778a29e04 Use all fields 2019-04-24 20:46:12 +00:00
Michael ffd6896bd2 Probing of Pleroma contacts does work again 2019-04-24 20:08:43 +00:00
Michael 9753ccab33 API: Reshares and Quotes should now work in any combination 2019-04-24 19:06:39 +00:00
Hypolite Petovan 3c2fc68891
Merge pull request #7035 from tobiasd/20190424-changelog 
updated CHANGELOG
 2019-04-24 11:01:30 -04:00
Hypolite Petovan 2d1e771178
Merge pull request #7029 from nupplaphil/task/mod_manifest 
Move mod/manifest to src/Module/Manifest
 2019-04-24 09:26:57 -04:00
Tobias Diekershoff bc639ff459 updated CHANGELOG 2019-04-24 10:04:40 +02:00
Philipp 2376399168
Merge pull request #7034 from annando/api-announce 
API: Fix the displaying of reshared posts
 2019-04-24 09:07:52 +02:00
Michael 3db9420ec7 Unify behaviour of friendica-author and friendica-owner 2019-04-24 05:22:31 +00:00
Michael dd7406f285 API: Fix the displaying of reshared posts 2019-04-24 04:26:23 +00:00
Hypolite Petovan 43bb4dce1b
Merge pull request #7033 from tobiasd/20190423-nodeinfo 
remove superfluous leftover require that broke the .well-known page
 2019-04-23 13:20:21 -04:00
Tobias Diekershoff bdc09f1c28 remove superfluous leftover require that broke the .well-known page 2019-04-23 19:03:03 +02:00
Hypolite Petovan 1573247db9
Merge pull request #7032 from tobiasd/20190423-lng 
CS, PL, PT-BR Translation updates
 2019-04-23 12:31:06 -04:00
Tobias Diekershoff 8ad42f4a04 Added Estonian translation THX Rain Hawk 2019-04-23 18:29:58 +02:00
Tobias Diekershoff e0131d21f0 CS translation update THX Aditoo 2019-04-23 18:24:08 +02:00
Tobias Diekershoff 2c18a59aa8 PL translation update THX waldis 2019-04-23 18:23:57 +02:00
Tobias Diekershoff 19ebc6301f update for PT BR thx Beatriz Vital 2019-04-23 18:23:33 +02:00
Hypolite Petovan 568ce4dd75
Merge pull request #7030 from nupplaphil/task/mod_nodeinfo 
Move mod/nodeinfo to src/Module/Nodeinfo
 2019-04-22 09:51:23 -04:00
Hypolite Petovan 0aa0ec2710
Merge pull request #7027 from nupplaphil/task/mod_statistics_json 
Moving mod/statistics_json to src/Module/Statistics_json
 2019-04-22 09:51:03 -04:00
Philipp Holzer dfa01f9265
typo 2019-04-22 14:22:45 +02:00
Philipp Holzer 5233434d94
proper split cronjob functions 2019-04-22 14:22:00 +02:00
Philipp Holzer c3205f2ac5
revert manifest template change 2019-04-22 14:12:21 +02:00
Philipp Holzer 6056081d5a
Move mod/nodeinfo to src/Module/Nodeinfo 2019-04-22 14:00:17 +02:00
Hypolite Petovan 86529ce6ae
Merge pull request #7028 from nupplaphil/task/mod_localtime 
Move mod/localtime to src/Module/Localtime
 2019-04-22 07:53:17 -04:00
Philipp Holzer ac96e1bf3e
Move mod/manifset to src/Module/Manifset 2019-04-22 12:48:40 +02:00
Philipp Holzer 300a7069f5
Move mod/localtime to src/Module/Localtime 2019-04-22 12:31:18 +02:00
Philipp Holzer 6503be8035
Moving mod/statistics_json to src/Module/Statistics_json 2019-04-22 10:38:34 +02:00
Hypolite Petovan fad8ff84b4
Merge pull request #7026 from annando/reshare-2 
Improved reshare check
 2019-04-21 15:13:09 -04:00
Michael d8ed5482aa Improved reshare check 2019-04-21 17:09:01 +00:00
Hypolite Petovan 7c140a9865
Merge pull request #7025 from nupplaphil/task/mod_babel 
Moving mod/babel to src/Module/babel
 2019-04-21 10:02:26 -04:00
Philipp Holzer 88f2d77786
Moving mod/babel to src/Module/babel 2019-04-21 15:17:04 +02:00
Hypolite Petovan 94e77f790d
Merge pull request #7022 from nupplaphil/feature/5011-APCu_cache 
Support for APCu caching
 2019-04-21 07:29:01 -04:00
Philipp Holzer bc8d444989
remove extraneous space 2019-04-21 12:45:50 +02:00
Philipp Holzer e604b3239d
fix travis tests 2019-04-21 12:45:46 +02:00