friendica/friendica
6
2
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-09-09 23:05:19 +02:00
Code Issues Projects Releases 3 Packages Wiki Activity
24270 commits 3 branches 67 tags 246 MiB
Commit graph

24270 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andy H3
218deed874
 		Update FAQ.md 2019-05-25 00:26:56 +07:00
Philipp
c98da2fe43
 		Merge pull request #7180 from MrPetovan/bug/fatal-errors 
Ensures Search methods return an empty ResultList instead of null
 2019-05-24 16:31:42 +02:00
Hypolite Petovan
08d7d42f81 Ensures Search methods return an empty ResultList instead of null 
- Addresses https://github.com/friendica/friendica/issues/6916#issuecomment-494876901
 2019-05-24 08:13:36 -04:00
Philipp
fc0733d1ec
 		Merge pull request #7179 from friendica/MrPetovan-patch-module-contact 
Fix typo in Module\Contact
 2019-05-23 20:31:03 +02:00
Hypolite Petovan
0dae4f9492
 		Fix typo in Module\Contact 
Follow-up to #7154, thanks to @AlfredSK
 2019-05-23 13:01:40 -04:00
Philipp
c1366e23fb
 		Merge pull request #7177 from MrPetovan/bug/admin-summary-sql 
Fix SQL error in Module\Admin\Summary
 2019-05-22 06:31:16 +02:00
Hypolite Petovan
40ca25f4f7 Fix SQL error in Module\Admin\Summary 2019-05-21 17:01:15 -04:00
Hypolite Petovan
80f9487216
 		Merge pull request #7175 from annando/db-table-escape 
Fix table name sanitation / enable table schemes
 2019-05-21 16:56:56 -04:00
Michael
30143aa5b1 Identifier have to be escaped different than values 2019-05-21 05:34:41 +00:00
Michael
1f6f588872 Fix table name sanitation / enable table schemes 2019-05-20 20:38:18 +00:00
Hypolite Petovan
14a78807d7 Use self::isBlocked and self:isBlockedByUser in Model\Contact::addRelationship 2019-05-20 16:34:17 -04:00
Hypolite Petovan
7bbaf0757f Revert sending ActivityPub follow reject on Model\Contact::addRelationship failure 2019-05-20 16:33:09 -04:00
Hypolite Petovan
62dfcbb074 Prevent contact relationships with node- or user-level blocked contacts 2019-05-20 15:29:20 -04:00
Hypolite Petovan
ea77f214d7 Add return value to Model\Contact::addRelationship to remove protocol-specific code from it 2019-05-20 15:29:20 -04:00
Hypolite Petovan
10dfe4347b Ensure follow reject/accept object IDs are strings to avoid JsonLD normalize errors in ActivityPub\Transmitter 2019-05-20 15:29:20 -04:00
Hypolite Petovan
3114754f4b Refactor Model\Contact::addRelationship 
- Remove unused parameter $item
- Replace q() call with DBA::insert
- Update check on $contact that can only be an array now
- Add moethod doc block
 2019-05-20 15:29:20 -04:00
Hypolite Petovan
956ae6241d Add exception message chain, string trace and original object to JsonLD normalize error logging 2019-05-20 15:28:54 -04:00
Hypolite Petovan
b5454547e9 Add query string to API "call not implemented" log message 2019-05-20 15:28:54 -04:00
Hypolite Petovan
bebff3271b Remove obsolete TODO comment in Module\Profile\Contacts 2019-05-20 15:10:34 -04:00
Hypolite Petovan
c65faecc8c Add current tab parameter to Model\Profile::getTabs 2019-05-20 15:09:33 -04:00
Hypolite Petovan
709eba6ce3 Move /viewcontacts to /profile/{nickname}/contacts[/{type}] 
- Add contact relationship filter to profile contacts page
- Include feed contacts in contacts page and contact widget
 2019-05-20 14:50:09 -04:00
Hypolite Petovan
e6742af65c Add contact relationship filter to /contact module 2019-05-20 14:50:09 -04:00
Hypolite Petovan
862159c712
 		Merge pull request #7165 from nupplaphil/task/mod_dirfind 
Move mod/dirfind to src/Module/Search/Directory
 2019-05-20 14:45:19 -04:00
Hypolite Petovan
0c9b76a585
 		Merge pull request #7173 from nupplaphil/task/mod_newmember 
Move mod/newmember to src/Module/Welcome
 2019-05-20 14:14:58 -04:00
Philipp Holzer
f97b72eb9f
 		Move mod/newmember to src/Module/Welcome 2019-05-20 20:12:20 +02:00
Philipp Holzer
3d67987cbc
 		simplification 2019-05-20 19:27:53 +02:00
Philipp Holzer
5e79d3fc82
 		Fixing method signature 2019-05-20 19:19:57 +02:00
Philipp Holzer
2bb2bb19fd
 		refactor method signature 2019-05-20 19:15:47 +02:00
Philipp Holzer
059b813090
 		Add PhpDoc / Code Standards 2019-05-20 19:14:39 +02:00
Philipp Holzer
58c8959da0
 		Add search types 2019-05-20 19:13:37 +02:00
Philipp Holzer
83fd03b124
 		Add PhpDoc 2019-05-20 18:44:44 +02:00
Philipp Holzer
1e36c68e48
 		Moving Search to Core, Refactor Objects 2019-05-20 18:42:27 +02:00
Hypolite Petovan
1cd7d50939
 		Merge pull request #7172 from nupplaphil/task/mod_notice_rm 
Remove src/Module/Notice
 2019-05-20 12:26:28 -04:00
Philipp Holzer
853f5cb92f
 		Remove src/Module/Notice 
see https://github.com/friendica/friendica/pull/7159#issuecomment-493744623
 2019-05-20 18:22:34 +02:00
Tobias Diekershoff
05d3062595 Version 2019.06-rc 2019-05-20 10:53:32 +02:00
Michael Vogel
cbca26d185
 		Merge pull request #7167 from MrPetovan/bug/7150-unescape-xml-entities 
Add Unicode support to autolink regular expression
 2019-05-20 06:36:59 +02:00
Hypolite Petovan
c21a227d0a Add test for bug 7150 2019-05-19 18:52:01 -04:00
Hypolite Petovan
325ba20141 Improve Diaspora raw text support in /babel module 2019-05-19 18:52:01 -04:00
Hypolite Petovan
3395f56036 Add Unicode support to autolink regular expression 
- Explicitly exclude non-breaking spaces from URLs as \s doesn't include them
 2019-05-19 18:51:55 -04:00
Hypolite Petovan
6f0c6e8926
 		Merge pull request #7160 from nupplaphil/task/mod_probe 
Move mod/probe to src/Module/Probe
 2019-05-19 15:06:13 -04:00
Hypolite Petovan
3ca64185a6
 		Merge pull request #7169 from annando/send-suggest 
Sending contact suggestions does work again
 2019-05-19 14:59:28 -04:00
Hypolite Petovan
58d5c6610c
 		Merge pull request #7168 from annando/suggest-receive 
Suggestions can be processed again
 2019-05-19 14:58:30 -04:00
Philipp
a758671a1b
 		Merge pull request #7154 from MrPetovan/task/refactor-widgets 
Refactor widgets
 2019-05-19 20:52:00 +02:00
Michael
a6cf036db2 Sending contact suggestions does work again 2019-05-19 17:59:37 +00:00
Michael Vogel
a3c95eeaab Suggestions can be processed again 2019-05-19 19:58:20 +02:00
Michael
35c7a61620 Merge remote-tracking branch 'upstream/develop' into send-suggest 2019-05-19 17:03:50 +00:00
Hypolite Petovan
37422dfa34
 		Merge pull request #7166 from annando/revert-7158 
Revert PR 7158 since it breaks umlauts
 2019-05-19 07:37:01 -04:00
Michael
6f3019ecdd Revert PR 7158 since it breaks umlauts 2019-05-19 09:34:49 +00:00
Michael
14d4132ad0 Fixed contact suggestion 2019-05-19 08:54:26 +00:00
Philipp Holzer
419cc81ef1
 		renaming 2019-05-19 05:13:06 +02:00