Commit graph

22822 commits

Author SHA1 Message Date
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
Michael 7939cacc44 The function moved from the user to the contact class 2019-02-10 17:19:10 +00:00
Hypolite Petovan bc60e07529
Merge pull request #6626 from nupplaphil/config_test
Config tests
2019-02-10 07:36:25 -05:00
Philipp Holzer 199ceeadbf
Adding ConfigCacheLoaderTest 2019-02-10 13:39:48 +01:00
Michael 758eabd2f6 Removed test output 2019-02-10 12:21:16 +00:00
Michael Vogel 14045932df
Merge pull request #6624 from tobiasd/20190210-lng
CS and DE translation update
2019-02-10 12:58:21 +01:00
Michael Vogel 312a9f3f39
Merge pull request #6623 from tobiasd/20190210-msg
regen messages.po
2019-02-10 12:57:36 +01:00
Michael Vogel e17b333b34
Merge pull request #6625 from tobiasd/20190210-doc5178
img tag documentation update
2019-02-10 12:57:08 +01:00
Philipp Holzer 2a42f8dded
Adding ConfigCacheTest 2019-02-10 12:30:13 +01:00
Michael f88a1c0b51 Merge branch 'check-follow' of github.com:annando/friendica into develop 2019-02-10 11:29:58 +00:00
Michael cf3a46b126 Don't store multiple follow request from a single person 2019-02-10 11:28:17 +00:00
Tobias Diekershoff f6855e893a img tag documentation update 2019-02-10 08:40:47 +01:00
Tobias Diekershoff 01b0a5b331 DE translation update 2019-02-10 08:33:31 +01:00
Tobias Diekershoff 0599f168e8 CS translation update THX Aditoo 2019-02-10 08:23:13 +01:00
Tobias Diekershoff e6de848622 regen messages.po 2019-02-10 08:15:23 +01:00
Tobias Diekershoff b6e2c254fb
Merge pull request #6616 from m4sk1n/patch-1
fix typo
2019-02-10 08:12:58 +01:00