Andy H3
|
80a990a7d5
|
Update sample-nginx.config
Added buffers and buffer size
|
2018-11-19 23:26:34 +07:00 |
|
|
AndyHee
|
735cb7c6c1
|
Merge remote-tracking branch 'upstream/develop' into develop
|
2018-11-19 21:54:56 +07:00 |
|
Tobias Diekershoff
|
6da7d89a09
|
Merge pull request #6166 from annando/dbclean
The expiry of conversations can now be configured in the admin panel
|
2018-11-19 12:01:11 +01:00 |
|
Michael
|
b486e48cd6
|
14 days
|
2018-11-19 10:02:44 +00:00 |
|
|
Michael
|
ad3502078f
|
Merge remote-tracking branch 'upstream/develop' into dbclean
|
2018-11-19 10:01:09 +00:00 |
|
|
Tobias Diekershoff
|
ef1813b88e
|
Merge pull request #6165 from annando/default-features
Several default features are now in the core
|
2018-11-19 10:34:51 +01:00 |
|
|
Michael
|
191c1a400a
|
The expiry of conversations can now be configured in the admin panel
|
2018-11-19 06:58:46 +00:00 |
|
|
Michael
|
503c78e3ef
|
Another try to make tests run again
|
2018-11-18 20:59:40 +00:00 |
|
|
Michael
|
68936e8fc0
|
Possibly fix test
|
2018-11-18 20:40:10 +00:00 |
|
|
Michael
|
43079bfaf8
|
Several default features are now in the core
|
2018-11-18 20:13:46 +00:00 |
|
|
Tobias Diekershoff
|
e17dc56af9
|
Merge pull request #6163 from hoergen/socke
[Doc] Rearranged and wrote some parts new and more coherent.
|
2018-11-18 14:11:40 +01:00 |
|
hoergen
|
6153fd552b
|
added linebreak and markdown url
|
2018-11-18 14:05:46 +01:00 |
|
Hypolite Petovan
|
75398b96d5
|
Merge pull request #6164 from annando/network-protocols
Networks are now protocols
|
2018-11-18 07:47:10 -05:00 |
|
|
Michael
|
0ad71ebbbc
|
Networks are now protocols
|
2018-11-18 12:44:01 +00:00 |
|
|
Tobias Diekershoff
|
e086f05aa4
|
Merge pull request #6162 from JonnyTischbein/issue_delete_comment_from_guid
Delete comment from its guid and return to parent guid
|
2018-11-18 13:34:51 +01:00 |
|
|
hoergen
|
a3fd0e4f7a
|
[Doc]removed bold from keyword
|
2018-11-18 13:13:07 +01:00 |
|
|
hoergen
|
ad07525a9f
|
Rearranged and wrote some parts new and more coherent.
|
2018-11-18 12:50:23 +01:00 |
|
Jonny Tischbein
|
a36a780b99
|
Add fallback if comment as no parent
|
2018-11-18 12:46:21 +01:00 |
|
|
Jonny Tischbein
|
5d464c353f
|
Delete comment from its guid and return to parent guid
|
2018-11-18 12:43:26 +01:00 |
|
Michael Vogel
|
9dfc970bd6
|
Merge pull request #6144 from Alkarex/ATOM-self
Correct self attribute in ATOM feeds
|
2018-11-18 12:31:15 +01:00 |
|
|
AndyHee
|
db441ca1ce
|
Merge remote-tracking branch 'upstream/develop' into develop
|
2018-11-18 10:44:32 +07:00 |
|
|
Hypolite Petovan
|
2456a66597
|
Merge pull request #6160 from annando/item-delete
Allow to delete every post, even public ones
|
2018-11-17 19:27:12 -05:00 |
|
|
Michael
|
e2ea4a3dc3
|
Allow to delete every post, even public ones
|
2018-11-17 22:56:28 +00:00 |
|
|
Hypolite Petovan
|
a0589676e8
|
Merge pull request #6159 from JonnyTischbein/issue_photo_permisson_upload_to_album
[frio] Fix setting permisson as post for uploaded photo in album via modal create post
|
2018-11-17 14:13:32 -05:00 |
|
|
Hypolite Petovan
|
807afa3059
|
Merge pull request #6158 from tobiasd/20181117-contactedittab
Add link to user groups from /contact
|
2018-11-17 14:12:30 -05:00 |
|
|
Jonny Tischbein
|
7c690c93bb
|
Fix setting permisson as post for uploaded photo in album via modal create post
|
2018-11-17 19:14:59 +01:00 |
|
|
Tobias Diekershoff
|
6be831fd32
|
Add link to user groups from /contact
There was no way to get to the contact group editor from the contact overview.
Additionally the documentation about the used accesskeys was updated.
|
2018-11-17 18:33:12 +01:00 |
|
|
Hypolite Petovan
|
22fedc9a1a
|
Merge pull request #6152 from JonnyTischbein/issue_delete_from_saved_folder
Fix deleting last element and displaying empty saved folder
|
2018-11-17 11:59:24 -05:00 |
|
|
Hypolite Petovan
|
e11f9d5a8e
|
Merge pull request #6156 from tobiasd/20181117-vagrantsql
recreated SQL file for Vagrant VM from current DB structure
|
2018-11-17 11:37:22 -05:00 |
|
|
Tobias Diekershoff
|
381474f314
|
Merge pull request #6155 from fabrixxm/issues/localredirect
Use appropriate redirect in dfrn_poll
|
2018-11-17 17:36:04 +01:00 |
|
|
Jonny Tischbein
|
590fbe8c6f
|
More Code Standard
|
2018-11-17 17:27:12 +01:00 |
|
|
Jonny Tischbein
|
4f8e50d834
|
Code Standard
|
2018-11-17 17:24:30 +01:00 |
|
|
Tobias Diekershoff
|
0780dccf4f
|
recreated SQL file for Vagrant VM from current DB structure
|
2018-11-17 16:25:51 +01:00 |
|
fabrixxm
|
1e9e06a325
|
Use appropriate redirect in dfrn_poll
Got an error while remote auth to a local user, where $destination_url
is relative.
|
2018-11-17 16:12:45 +01:00 |
|
|
Jonny Tischbein
|
458b0f3545
|
Change how to decide between empty update and not called field file
|
2018-11-17 16:04:54 +01:00 |
|
|
Hypolite Petovan
|
f5d58d07e1
|
Merge pull request #6154 from JonnyTischbein/issue_open_commentbox_post_with_replies
[frio] Fix opening comment box when Post has replies
|
2018-11-17 10:01:05 -05:00 |
|
|
Hypolite Petovan
|
ce82f5cec9
|
Merge pull request #6147 from Alkarex/stylesheet-path-html-encoding
Fix lack of HTML encoding for stylesheet link
|
2018-11-17 09:55:26 -05:00 |
|
|
Hypolite Petovan
|
9c2ba6abe9
|
Merge pull request #6153 from JonnyTischbein/issue_return_delete_comments
Fix return url when delete comment from display
|
2018-11-17 09:54:47 -05:00 |
|
|
Jonny Tischbein
|
dd7d556c86
|
Fix opening comment box when Post has replies
|
2018-11-17 15:53:34 +01:00 |
|
Alexandre Alapetite
|
4d092872a5
|
Escaping moved to template
https://github.com/friendica/friendica/pull/6147#pullrequestreview-176051481
|
2018-11-17 14:01:07 +01:00 |
|
|
Jonny Tischbein
|
cf9c3444bc
|
Fix return url when delete comment from display
|
2018-11-17 13:56:58 +01:00 |
|
|
Jonny Tischbein
|
56406b9910
|
Fix SQL Error if no items where found + Fix setting to null
|
2018-11-17 13:22:32 +01:00 |
|
|
Hypolite Petovan
|
9e25270699
|
Merge pull request #6145 from Alkarex/ATOM-title-encoding
Fix ATOM feed entry titles encoding
|
2018-11-17 07:01:53 -05:00 |
|
|
Hypolite Petovan
|
3e1e2d3071
|
Merge pull request #6146 from Alkarex/atom-link-title-dfrn
Title difference for two different ATOM feeds
|
2018-11-17 06:50:09 -05:00 |
|
|
Hypolite Petovan
|
02aa11fb7a
|
Merge pull request #6143 from tobiasd/20181116-Vagranthtaccess
cp htaccess in Vagrant VM on setup
|
2018-11-17 06:49:40 -05:00 |
|
|
Jonny Tischbein
|
52eb2281e4
|
Fix deleting last element from saved folder + Fix displaying empty saved folder
|
2018-11-17 12:41:00 +01:00 |
|
|
Michael Vogel
|
c66650f7d8
|
Merge pull request #6151 from fabrixxm/issues/6119
dbstructure: check for comment value or use default
|
2018-11-17 12:31:08 +01:00 |
|
|
fabrixxm
|
c13e078c42
|
dbstructure: check for comment value or use default
fix #6119
|
2018-11-17 11:43:01 +01:00 |
|
|
Alexandre Alapetite
|
bd19e93c09
|
Minor code relocation
https://github.com/friendica/friendica/pull/6144/files#r234385033
|
2018-11-17 01:36:54 +01:00 |
|
|
Alexandre Alapetite
|
dd65c5d150
|
Apply correct title encoding to all cases
|
2018-11-17 01:30:53 +01:00 |
|