keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
21766 commits 4 branches 0 tags 179 MiB
Commit graph

21766 commits

This branch
This branch
All branches
Author SHA1 Message Date
Michael Vogel
96a43d0db9
Merge pull request #6191 from MrPetovan/task/urlencode-file-param 
URL encode /network file query parameter
 2018-11-23 21:37:31 +01:00
Michael Vogel
170a61898b
Merge pull request #6192 from MrPetovan/bug/6012-fix-contact-relationship-links 
Fix display of Connect/Disconnect links on contact page
 2018-11-23 20:51:40 +01:00
Hypolite Petovan
4b8af10561 Fix display of Connect/Disconnect links on contact page 2018-11-23 11:09:43 -05:00
Hypolite Petovan
c23d1b2776 Urlencode /network file parameter 2018-11-23 10:02:30 -05:00
Hypolite Petovan
9774fd8be9 Remove unused parameter $save in HTML::search 
- Remove unused variables in saved_search()
 2018-11-23 09:53:14 -05:00
Tobias Diekershoff
902ade9891
Merge pull request #6189 from MrPetovan/bug/5737-hide-ignore-anonymous 
Fix ignore link showing for anonymous users
 2018-11-23 10:01:56 +01:00
Hypolite Petovan
03de5c018f Fix ignore link showing for anonymous users 2018-11-23 01:25:38 -05:00
Michael Vogel
52b342a90c
Merge pull request #6188 from MrPetovan/bug/5928-protect-oauthexception 
Protect OAuthException declaration to avoid conflict with php-pecl-oauth
 2018-11-23 07:09:49 +01:00
Michael Vogel
a58ee97ba4
Merge pull request #6186 from MrPetovan/bug/6081-fix-ostatus-subscribe 
Fix OStatus Subscribe fatal error
 2018-11-23 07:09:00 +01:00
Hypolite Petovan
6fd294aac5 Protect OAuthException declaration to avoid conflict with php-pecl-oauth 2018-11-22 22:21:57 -05:00
Hypolite Petovan
8d7fb35463 Prevent fatal error when $friends isn't an array 2018-11-22 19:03:24 -05:00
Hypolite Petovan
03c5c7ca0a Fix formatting in mod/ostatus_subscribe 2018-11-22 19:03:02 -05:00
Hypolite Petovan
2b7f57453b
Merge pull request #6185 from annando/blocked 
Checking for blocked user does now check for blocked domain as well
 2018-11-22 18:38:14 -05:00
Michael
ea5ba309dc Some more AP blocking 2018-11-22 22:31:48 +00:00
Michael
2f7b138b09 Block AP delivery 2018-11-22 22:23:31 +00:00
Michael
ba1e385f86 Don't deliver to blocked domains 2018-11-22 22:09:22 +00:00
Michael
fb0140a62b Checking for blocked user does now check for blocked domain as well 2018-11-22 21:43:16 +00:00
Tobias Diekershoff
540321d0aa
Merge pull request #6182 from MrPetovan/task/6172-add-registration-invitation 
Add new REGISTRATION_INVITATION value to mod/friendica output
 2018-11-22 08:01:19 +01:00
Hypolite Petovan
c91a87bc07 Fix typo in comment in mod/redir 2018-11-21 22:27:57 -05:00
Hypolite Petovan
20e7e7e3ac Add new REGISTER_INVITATION value to mod/friendica output 2018-11-21 22:27:50 -05:00
Tobias Diekershoff
cf1c63fcc2
Merge pull request #6176 from annando/ap-security 
AP: Security check against forged "create" activities
 2018-11-21 18:10:45 +01:00
Hypolite Petovan
2ef23300a3
Merge pull request #6179 from Alkarex/sql-distinct-fix 
Fix SQL grammar error: ORDER BY clause is not in SELECT
 2018-11-21 08:07:33 -05:00
Hypolite Petovan
117c0f6c13
Merge pull request #6178 from annando/ap-viewcontacts 
"viewcontacts" hadn't displayed the AP contacts
 2018-11-21 08:06:54 -05:00
Hypolite Petovan
a25df1a9c1
Merge pull request #6177 from annando/oembed-escaping 
Sanitize the OEmbed data before processing it
 2018-11-21 08:06:26 -05:00
Alexandre Alapetite
a1238d03a6 Fix SQL grammar error: ORDER BY clause is not in SELECT 
```
2018-11-21T08:31:28Z@e3393hprfvfqnblturqp56rjnp [Info]:DBA.php:557:p
DB Error 3065: Expression #1 of ORDER BY clause is not in SELECT list,
references column 'friendica.item.created' which is not in SELECT list;
this is incompatible with DISTINCT
q, profile_content, update_profile_content,
LegacyModule::runModuleFunction, LegacyModule::content, call_user_func,
App::runFrontend
SELECT DISTINCT(`parent-uri`) AS `uri` FROM `item` INNER JOIN `contact`
ON `contact`.`id` = `item`.`contact-id` AND NOT `contact`.`blocked` AND
NOT `contact`.`pending` WHERE `item`.`uid` = 1 AND `item`.`visible` AND
(NOT `item`.`deleted` OR `item`.`gravity` = 3) AND NOT
`item`.`moderated` AND `item`.`wall` AND `item`.`unseen` ORDER BY
`item`.`created` DESC
```
 2018-11-21 09:57:34 +01:00
Michael
85529ed8ff "viewcontacts" hadn't displayed the AP contacts 2018-11-21 08:50:43 +00:00
Michael
aa1882fd99 Sanitize the OEmbed data before processing it 2018-11-21 07:07:24 +00:00
Michael
27d1da0468 One space too much 2018-11-20 20:49:06 +00:00
Michael
5c39779b45 AP: Security check against forged "create" activities 2018-11-20 20:40:47 +00:00
Hypolite Petovan
a76c00de66
Merge pull request #6171 from JonnyTischbein/issue_worker_free_mem 
Change Worker to use only MemFree in isMinMemoryReached
 2018-11-19 21:40:46 -05:00
Jonny Tischbein
9aea59d4e3 Change Worker to use only MemFree in isMinMemoryReached 2018-11-19 23:21:40 +01:00
Hypolite Petovan
956fe99591
Merge pull request #6170 from annando/safe-save 
To safe or not so save, that is the question
 2018-11-19 11:51:39 -05:00
Hypolite Petovan
70e68449ff
Merge pull request #6169 from AndyHee/develop 
Update nginx sample config
 2018-11-19 11:41:49 -05:00
Andy H3
612e4c4138
Update FAQ.md 2018-11-19 23:37:35 +07:00
Michael
d89e3f4264 To safe or not so save, that is the question 2018-11-19 16:36:31 +00:00
Andy H3
bb767dda51
Update sample-nginx.config 2018-11-19 23:31:54 +07:00
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