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

23497 Commits

Author SHA1 Message Date
Hypolite Petovan 838f5762ac Remove failing require to non-existent file in Worker\CronJobs 2019-04-24 18:30:51 -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 ffd6896bd2 Probing of Pleroma contacts does work again 2019-04-24 20:08:43 +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
Philipp Holzer 3ca8fa0e00
Support for APCu caching 2019-04-21 12:45:19 +02:00
Michael Vogel 9d3a131204
Merge pull request #7024 from MrPetovan/task/update-doc-requirements 
Update Friendica requirements in doc/
 2019-04-21 07:54:01 +02:00
Hypolite Petovan f2e1bcfc7d Update Friendica requirements in doc/ 
- Remove reference to PHP < 7.1
 2019-04-20 23:33:07 -04:00
Hypolite Petovan e9c230e109
Merge pull request #7018 from nupplaphil/feature/6245-Block_shell 
New Command "BlockedServers"
 2019-04-20 11:01:01 -04:00
Philipp Holzer 8660f6d86f
Rename BlockedServers to ServerBlock 2019-04-20 16:40:27 +02:00
Hypolite Petovan 5cf5274f51
Merge pull request #7019 from nupplaphil/features/6929-improve_redis 
New redis configuration
 2019-04-20 10:24:47 -04:00
Philipp Holzer e062baadf8
Fix redis cache lock driver test 2019-04-20 14:20:31 +02:00
Philipp Holzer b83e8683d8
Add default config for the new redis configuration 2019-04-20 13:44:27 +02:00
Philipp Holzer fa71a9a0ce
Improve redis configuration 
- basic authentication
- switch database (0 - 15)
 2019-04-20 13:40:40 +02:00
Philipp Holzer f05f02409e
Add update possibility to BlockedServers 2019-04-20 13:24:33 +02:00
Philipp Holzer 7ce76d153a
rename description to reason 2019-04-20 12:54:38 +02:00
Philipp Holzer 55d2473ec2
Add tests & default reason 2019-04-20 12:53:17 +02:00
Philipp Holzer e25f269aab
New command "BlockedServers" 2019-04-20 10:42:28 +02:00
Philipp 048501be34
Merge pull request #7017 from annando/reshare-known-contact 
Don't show a reshare in the top of a message if we know the author
 2019-04-19 15:09:34 +02:00
Michael 0d49d0593d Don't show a reshare in the top of a message if we know the author 2019-04-19 07:47:00 +00:00
Michael Vogel c72bac8928
Merge pull request #7011 from nupplaphil/issue/setlogger_fix 
SetLogger fix
 2019-04-17 09:52:55 +02:00
Philipp Holzer 0d08d5dabc
SetLogger fix 2019-04-14 18:40:39 +02:00