marcusxs/friendica
1
0
Fork 0
forked from friendica/friendica
Code Pull requests Activity
21,100 commits 3 branches 67 tags 205 MiB
Commit graph

21,100 commits

This branch
This branch
All branches
Author SHA1 Message Date
Michael
675a6adf35 Added comment 2018-07-08 13:52:11 +00:00
Michael
6d90751110 Added missing "use 2018-07-08 13:39:48 +00:00
Hypolite Petovan
b5a009c170
 		Merge pull request #5339 from nupplaphil/redis_serialize 
Redis serialize
 2018-07-08 09:35:55 -04:00
Michael
1d745c25a7 Some more places ... 2018-07-08 12:58:43 +00:00
Michael
8a2230bc4c Avoid warnings in addons 2018-07-08 12:01:36 +00:00
Michael
7d6933c898 Avoid "Trying to get property of non-object" 2018-07-08 11:46:05 +00:00
Philipp Holzer
269221f013
 		Merge branch 'develop' of https://github.com/friendica/friendica into redis_serialize 2018-07-08 13:36:05 +02:00
Philipp Holzer
be83696f02
 		Redis serialize instead of json because of objects 2018-07-08 13:35:28 +02:00
Michael
3e797547a3 Warnings fixed 2018-07-08 09:37:05 +00:00
Michael Vogel
c6efbcd1aa
 		Merge pull request #5332 from annando/fix-lock 
urgent bugfix: Wrong function name for locks
 2018-07-08 11:35:21 +02:00
Michael
c25c3b5981 urgent bugfix: Wrong function name for locks 2018-07-08 08:32:50 +00:00
Hypolite Petovan
1c3bed1777
 		Merge pull request #5328 from annando/item-activities 
Item activities are now stored in a separate table
 2018-07-08 01:54:32 -04:00
Michael
c2d4b557ae Only build tag and file when really needed 2018-07-08 05:44:35 +00:00
Michael
69db696ab1 Improve test behaviour 2018-07-08 05:29:06 +00:00
Michael
271b6cb8f9 Hopefully this fixes the tests 2018-07-08 05:10:45 +00:00
Michael
74d5eec571 Merge branch 'item-activities' of github.com:annando/friendica into item-activities 2018-07-08 04:56:35 +00:00
Michael
5ee2db8a16 Avoid undefined index 2018-07-08 04:55:45 +00:00
Michael Vogel
ff5ee74ecf
 		Merge branch 'develop' into item-activities 2018-07-08 06:35:50 +02:00
Michael
43a7a1647d Update version number 2018-07-07 23:53:30 +00:00
Michael
3760456284 We already used DB version 1275 (Why hadn't been there a merge conflict?) 2018-07-07 23:52:02 +00:00
Michael
75aa831b32 Better not check too strict 2018-07-07 23:31:30 +00:00
Michael
4673560c55 Don't use isset 2018-07-07 23:19:28 +00:00
Michael
4467dd4972 Clear legacy item fields 2018-07-07 23:03:28 +00:00
Michael
afa194200b Fix: Ensure that the value is set. 2018-07-07 19:39:00 +00:00
Hypolite Petovan
5f1b5f82ad
 		Merge pull request #5331 from nupplaphil/lock_tests_fixings 
Lock fixings & unittests
 2018-07-07 15:03:01 -04:00
Philipp Holzer
ff24d0d567
 		code-standards wrap operators with spaces 2018-07-07 20:51:08 +02:00
Philipp Holzer
1e96faca4c
 		removed memcache unit-test because lack of support in travis 2018-07-07 20:42:44 +02:00
Philipp Holzer
3cde7a3e4b
 		Fixed & added unittests 2018-07-07 20:35:42 +02:00
Michael
4d35e228c4 More item abstraction / making remote deletion work again 2018-07-07 18:14:16 +00:00
Philipp Holzer
065b83d148
 		Fixed memcache & unittests 2018-07-07 20:07:07 +02:00
Philipp Holzer
80a4e6263f
 		Added Unittests for cache 
fixed Lock & Cache bugs
 2018-07-07 19:46:16 +02:00
Philipp Holzer
1dafaa69c5
 		bug in memcached clear function 2018-07-07 18:43:55 +02:00
Philipp Holzer
f95c420801
 		bug in redis delete function 2018-07-07 18:39:33 +02:00
Michael
d6af9515ba Avoid storing an icid value when iaid is stored/Fix item retraction 2018-07-07 16:38:01 +00:00
Philipp Holzer
6ecaa5b15a
 		copy&paste error for memcached unittest 2018-07-07 18:12:17 +02:00
Philipp Holzer
f61aa2a3ee
 		fixed locks in database.sql 2018-07-07 17:59:22 +02:00
Philipp Holzer
1ffe0cfd81
 		Added Lock Unittests & Bugfixings 
Added Redis Lock Unittests
Added Memcached Lock Unittests

Fixed a bug in dba
Fixed a bug in RedisLock
 2018-07-07 16:15:03 +02:00
Michael
575662c2d7 Just some code cleanup 2018-07-07 11:39:37 +00:00
Michael Vogel
e719a25082
 		Merge pull request #5329 from tobiasd/20180707-cs 
CS translation update THX Aditoo
 2018-07-07 12:45:24 +02:00
Michael
3389e9b213 Removing of likes should work now on comments as well 2018-07-07 10:43:43 +00:00
Tobias Diekershoff
ba7505f12f CS translation update THX Aditoo 2018-07-07 11:22:18 +02:00
Michael
b421e7708f Removing of orphaned activity and content data 2018-07-07 07:43:13 +00:00
Michael
9e262e6157 Better handling of empty content 2018-07-06 22:08:41 +00:00
Michael Vogel
3eec97aa6e
 		Merge pull request #5314 from MrPetovan/task/4889-fix-tests 
Fix tests after enabling PHP Notices
 2018-07-06 22:14:01 +02:00
Hypolite Petovan
54707dd4c8
 		Merge pull request #5327 from tobiasd/20180706-issue4753 
admins can forbid some nicknames from being registered
 2018-07-06 09:59:34 -04:00
Tobias Diekershoff
a49e094308 added forgotten trim 2018-07-06 15:49:27 +02:00
Tobias Diekershoff
72638acac3 admins can forbid some nicknames from being registered 2018-07-06 15:32:56 +02:00
Hypolite Petovan
0558be2d12
 		Merge pull request #5326 from tobiasd/20180706-cs 
CS translation update THX Aditoo
 2018-07-06 08:08:47 -04:00
Michael
0c51159111 New index that is needed for the expiry 2018-07-06 06:46:44 +00:00
Michael
7f78540454 Expire does work now for activities as well 2018-07-06 06:45:30 +00:00