clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
20,670 Commits 3 Branches 0 Tags 183 MiB
Commit Graph

20670 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andreas Neustifter 09b7e217c7 [Suggestion] Move New User Tip Link (#5342) 
* Move new member tips to navigation bar.

The link looks so forlorn when its just somewhere in there. Put it in the nav bar.

* Style new member hints link propery.

* Make changes requested by @MrPetovan.
 2018-07-09 18:20:57 -04:00
Michael Vogel ff1074d38f
Merge pull request #5351 from nupplaphil/system_guid 
System guid
 2018-07-09 23:32:26 +02:00
Philipp Holzer e5c767d809
a new unittest for prefix 2018-07-09 22:15:11 +02:00
Philipp Holzer a84c94e94b
bugfix isempty... 2018-07-09 22:10:35 +02:00
Philipp Holzer d1eeaeead9
empty is not isset ... 2018-07-09 21:53:49 +02:00
Philipp Holzer 8c2258dd2e
switched back to origin TestCase structure 2018-07-09 21:48:47 +02:00
Philipp Holzer dbc38d4263
improved unittest 2018-07-09 21:40:38 +02:00
Philipp Holzer c829e43725
moved get_guid to System::createGUID 2018-07-09 21:38:16 +02:00
Hypolite Petovan 3a179860e5
Merge pull request #5346 from astifter/redirect_empty_group_to_contacts 
Redirect empty group to /contacts.
 2018-07-09 08:26:39 -04:00
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
Tobias Diekershoff b2844ead0d
Merge pull request #5343 from astifter/fix_relocate_button 
Fix relocate button label.
 2018-07-09 14:09:00 +02:00
Tobias Diekershoff 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
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