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

22966 Commits

Author SHA1 Message Date
Tobias Diekershoff be1c3fe3ed German ... m) 2019-02-27 18:10:37 +01:00
Tobias Diekershoff 5546215654 added DiCa and Fedilab clients to the FAQ listed clients 2019-02-27 16:33:18 +01:00
Philipp f4dfd4f649
Merge pull request #6767 from MrPetovan/bug/fatal-errors 
Replace isset by array_key_exists on array class constant in Model\Term
 2019-02-27 14:20:25 +01:00
Hypolite Petovan 7684eae0c0
Merge pull request #6765 from nupplaphil/issue/6672-global_comm_silence 
Hide silenced authors from public timeline
 2019-02-27 08:04:57 -05:00
Hypolite Petovan 7217d24a97 Replace isset by array_key_exists on array class constant in Model\Term 
- Addresses https://github.com/friendica/friendica/issues/6386#issuecomment-467835406
 2019-02-27 08:00:04 -05:00
Tobias Diekershoff 2354184360
Merge pull request #6766 from nupplaphil/task/test_fix_namespace 
Fix namespaces for Tests
 2019-02-27 13:09:20 +01:00
Philipp Holzer def502ae2d
Fix namespaces 2019-02-27 12:32:56 +01:00
Philipp Holzer 4c11255624
Hide silenced authors from public timeline 2019-02-27 11:41:57 +01:00
Tobias Diekershoff 1f27290494
Merge pull request #6764 from annando/worker2 
Better worker lifetime check
 2019-02-27 11:06:38 +01:00
Michael c3b12b63c8 Added some description, changed logger call 2019-02-27 09:49:26 +00:00
Michael 505a34d40e Log the time as decimal 2019-02-27 09:12:40 +00:00
Michael 78960d4bde Removed unneeded spaces 2019-02-27 09:11:37 +00:00
Michael 5e440aa035 The cron interval is minutes - so we have to convert it into seconds 2019-02-27 08:55:25 +00:00
Michael 0ee1ea5f29 The log text is now shorter 2019-02-27 08:41:45 +00:00
Michael 11e39da6cc And moving the block back to the old place 2019-02-27 07:08:44 +00:00
Michael e1cc7262de Respawing when quitting 2019-02-27 07:04:21 +00:00
Michael 528636c9f4 Using constants is nicer 2019-02-27 06:55:04 +00:00
Michael fb371e1048 Merge remote-tracking branch 'upstream/2019.03-RC' into worker2 2019-02-27 06:41:14 +00:00
Michael 40573120b9 Enhanced logging, stopping worker after cron lifetime 2019-02-27 06:36:19 +00:00
Hypolite Petovan ef0e734c82
Merge pull request #6761 from tobiasd/20190226-6532 
fixing links in photoMenu
 2019-02-26 07:02:15 -05:00
Tobias Diekershoff bd7aaacfb0 fixing links in photoMenu 2019-02-26 10:19:08 +01:00
Tobias Diekershoff c62a3700ea
Merge pull request #6759 from MrPetovan/task/composer 
[Composer] Update npm-asset/fullcalendar to version 3.10.0
 2019-02-26 06:28:23 +01:00
Hypolite Petovan 39ff7de065 [Composer] Update npm-asset/fullcalendar to version 3.10.0 
- Add now required explicit npm-asset/moment dependency for npm-asset/fullcalendar to work
 2019-02-25 21:06:18 -05:00
Tobias Diekershoff c3b7ce349d
Merge pull request #6758 from MrPetovan/bug/notices 
Fix various notice messages
 2019-02-25 14:33:42 +01:00
Hypolite Petovan 97eb2ba053 Fix possibly undefined after index in Text\BBCode 2019-02-25 07:12:01 -05:00
Hypolite Petovan 05d8bf6b54 Fix wrong use of array_shift in Core\Worker 2019-02-25 07:11:35 -05:00
Philipp 4f300e41b4
Merge pull request #6755 from MrPetovan/bug/notices 
Protect access to rel attribute in Network\Probe
 2019-02-25 10:10:41 +01:00
Hypolite Petovan f597f3b378 Protect access to rel attribute in Network\Probe 2019-02-25 03:39:40 -05:00
Michael Vogel 230c0a50e8
Merge pull request #6753 from MrPetovan/bug/notices 
Add missing author contact in ActivityPub\Processor
 2019-02-25 09:31:31 +01:00
Hypolite Petovan 3e290da8c2 Code standards: Add missing space in ActivityPub\Processor 2019-02-25 03:16:18 -05:00
Philipp 119bf0dc6a
Merge pull request #6754 from tobiasd/20190225-fr 
update FR translations THX hypolite
 2019-02-25 08:25:00 +01:00
Tobias Diekershoff 7a73b63fc8 update FR translations THX hypolite 2019-02-25 07:49:33 +01:00
Hypolite Petovan 1f6e0f168c Add missing author contact in ActivityPub\Processor 
- Add logging for future occurrences
- Addresses https://github.com/friendica/friendica/issues/6338#issuecomment-466812104
 2019-02-24 15:52:03 -05:00
Michael Vogel 4c6c5786ad
Merge pull request #6752 from MrPetovan/bug/notices 
Fix various notices
 2019-02-24 21:30:07 +01:00
Michael Vogel 69777c275b
Merge pull request #6751 from MrPetovan/bug/fatal-errors 
Add missing use statement in Model\Term
 2019-02-24 21:07:13 +01:00
Hypolite Petovan f95f6eced9 Add scheme input protection in frio/config.php 
- Addresses https://github.com/friendica/friendica/issues/6338#issuecomment-464912016
 2019-02-24 14:32:51 -05:00
Hypolite Petovan e66768a058 Add empty entry author if contact query fails in DFRN 
- Addresses https://github.com/friendica/friendica/issues/6338#issuecomment-462722599
 2019-02-24 14:00:40 -05:00
Hypolite Petovan 0888850702 Fix missing avatar key in DFRN 
- Addresses https://github.com/friendica/friendica/issues/6338#issuecomment-456839092
 2019-02-24 13:40:04 -05:00
Hypolite Petovan 42c06506ce Stop appending entry when parent is missing in OStatus 
- Addresses https://github.com/friendica/friendica/issues/6338#issuecomment-455785854
 2019-02-24 13:36:37 -05:00
Hypolite Petovan 82072bae46 Add missing use statement in Model\Term 2019-02-24 13:33:11 -05:00
Hypolite Petovan 458064ddde
Merge pull request #6749 from nupplaphil/6386-php_fatal 
Fixing appending child at DFRN without a parent id.
 2019-02-24 12:55:34 -05:00
Philipp Holzer 5d13b94761
update phpdoc 2019-02-24 16:31:16 +01:00
Hypolite Petovan 8adc761da0
Merge pull request #6747 from nupplaphil/issue/6677-frio_admin 
Fixing frio theme customization for admin
 2019-02-24 10:30:37 -05:00
Philipp Holzer bf6a765beb
Fixing appending child at DFRN without a parent id. 2019-02-24 16:30:09 +01:00
Philipp Holzer 758444a7d2
empty is better than isset 2019-02-24 15:48:30 +01:00
Michael Vogel efe358c617
Merge pull request #6746 from nupplaphil/issue/6338-notices 
Fixing notices
 2019-02-24 15:44:54 +01:00
Michael Vogel fa5525d084
Merge pull request #6726 from MrPetovan/task/6676-fix-implicit-mentions 
Fix last batch of implicit mentions issues
 2019-02-24 15:40:11 +01:00
Philipp Holzer da4fc0411e
Fixing admin scheme-change in frio 2019-02-24 15:40:05 +01:00
Philipp Holzer 5b932867c3
Fixing https://github.com/friendica/friendica/issues/6338#issuecomment-466749280 2019-02-24 15:22:14 +01:00
Philipp Holzer fe74db6311
Fixing https://github.com/friendica/friendica/issues/6338#issuecomment-458030934 2019-02-24 15:15:25 +01:00