mexon/friendica
1
0
Fork 0
Code Pull requests Activity
23894 commits 5 branches 60 tags 188 MiB
Commit graph

23894 commits

This branch
This branch
All branches
Author SHA1 Message Date
Philipp bae4a5e406
Merge pull request #7187 from MrPetovan/bug/7023-emailer-hooks 
Enable addon using emailer hooks to skip default call to mail()
 2019-05-28 08:02:48 +02:00
Philipp fee72bbb50
Merge pull request #7197 from MrPetovan/bug/6861-api-user-show 
[API] Convert user description to plain text
 2019-05-27 22:12:08 +02:00
Hypolite Petovan 0e5b9514ef [API] Convert user description to plain text 2019-05-27 11:58:02 -04:00
Hypolite Petovan 661aca0f88 [API] Ensures user_show includes a status the user actually authored 2019-05-27 11:01:13 -04:00
Hypolite Petovan 3c7e4b474b
Merge pull request #7193 from nupplaphil/bug/uimport_datetime 
Fix NULL datetime for uimport/uexport
 2019-05-27 09:13:01 -04:00
Hypolite Petovan 4e207ef786 Enable addon using emailer hooks to skip default call to mail() 2019-05-26 21:36:09 -04:00
Hypolite Petovan f225752f8a
Merge pull request #7194 from nupplaphil/bug/hover 
frio: Fix hovercard vanish
 2019-05-26 21:20:21 -04:00
Philipp Holzer 57ec7daaa4
moved composer-line 2019-05-26 22:02:38 +02:00
Philipp Holzer 26d4214c19
added suggestions 2019-05-26 21:53:24 +02:00
Philipp Holzer 78a20e5acb
Fix hovercard vanish 2019-05-26 21:42:49 +02:00
Hypolite Petovan 1610848e65
Merge pull request #7192 from nupplaphil/bug/edit_images 
Make edits of images possible again
 2019-05-26 15:21:10 -04:00
Hypolite Petovan e99e8096bf
Merge pull request #7191 from nupplaphil/bug/logfile_permission 
Fixing logfile permission denied exceptions
 2019-05-26 15:19:26 -04:00
Philipp Holzer 220f8f0862
friendica-6950 uimport doesn't support "pwdreset_time":null 2019-05-26 15:49:44 +02:00
Philipp Holzer 2652787460
friendica-7130 Edits of images not possible 2019-05-26 15:00:19 +02:00
Philipp 57f6086fcd
Merge pull request #7189 from MrPetovan/bug/7183-archives-profile-widget 
Ensures Widget::postedByYear uid parameter is integer in Module\Profile
 2019-05-26 14:42:25 +02:00
Philipp Holzer b56b56ccb6
friendica-6379 Monolog - logfile permission denied 2019-05-26 14:33:09 +02:00
Hypolite Petovan cc6a17d27a Ensures Widget::postedByYear uid parameter is integer in Module\Profile 2019-05-26 08:18:59 -04:00
Philipp ea218438d2
Merge pull request #7186 from MrPetovan/bug/7183-archives-profile-widget 
Restore profile archives widget
 2019-05-26 08:16:54 +02:00
Philipp 6ceb74c365
Merge pull request #7184 from annando/add-tag 
AP: We now transmit "add tag" activity
 2019-05-26 08:14:18 +02:00
Hypolite Petovan 50e44f46ae Add profile archive URL pattern to Router 2019-05-25 19:08:43 -04:00
Hypolite Petovan d27d4d8927 Move posted date widget to Content\Widget 2019-05-25 19:08:15 -04:00
Michael 32b1f75ece AP: We now transmit "add tag" activity / On Diaspora this is now supressed 2019-05-25 19:33:58 +00:00
Philipp 5c2cca432f
Merge pull request #7170 from MrPetovan/bug/6981-contact-request-blocked 
Contact requests blocked
 2019-05-25 20:20:36 +02:00
Philipp bd0c536736
Merge pull request #7156 from MrPetovan/task/add-relationship-filter 
Add contact relationship filter
 2019-05-25 20:17:05 +02:00
Hypolite Petovan 22fc3c8828
Merge pull request #7181 from AndyHee/AndyHee-patch-20190525-1 
Update FAQ.md
 2019-05-24 14:31:06 -04:00
Andy H 1cab99a712
Update FAQ.md 
Reworded and added line breaks after fullstops.
 2019-05-25 01:10:00 +07:00
Andy H 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