Commit graph

20161 commits

Author SHA1 Message Date
Hypolite Petovan
e93f4e5c0c
Merge pull request #5348 from astifter/use_h3_for_showing_contacts
Use h3 instead of h4 in contacts block
2018-07-09 08:21:43 -04:00
b2844ead0d
Merge pull request #5343 from astifter/fix_relocate_button
Fix relocate button label.
2018-07-09 14:09:00 +02:00
0f10a2ab74
Merge pull request #5344 from astifter/improve_nginx_sample
Improve nginx Configuration Sample
2018-07-09 13:59:38 +02:00
Andreas Neustifter
5765b8d498 Redirect empty group to /contacts.
The empty /group page is not really doing anything, redirect to /contacts.
2018-07-09 12:42:32 +02:00
Andreas Neustifter
56b6adc396 Fix relocate button label.
In settings the 'Start Relocate' button is also labeld 'Save Settings'.
2018-07-09 12:42:32 +02:00
Andreas Neustifter
6a85b34504 [nginx] Use try_file instead of if.
See https://www.nginx.com/resources/wiki/start/topics/tutorials/config_pitfalls/?utm_source=tool.lu#check-if-file-exists.
2018-07-09 12:42:32 +02:00
Andreas Neustifter
79a8320fed [nginx] Use try_files instead of if for /.well-known/.
See https://www.nginx.com/resources/wiki/start/topics/depth/ifisevil/
2018-07-09 12:42:32 +02:00
Andreas Neustifter
f44cb1ccce [nginx] Move together deny blocks. 2018-07-09 12:42:32 +02:00
Andreas Neustifter
cb600b5a5f [nginx] Readd option to statically server pictures. 2018-07-09 12:42:32 +02:00
Andreas Neustifter
92f47f8eca [nginx] Fix indentation. 2018-07-09 12:42:32 +02:00
Andreas Neustifter
d442024c0e Make sure contacs header is same size as everything in aside.
All the widgets in asside have h3 for their headers, use this for showing contacts too.
2018-07-09 12:42:31 +02:00
Hypolite Petovan
7211fc4f1a
Merge pull request #5338 from annando/warnings
Remove warnings
2018-07-08 09:55:26 -04:00
675a6adf35 Added comment 2018-07-08 13:52:11 +00:00
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
1d745c25a7 Some more places ... 2018-07-08 12:58:43 +00:00
8a2230bc4c Avoid warnings in addons 2018-07-08 12:01:36 +00:00
7d6933c898 Avoid "Trying to get property of non-object" 2018-07-08 11:46:05 +00:00
269221f013
Merge branch 'develop' of https://github.com/friendica/friendica into redis_serialize 2018-07-08 13:36:05 +02:00
be83696f02
Redis serialize instead of json because of objects 2018-07-08 13:35:28 +02:00
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
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
c2d4b557ae Only build tag and file when really needed 2018-07-08 05:44:35 +00:00
69db696ab1 Improve test behaviour 2018-07-08 05:29:06 +00:00
271b6cb8f9 Hopefully this fixes the tests 2018-07-08 05:10:45 +00:00
74d5eec571 Merge branch 'item-activities' of github.com:annando/friendica into item-activities 2018-07-08 04:56:35 +00:00
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
43a7a1647d Update version number 2018-07-07 23:53:30 +00:00
3760456284 We already used DB version 1275 (Why hadn't been there a merge conflict?) 2018-07-07 23:52:02 +00:00
75aa831b32 Better not check too strict 2018-07-07 23:31:30 +00:00
4673560c55 Don't use isset 2018-07-07 23:19:28 +00:00
4467dd4972 Clear legacy item fields 2018-07-07 23:03:28 +00:00
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
ff24d0d567
code-standards wrap operators with spaces 2018-07-07 20:51:08 +02:00
1e96faca4c
removed memcache unit-test because lack of support in travis 2018-07-07 20:42:44 +02:00
3cde7a3e4b
Fixed & added unittests 2018-07-07 20:35:42 +02:00
4d35e228c4 More item abstraction / making remote deletion work again 2018-07-07 18:14:16 +00:00
065b83d148
Fixed memcache & unittests 2018-07-07 20:07:07 +02:00
80a4e6263f
Added Unittests for cache
fixed Lock & Cache bugs
2018-07-07 19:46:16 +02:00
1dafaa69c5
bug in memcached clear function 2018-07-07 18:43:55 +02:00
f95c420801
bug in redis delete function 2018-07-07 18:39:33 +02:00
d6af9515ba Avoid storing an icid value when iaid is stored/Fix item retraction 2018-07-07 16:38:01 +00:00
6ecaa5b15a
copy&paste error for memcached unittest 2018-07-07 18:12:17 +02:00
f61aa2a3ee
fixed locks in database.sql 2018-07-07 17:59:22 +02:00
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
575662c2d7 Just some code cleanup 2018-07-07 11:39:37 +00:00