]>
git.mxchange.org Git - friendica.git/log
Hypolite Petovan [Fri, 23 Nov 2018 06:25:38 +0000 (01:25 -0500)]
Fix ignore link showing for anonymous users
Tobias Diekershoff [Thu, 22 Nov 2018 07:01:19 +0000 (08:01 +0100)]
Merge pull request #6182 from MrPetovan/task/6172-add-registration-invitation
Add new REGISTRATION_INVITATION value to mod/friendica output
Hypolite Petovan [Thu, 22 Nov 2018 03:27:57 +0000 (22:27 -0500)]
Fix typo in comment in mod/redir
Hypolite Petovan [Thu, 22 Nov 2018 03:27:28 +0000 (22:27 -0500)]
Add new REGISTER_INVITATION value to mod/friendica output
Tobias Diekershoff [Wed, 21 Nov 2018 17:10:45 +0000 (18:10 +0100)]
Merge pull request #6176 from annando/ap-security
AP: Security check against forged "create" activities
Hypolite Petovan [Wed, 21 Nov 2018 13:07:33 +0000 (08:07 -0500)]
Merge pull request #6179 from Alkarex/sql-distinct-fix
Fix SQL grammar error: ORDER BY clause is not in SELECT
Hypolite Petovan [Wed, 21 Nov 2018 13:06:54 +0000 (08:06 -0500)]
Merge pull request #6178 from annando/ap-viewcontacts
"viewcontacts" hadn't displayed the AP contacts
Hypolite Petovan [Wed, 21 Nov 2018 13:06:26 +0000 (08:06 -0500)]
Merge pull request #6177 from annando/oembed-escaping
Sanitize the OEmbed data before processing it
Alexandre Alapetite [Wed, 21 Nov 2018 08:57:34 +0000 (09:57 +0100)]
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
```
Michael [Wed, 21 Nov 2018 08:50:43 +0000 (08:50 +0000)]
"viewcontacts" hadn't displayed the AP contacts
Michael [Wed, 21 Nov 2018 07:07:24 +0000 (07:07 +0000)]
Sanitize the OEmbed data before processing it
Michael [Tue, 20 Nov 2018 20:49:06 +0000 (20:49 +0000)]
One space too much
Michael [Tue, 20 Nov 2018 20:40:47 +0000 (20:40 +0000)]
AP: Security check against forged "create" activities
Hypolite Petovan [Tue, 20 Nov 2018 02:40:46 +0000 (21:40 -0500)]
Merge pull request #6171 from JonnyTischbein/issue_worker_free_mem
Change Worker to use only MemFree in isMinMemoryReached
Jonny Tischbein [Mon, 19 Nov 2018 22:21:40 +0000 (23:21 +0100)]
Change Worker to use only MemFree in isMinMemoryReached
Hypolite Petovan [Mon, 19 Nov 2018 16:51:39 +0000 (11:51 -0500)]
Merge pull request #6170 from annando/safe-save
To safe or not so save, that is the question
Hypolite Petovan [Mon, 19 Nov 2018 16:41:49 +0000 (11:41 -0500)]
Merge pull request #6169 from AndyHee/develop
Update nginx sample config
Andy H3 [Mon, 19 Nov 2018 16:37:35 +0000 (23:37 +0700)]
Update FAQ.md
Michael [Mon, 19 Nov 2018 16:36:31 +0000 (16:36 +0000)]
To safe or not so save, that is the question
Andy H3 [Mon, 19 Nov 2018 16:31:54 +0000 (23:31 +0700)]
Update sample-nginx.config
Andy H3 [Mon, 19 Nov 2018 16:26:34 +0000 (23:26 +0700)]
Update sample-nginx.config
Added buffers and buffer size
AndyHee [Mon, 19 Nov 2018 14:54:56 +0000 (21:54 +0700)]
Merge remote-tracking branch 'upstream/develop' into develop
Tobias Diekershoff [Mon, 19 Nov 2018 11:01:11 +0000 (12:01 +0100)]
Merge pull request #6166 from annando/dbclean
The expiry of conversations can now be configured in the admin panel
Michael [Mon, 19 Nov 2018 10:02:44 +0000 (10:02 +0000)]
14 days
Michael [Mon, 19 Nov 2018 10:01:09 +0000 (10:01 +0000)]
Merge remote-tracking branch 'upstream/develop' into dbclean
Tobias Diekershoff [Mon, 19 Nov 2018 09:34:51 +0000 (10:34 +0100)]
Merge pull request #6165 from annando/default-features
Several default features are now in the core
Michael [Mon, 19 Nov 2018 06:58:46 +0000 (06:58 +0000)]
The expiry of conversations can now be configured in the admin panel
Michael [Sun, 18 Nov 2018 20:59:40 +0000 (20:59 +0000)]
Another try to make tests run again
Michael [Sun, 18 Nov 2018 20:40:10 +0000 (20:40 +0000)]
Possibly fix test
Michael [Sun, 18 Nov 2018 20:13:46 +0000 (20:13 +0000)]
Several default features are now in the core
Tobias Diekershoff [Sun, 18 Nov 2018 13:11:40 +0000 (14:11 +0100)]
Merge pull request #6163 from hoergen/socke
[Doc] Rearranged and wrote some parts new and more coherent.
hoergen [Sun, 18 Nov 2018 13:05:46 +0000 (14:05 +0100)]
added linebreak and markdown url
Hypolite Petovan [Sun, 18 Nov 2018 12:47:10 +0000 (07:47 -0500)]
Merge pull request #6164 from annando/network-protocols
Networks are now protocols
Michael [Sun, 18 Nov 2018 12:44:01 +0000 (12:44 +0000)]
Networks are now protocols
Tobias Diekershoff [Sun, 18 Nov 2018 12:34:51 +0000 (13:34 +0100)]
Merge pull request #6162 from JonnyTischbein/issue_delete_comment_from_guid
Delete comment from its guid and return to parent guid
hoergen [Sun, 18 Nov 2018 12:13:07 +0000 (13:13 +0100)]
[Doc]removed bold from keyword
hoergen [Sun, 18 Nov 2018 11:50:23 +0000 (12:50 +0100)]
Rearranged and wrote some parts new and more coherent.
Jonny Tischbein [Sun, 18 Nov 2018 11:46:21 +0000 (12:46 +0100)]
Add fallback if comment as no parent
Jonny Tischbein [Sun, 18 Nov 2018 11:43:26 +0000 (12:43 +0100)]
Delete comment from its guid and return to parent guid
Michael Vogel [Sun, 18 Nov 2018 11:31:15 +0000 (12:31 +0100)]
Merge pull request #6144 from Alkarex/ATOM-self
Correct self attribute in ATOM feeds
AndyHee [Sun, 18 Nov 2018 03:44:32 +0000 (10:44 +0700)]
Merge remote-tracking branch 'upstream/develop' into develop
Hypolite Petovan [Sun, 18 Nov 2018 00:27:12 +0000 (19:27 -0500)]
Merge pull request #6160 from annando/item-delete
Allow to delete every post, even public ones
Michael [Sat, 17 Nov 2018 22:56:28 +0000 (22:56 +0000)]
Allow to delete every post, even public ones
Hypolite Petovan [Sat, 17 Nov 2018 19:13:32 +0000 (14:13 -0500)]
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
Hypolite Petovan [Sat, 17 Nov 2018 19:12:30 +0000 (14:12 -0500)]
Merge pull request #6158 from tobiasd/
20181117 -contactedittab
Add link to user groups from /contact
Jonny Tischbein [Sat, 17 Nov 2018 18:14:59 +0000 (19:14 +0100)]
Fix setting permisson as post for uploaded photo in album via modal create post
Tobias Diekershoff [Sat, 17 Nov 2018 17:33:12 +0000 (18:33 +0100)]
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.
Hypolite Petovan [Sat, 17 Nov 2018 16:59:24 +0000 (11:59 -0500)]
Merge pull request #6152 from JonnyTischbein/issue_delete_from_saved_folder
Fix deleting last element and displaying empty saved folder
Hypolite Petovan [Sat, 17 Nov 2018 16:37:22 +0000 (11:37 -0500)]
Merge pull request #6156 from tobiasd/
20181117 -vagrantsql
recreated SQL file for Vagrant VM from current DB structure
Tobias Diekershoff [Sat, 17 Nov 2018 16:36:04 +0000 (17:36 +0100)]
Merge pull request #6155 from fabrixxm/issues/localredirect
Use appropriate redirect in dfrn_poll
Jonny Tischbein [Sat, 17 Nov 2018 16:27:12 +0000 (17:27 +0100)]
More Code Standard
Jonny Tischbein [Sat, 17 Nov 2018 16:24:30 +0000 (17:24 +0100)]
Code Standard
Tobias Diekershoff [Sat, 17 Nov 2018 15:25:51 +0000 (16:25 +0100)]
recreated SQL file for Vagrant VM from current DB structure
fabrixxm [Sat, 17 Nov 2018 15:12:45 +0000 (16:12 +0100)]
Use appropriate redirect in dfrn_poll
Got an error while remote auth to a local user, where $destination_url
is relative.
Jonny Tischbein [Sat, 17 Nov 2018 15:04:54 +0000 (16:04 +0100)]
Change how to decide between empty update and not called field file
Hypolite Petovan [Sat, 17 Nov 2018 15:01:05 +0000 (10:01 -0500)]
Merge pull request #6154 from JonnyTischbein/issue_open_commentbox_post_with_replies
[frio] Fix opening comment box when Post has replies
Hypolite Petovan [Sat, 17 Nov 2018 14:55:26 +0000 (09:55 -0500)]
Merge pull request #6147 from Alkarex/stylesheet-path-html-encoding
Fix lack of HTML encoding for stylesheet link
Hypolite Petovan [Sat, 17 Nov 2018 14:54:47 +0000 (09:54 -0500)]
Merge pull request #6153 from JonnyTischbein/issue_return_delete_comments
Fix return url when delete comment from display
Jonny Tischbein [Sat, 17 Nov 2018 14:53:34 +0000 (15:53 +0100)]
Fix opening comment box when Post has replies
Alexandre Alapetite [Sat, 17 Nov 2018 13:01:07 +0000 (14:01 +0100)]
Escaping moved to template
https://github.com/friendica/friendica/pull/6147#pullrequestreview-
176051481
Jonny Tischbein [Sat, 17 Nov 2018 12:56:58 +0000 (13:56 +0100)]
Fix return url when delete comment from display
Jonny Tischbein [Sat, 17 Nov 2018 12:22:32 +0000 (13:22 +0100)]
Fix SQL Error if no items where found + Fix setting to null
Hypolite Petovan [Sat, 17 Nov 2018 12:01:53 +0000 (07:01 -0500)]
Merge pull request #6145 from Alkarex/ATOM-title-encoding
Fix ATOM feed entry titles encoding
Hypolite Petovan [Sat, 17 Nov 2018 11:50:09 +0000 (06:50 -0500)]
Merge pull request #6146 from Alkarex/atom-link-title-dfrn
Title difference for two different ATOM feeds
Hypolite Petovan [Sat, 17 Nov 2018 11:49:40 +0000 (06:49 -0500)]
Merge pull request #6143 from tobiasd/
20181116 -Vagranthtaccess
cp htaccess in Vagrant VM on setup
Jonny Tischbein [Sat, 17 Nov 2018 11:41:00 +0000 (12:41 +0100)]
Fix deleting last element from saved folder + Fix displaying empty saved folder
Michael Vogel [Sat, 17 Nov 2018 11:31:08 +0000 (12:31 +0100)]
Merge pull request #6151 from fabrixxm/issues/6119
dbstructure: check for comment value or use default
fabrixxm [Sat, 17 Nov 2018 10:43:01 +0000 (11:43 +0100)]
dbstructure: check for comment value or use default
fix #6119
Alexandre Alapetite [Sat, 17 Nov 2018 00:36:54 +0000 (01:36 +0100)]
Minor code relocation
https://github.com/friendica/friendica/pull/6144/files#r234385033
Alexandre Alapetite [Sat, 17 Nov 2018 00:30:53 +0000 (01:30 +0100)]
Apply correct title encoding to all cases
Alexandre Alapetite [Fri, 16 Nov 2018 23:23:59 +0000 (00:23 +0100)]
Fix lack of HTML encoding for stylesheet link
Previous to the fix, the home page had a line like (notice the wrongly
encoded `&`):
```html
<link rel="stylesheet" href="view/theme/frio/style.pcss?f=&puid=1"
type="text/css" media="screen" />
```
Alexandre Alapetite [Fri, 16 Nov 2018 23:05:13 +0000 (00:05 +0100)]
Title difference for two different ATOM feeds
Fix for
https://github.com/friendica/friendica/issues/6128#issuecomment-
439016471
Alexandre Alapetite [Fri, 16 Nov 2018 22:52:36 +0000 (23:52 +0100)]
Fix ATOM feed title encoding
Was HTML-encoded instead of plain Unicode.
Fixed only for feed_mode. Probably wrong as well for non_feed mode (not
sure how to test)
Alexandre Alapetite [Fri, 16 Nov 2018 22:29:26 +0000 (23:29 +0100)]
Refactor header with feed_mode
https://github.com/friendica/friendica/pull/6140#issuecomment-
439475027
Tobias Diekershoff [Fri, 16 Nov 2018 22:09:54 +0000 (23:09 +0100)]
cp htaccess in Vagrant VM on setup
Tobias Diekershoff [Fri, 16 Nov 2018 20:28:38 +0000 (21:28 +0100)]
Merge pull request #6142 from annando/databasesql
Updated database.sql
Michael Vogel [Fri, 16 Nov 2018 20:25:52 +0000 (21:25 +0100)]
Merge pull request #6141 from tobiasd/20181116_lang
CS, FR, PL translation updates
Michael [Fri, 16 Nov 2018 20:21:33 +0000 (20:21 +0000)]
Updated database.sql
Tobias Diekershoff [Fri, 16 Nov 2018 19:08:31 +0000 (20:08 +0100)]
CS, FR, PL translation updates
Alexandre Alapetite [Fri, 16 Nov 2018 17:54:06 +0000 (18:54 +0100)]
Correct self attribute in ATOM feeds
Fix for
https://github.com/friendica/friendica/issues/6128#issuecomment-
439016471
Special case for DFRN to reduce the risk of unintended side effects
Hypolite Petovan [Thu, 15 Nov 2018 23:26:12 +0000 (18:26 -0500)]
Merge pull request #6136 from annando/delete-locally
Improved delete text to clarify AP comment delete behaviour
Hypolite Petovan [Thu, 15 Nov 2018 23:21:05 +0000 (18:21 -0500)]
Merge pull request #6139 from annando/feed-mode
Some more feed simplification
Michael [Thu, 15 Nov 2018 16:21:37 +0000 (16:21 +0000)]
Some more feed simplification
Hypolite Petovan [Thu, 15 Nov 2018 14:16:08 +0000 (09:16 -0500)]
Merge pull request #6138 from annando/feed-mode
Make feeds look more like feeds
Hypolite Petovan [Thu, 15 Nov 2018 14:13:59 +0000 (09:13 -0500)]
Merge pull request #6137 from Alkarex/WebSub_fixes
WebSub fixes
Michael [Thu, 15 Nov 2018 13:21:58 +0000 (13:21 +0000)]
Make feeds look more like feeds
Alexandre Alapetite [Thu, 15 Nov 2018 11:54:04 +0000 (12:54 +0100)]
WebSub fixes
More fixes related to https://github.com/friendica/friendica/issues/6128
* Bug when using direct ATOM URL, which ends with .atom after nick name
* Bug when callback URL already has some ?query=parameters (which is
quite usual)
Slight refactoring
Michael [Thu, 15 Nov 2018 06:36:06 +0000 (06:36 +0000)]
Improved delete text to clarify AP comment delete behaviour
Tobias Diekershoff [Thu, 15 Nov 2018 05:19:13 +0000 (06:19 +0100)]
Merge pull request #6134 from annando/6128-again
We now use our regular feed that allows anonymous polling
Michael [Wed, 14 Nov 2018 19:26:23 +0000 (19:26 +0000)]
Issue 6128 again: We now use our regular feed that allows anonymous polling
Hypolite Petovan [Wed, 14 Nov 2018 14:46:57 +0000 (09:46 -0500)]
Merge pull request #6132 from annando/notice
Just some notice again
Michael [Wed, 14 Nov 2018 10:54:42 +0000 (10:54 +0000)]
Just some notice again
Tobias Diekershoff [Wed, 14 Nov 2018 09:27:25 +0000 (10:27 +0100)]
Merge pull request #6131 from annando/diaspora-relocation
Create a new GUID on user import
Tobias Diekershoff [Wed, 14 Nov 2018 09:20:47 +0000 (10:20 +0100)]
Merge pull request #6127 from annando/notice
Avoid "Cannot modify header information - headers already sent"
Michael [Wed, 14 Nov 2018 06:00:01 +0000 (06:00 +0000)]
Forgotten "use"
Michael [Wed, 14 Nov 2018 05:58:03 +0000 (05:58 +0000)]
Create a new GUID on user import
Hypolite Petovan [Tue, 13 Nov 2018 23:46:17 +0000 (18:46 -0500)]
Merge pull request #6130 from annando/develop
Issue 6128: Websub could work now
Michael Vogel [Tue, 13 Nov 2018 22:29:01 +0000 (23:29 +0100)]
Merge pull request #6129 from friendica/5891-follow-up
Convert remaining instances of "contacts" in mod/(un)follow
Michael [Tue, 13 Nov 2018 22:23:16 +0000 (22:23 +0000)]
Issue 6128: Websub could work now
Hypolite Petovan [Tue, 13 Nov 2018 21:02:33 +0000 (16:02 -0500)]
Convert remaining instances of "contacts" in mod/follow