friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity
21,666 Commits 2 Branches 63 Tags 238 MiB
Commit Graph

21666 Commits

Author SHA1 Message Date
Michael 6aef4aea0e Updated database.sql 2018-11-16 20:21:33 +00:00
Hypolite Petovan 58e35f037b
Merge pull request #6136 from annando/delete-locally 
Improved delete text to clarify AP comment delete behaviour
 2018-11-15 18:26:12 -05:00
Hypolite Petovan b7ed5454c9
Merge pull request #6139 from annando/feed-mode 
Some more feed simplification
 2018-11-15 18:21:05 -05:00
Michael c3b6727fad Some more feed simplification 2018-11-15 16:21:37 +00:00
Hypolite Petovan 779612d4a8
Merge pull request #6138 from annando/feed-mode 
Make feeds look more like feeds
 2018-11-15 09:16:08 -05:00
Hypolite Petovan 5eb8929f0c
Merge pull request #6137 from Alkarex/WebSub_fixes 
WebSub fixes
 2018-11-15 09:13:59 -05:00
Michael 5f258dac22 Make feeds look more like feeds 2018-11-15 13:21:58 +00:00
Alexandre Alapetite 51f0d52100 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
 2018-11-15 12:54:04 +01:00
Michael 6ad082a710 Improved delete text to clarify AP comment delete behaviour 2018-11-15 06:36:06 +00:00
Tobias Diekershoff 921094017c
Merge pull request #6134 from annando/6128-again 
We now use our regular feed that allows anonymous polling
 2018-11-15 06:19:13 +01:00
Michael 08433873f5 Issue 6128 again: We now use our regular feed that allows anonymous polling 2018-11-14 19:26:23 +00:00
Hypolite Petovan 4894e89f03
Merge pull request #6132 from annando/notice 
Just some notice again
 2018-11-14 09:46:57 -05:00
Michael 268862dd7c Just some notice again 2018-11-14 10:54:42 +00:00
Tobias Diekershoff 89cc79b77b
Merge pull request #6131 from annando/diaspora-relocation 
Create a new GUID on user import
 2018-11-14 10:27:25 +01:00
Tobias Diekershoff b0d8a2fcd0
Merge pull request #6127 from annando/notice 
Avoid "Cannot modify header information - headers already sent"
 2018-11-14 10:20:47 +01:00
Michael 88a4733e5f Forgotten "use" 2018-11-14 06:00:01 +00:00
Michael 9271b21d51 Create a new GUID on user import 2018-11-14 05:58:03 +00:00
Hypolite Petovan 6996a172e8
Merge pull request #6130 from annando/develop 
Issue 6128: Websub could work now
 2018-11-13 18:46:17 -05:00
Michael Vogel cf4a560c12
Merge pull request #6129 from friendica/5891-follow-up 
Convert remaining instances of "contacts" in mod/(un)follow
 2018-11-13 23:29:01 +01:00
Michael a5ddaa9dbc Issue 6128: Websub could work now 2018-11-13 22:23:16 +00:00
Hypolite Petovan d697dbd794
Convert remaining instances of "contacts" in mod/follow 2018-11-13 16:02:33 -05:00
Hypolite Petovan 537164fd02
Convert remaining instances of "contacts" in mod/unfollow 2018-11-13 16:01:01 -05:00
Michael 83ae873646 Avoid "Cannot modify header information - headers already sent" 2018-11-13 20:20:54 +00:00
Hypolite Petovan e6557ca9c5
Merge pull request #6126 from annando/notice-return-path 
Fixes notice "PHP Notice:  Undefined index: return_path"
 2018-11-13 13:58:10 -05:00
Michael e1875cf206 Fixes notice "PHP Notice: Undefined index: return_path" 2018-11-13 18:10:37 +00:00
Tobias Diekershoff f8eb38b275
Merge pull request #6123 from friendica/fabrixxm-patch-1 
Fix Notice in LegacyModule
 2018-11-13 15:09:00 +01:00
fabrixxm 972775e58e
Fix Notice in LegacyModule 
Notice: Only variables should be passed by reference in src/LegacyModule.php on line 68
 2018-11-13 14:37:51 +01:00
Tobias Diekershoff 320c986e05
Merge pull request #6121 from annando/hide 
Don't suggest hidden contacts / Added AP to the suggestions
 2018-11-13 09:39:58 +01:00
Tobias Diekershoff b0c875cbfc
Merge pull request #6120 from annando/issue-6032 
Issue 6032: Avoid fatal error
 2018-11-13 09:38:08 +01:00
Michael edc6ba976d Output all technical fields - even for hidden contacts 2018-11-13 07:09:14 +00:00
Michael b5fa518998 Don't suggest hidden contacts / Added AP to the suggestions 2018-11-13 05:52:21 +00:00
Michael cc0904eb77 Issue 6032: Avoid fatal error 2018-11-12 19:10:40 +00:00
Hypolite Petovan f67cf4e63b
Merge pull request #6118 from annando/update-before-postupdate 
Execute database update before post update is called
 2018-11-12 07:19:15 -05:00
Michael 109204032c Execute database update before post update is called 2018-11-12 10:36:10 +00:00
Hypolite Petovan 6e39b93eb9
Merge pull request #6114 from annando/server-discovery 
Fix wrong server detecting / improved Pleroma version numbers
 2018-11-12 00:12:13 -05:00
Hypolite Petovan 67f4fdab32
Merge pull request #6116 from annando/remove-user 
Avoid a blocked workerqueue due to removed users
 2018-11-12 00:11:51 -05:00
Michael 1e873a2815 Avoid a blocked workerqueue due to removed users 2018-11-12 05:03:12 +00:00
Michael 0937c66484 A redirect is not an error 2018-11-12 04:12:36 +00:00
Michael de0ddfa0d8 Fix wromg server detecting / improved Pleroma version numbers 2018-11-11 21:54:50 +00:00
Hypolite Petovan 0ed3b1e38a
Merge pull request #6113 from annando/api-retweet 
API: The wrong user had been shown for repeated posts
 2018-11-11 16:53:26 -05:00
Michael 34a0e71485 API: The wrong user had been shown for repeated posts 2018-11-11 19:05:57 +00:00
Hypolite Petovan 2d88994ed9
Merge pull request #6112 from annando/notices 
Removing some notices again
 2018-11-11 08:01:17 -05:00
Michael 7458d793ed Removing some notices again 2018-11-11 12:15:17 +00:00
Hypolite Petovan 094e5becca
Merge pull request #6110 from annando/issue-6100 
Issue 6100: The AS object should be fetchable for every original post
 2018-11-10 20:57:07 -05:00
Hypolite Petovan a30876977d
Merge pull request #6108 from annando/fork-check 
Add some hook to check if hook should be forked
 2018-11-10 20:56:42 -05:00
Michael Vogel 8f8e99c91a
Merge pull request #6111 from AlfredSK/patch-1 
Missing use for Strings
 2018-11-11 01:23:43 +01:00
Steffen K9 de759e41c5
Missing use for Strings 
In line 72 'Strings::' is used but the 'use Friendica\Util\Strings' was missing.
 2018-11-11 01:14:50 +01:00
Michael 8844bb690d Issue 6100: The AS object should be fetchable for every original post 2018-11-10 23:56:11 +00:00
Michael 3d8a343ab2 Added documentation 2018-11-10 16:55:12 +00:00
Michael Vogel d577ab98eb
Merge pull request #6104 from nupplaphil/friendica-6101 
Finding slow tests
 2018-11-10 17:39:42 +01:00