bitPickups/friendica_2019-12_sharedHosting_hotFix
1
1
Fork 0
Code Pull requests Activity
22787 commits 4 branches 62 tags 178 MiB
Commit graph

22787 commits

This branch
This branch
All branches
Author SHA1 Message Date
Hypolite Petovan 6aba6a3945
Merge pull request #6654 from tobiasd/20190214-pl 
PL translation update THX waldis
 2019-02-14 00:10:49 -05:00
Tobias Diekershoff f957ab1869 PL translation update THX waldis 2019-02-14 06:07:29 +01:00
Tobias Diekershoff 71a5568385
Merge pull request #6653 from rabuzarus/20190214_-_frio_manage_css 
frio - some small styling fixes for the manage page (badges, center name, paddings)
 2019-02-14 05:41:23 +01:00
rabuzarus ecc393e1c3 frio - some small styling fixes for the manage page (badges, center name, paddings) 2019-02-14 03:06:57 +01:00
Hypolite Petovan d101103b0b
Merge pull request #6651 from annando/config-mentions-removal 
New configuration to disable the automatic mentions removal
 2019-02-13 18:06:28 -05:00
Michael 41445a412d Changed description 2019-02-13 22:36:55 +00:00
Hypolite Petovan 3968005e22
Merge pull request #6650 from rabuzarus/20190213_-_fix_frio_linkpreview_for_display_module 
bugfix: linkPreview - remove s flag from regexp because FF don't support it
 2019-02-13 16:38:27 -05:00
rabuzarus b7573a94ee linkPreview - workaround for mising 's' flag ins js regex 2019-02-13 22:26:56 +01:00
Michael ca7ceb6fe2 We should return something ;-) 2019-02-13 17:26:54 +00:00
Michael d4baa25349 New configuration to disable the automatic mentions removal 2019-02-13 17:23:23 +00:00
Michael Vogel a29b6f17e2
Merge pull request #6649 from MrPetovan/bug/6647-include-newlines-in-implicit-mention-regex 
Include new lines in implicit mention regular expression
 2019-02-13 18:16:47 +01:00
rabuzarus f6691c138a bugfix: linkPreview - remove s flag from regexp because FF don't support it 2019-02-13 15:14:56 +01:00
Hypolite Petovan 63f083f6fb Include new lines in implicit mention regular expression 2019-02-13 08:08:46 -05:00
Hypolite Petovan d96ace0224
Merge pull request #6648 from annando/issue-6603 
Issue 6603: Events are now fetchable via AP
 2019-02-13 07:46:41 -05:00
Michael 73ecf2100e Indentions 2019-02-13 10:22:36 +00:00
Michael 44ac0275ab Issue 6603: Events are now fetchable via AP 2019-02-13 07:17:19 +00:00
Hypolite Petovan e9045dbe09
Merge pull request #6646 from annando/fix-loxk 
Should fix "DB Error 1205: Lock wait timeout exceeded"
 2019-02-12 16:26:27 -05:00
Michael 8cb2ab2a90 Should fix "DB Error 1205: Lock wait timeout exceeded; try restarting transaction" 2019-02-12 21:10:45 +00:00
Hypolite Petovan 276ad0072c
Merge pull request #6644 from tobiasd/20190212-librejs 
a step towards LibreJS compat
 2019-02-12 11:38:45 -05:00
Tobias Diekershoff df688aba0c forgotten quattro file 2019-02-12 17:27:46 +01:00
Tobias Diekershoff 207fc9c00b JS files of smoothy theme 2019-02-12 17:27:14 +01:00
Tobias Diekershoff 0ada36ecd6 JS files of quattro 2019-02-12 17:26:13 +01:00
Tobias Diekershoff 183560dd62 JS files of quattro theme 2019-02-12 17:25:16 +01:00
Tobias Diekershoff 29fcb2e7ee typo 2019-02-12 13:59:33 +01:00
Hypolite Petovan f89e9afe62
Merge pull request #6643 from tobiasd/20190212-examplehomehtml 
added AP to the example home.html file
 2019-02-12 07:30:24 -05:00
Tobias Diekershoff d2243a1c35 tagged the inline JS in head.tpl with the license 2019-02-12 11:30:45 +01:00
Tobias Diekershoff 173a17d0e0 tagged the JS files in view/js with their licenses 2019-02-12 11:29:50 +01:00
Tobias Diekershoff 769ee12a92 added AP to the example home.html file 2019-02-12 09:20:28 +01:00
Tobias Diekershoff 48d5186dce
Merge pull request #6642 from annando/worker-timezone 
Ensure that "strtotime" returns the correct timestamp
 2019-02-12 08:50:32 +01:00
Michael f6e8246e75 Ensure that "strtotime" returns the correct timestamp 2019-02-12 06:42:45 +00:00
Hypolite Petovan 5cf5f33a1c
Merge pull request #6640 from annando/worker-stats 
Fix worker statistics
 2019-02-11 22:00:55 -05:00
Hypolite Petovan 58dff940ff
Merge pull request #6639 from annando/delete-removal 
Don't send single item deletions to protocols that support account removal
 2019-02-11 18:15:42 -05:00
Michael 742b472994 Fix: Workerqueue processes had been killed too early 2019-02-11 22:39:59 +00:00
Michael 6fd8b5f365 Don't send single item delete commands to protocols that support account removal 2019-02-11 20:30:08 +00:00
Hypolite Petovan d6a82c6c2d
Merge pull request #6638 from Ixiter/develop-markdown-anchors 
ACL network - fixed preselected acl items
 2019-02-11 07:23:32 -05:00
Peter Liebetrau 3dede5dbd2 ACL network - fixed preselected acl items 2019-02-11 10:00:42 +01:00
Michael f65b35901e Fix worker statistics 2019-02-11 08:59:14 +00:00
Tobias Diekershoff f786e8984f
Merge pull request #6637 from annando/fix-jpm 
Fix: Corected config value name
 2019-02-11 09:57:27 +01:00
Michael 5fc6c0ef38 Fix: Corected config value name 2019-02-11 04:39:24 +00:00
Hypolite Petovan b5dcca995c
Merge pull request #6632 from annando/check-follow 
Prevent multiple send follow requests
 2019-02-10 21:19:31 -05:00
Hypolite Petovan db607de8cf
Merge pull request #6634 from tobiasd/20190210-crepairwarning 
style the warning in crepair
 2019-02-10 21:17:41 -05:00
Michael da53206655 Revert the storing of the "follow" activity 2019-02-10 22:08:48 +00:00
Michael abda71ac01 The "follow" activity is now stored in the "item-activity" table 2019-02-10 22:06:27 +00:00
Tobias Diekershoff 6b5993591b style the warning in crepair 2019-02-10 20:05:29 +01:00
Michael 3b7e9cc3a2 This now should really prevent sending the follow requests only once 2019-02-10 18:59:05 +00:00
Michael 04f34de3a1 Multiples follows shouldn't be send anymore 2019-02-10 18:42:51 +00:00
Michael Vogel 128187dadd
Merge pull request #6631 from tobiasd/20190210-de 
DE translation update
 2019-02-10 19:27:18 +01:00
Tobias Diekershoff a90bc4e941 DE translation update 2019-02-10 19:17:07 +01:00
Michael 58eaf0ba1c Prevent multiple send follow requests 2019-02-10 18:03:01 +00:00
Hypolite Petovan 3a9217049b
Merge pull request #6627 from annando/check-follow 
Don't store multiple follow request from a single person
 2019-02-10 13:01:52 -05:00