mirror
/
friendica
kopia lustrzana https://github.com/friendica/friendica
1
0
Forkuj 1
Kod Zgłoszenia Projekty Wydania Wiki Aktywność
24 144 Commity
3 Gałęzie
64 Tagi
225 MiB
Wykres commitów

24144 Commity (a58e90fa12b732f36bc6a352614e1ea4d8ba6646)

Autor SHA1 Wiadomość Data
Hypolite Petovan a58e90fa12 Display correct total blocked contact count in accordion header 2019-07-05 13:42:22 -04:00
Hypolite Petovan 27c7d233ac [frio] Add expected "none.png" background image 2019-07-05 13:41:48 -04:00
Philipp f60792348a
Merge pull request #7336 from MrPetovan/bug/globalcommunity-silence-getidforurl 
Use Contact::getIdForURL instead of Probe::uri and manual contact table lookup
 2019-07-03 16:47:37 +02:00
Hypolite Petovan 50fa6b7e02 Use Contact::getIdForURL instead of Probe::uri and manual contact table lookup 
- Address https://forum.friendi.ca/display/0b6b25a8-215d-1bab-29c9-77a221796252
- Normalize quote style
- Remove deprecated get_app() call
 2019-07-02 19:25:24 -04:00
Hypolite Petovan a248da8f2e
Merge pull request #7334 from annando/federated-protocol 
New constant for federated protocols
 2019-07-01 21:52:55 -04:00
Michael ee8baf00ce Now without array_merge 2019-07-01 22:14:34 +00:00
Michael 9e3aff9ade Removed comment line 2019-07-01 18:09:40 +00:00
Michael 6041f74df6 New constant for federated protocols 2019-07-01 18:00:55 +00:00
Michael Vogel 8af45c1dd8
Merge pull request #7332 from MrPetovan/bug/fatal-errors 
Fix missing App object in Worker\OnePoll
 2019-06-30 18:23:33 +02:00
Hypolite Petovan 7abc42700c Fix missing App object in Worker\OnePoll 2019-06-30 12:16:18 -04:00
Hypolite Petovan 4bb7a8c342
Merge pull request #7329 from annando/issue-4815 
Issue 4815: Silently ignoring trailing @ at follow requests
 2019-06-29 16:56:49 -04:00
Michael 6cd6fa889b leading, trailing, all the same :-) 2019-06-29 20:09:23 +00:00
Michael 644c08a035 Issue 4815: Silently ignoring trailing @ at follow requests 2019-06-29 19:01:07 +00:00
Hypolite Petovan 541593fd4d
Merge pull request #7328 from annando/fix-delivery 
Item delivery data must only be stored when there is data
 2019-06-29 05:01:29 -04:00
Michael 3121d967c5 Item delivery data must only be stored when there is data 2019-06-29 08:30:48 +00:00
Hypolite Petovan c5d8d82bd2
Merge pull request #7324 from annando/delivery-statistics 
Collect data about used protocols for delivery
 2019-06-28 19:03:15 -04:00
Michael 9bf065c9d8 Merge remote-tracking branch 'upstream/develop' into delivery-statistics 2019-06-28 14:08:54 +00:00
Hypolite Petovan 7b4bba66db
Merge pull request #7323 from annando/contact-discovery 
Removing functionality from OnePoll.php
 2019-06-28 07:08:57 -04:00
Michael 0a15222576 Collect data about used protocols for delivery 2019-06-28 09:03:58 +00:00
Michael e48fbeda0a restore updating of the public contact 2019-06-28 04:34:01 +00:00
Michael 8838a1f2d1 Avoid overwriting of avatars for feeds 2019-06-28 04:26:49 +00:00
Michael 96651ae76d Fix a missing variable 2019-06-28 02:46:56 +00:00
Michael d552db5c55 Polling functions are split into several functions 2019-06-27 20:38:09 +00:00
Michael 7e7acf5763 Last old query replaced in OnePoll.php 2019-06-27 16:21:23 +00:00
Michael d4dc2a129e Replace old database queries 2019-06-27 13:30:26 +00:00
Michael 59b1a1aced Removing many now unused or duplicated tasks from OnePoll 2019-06-27 05:38:16 +00:00
Michael 4db3c79d04 Archive/unarchive the contacts 2019-06-27 05:03:58 +00:00
Michael 9caa8bae35 Unused parts removed, query refurbished 2019-06-26 05:18:11 +00:00
Michael 9b49fd7f3f Changed logging 2019-06-25 17:36:24 +00:00
Hypolite Petovan 8a1f31b322
Merge pull request #7318 from deantownsley/lessbubbles 
Don't try to auth for public images
 2019-06-24 23:09:41 -04:00
Dean Townsley fdbd160141 Add spaces for standards compliance 2019-06-24 21:37:44 -05:00
Dean Townsley 59553ab978 Don't try to auth for public images 2019-06-24 19:45:50 -05:00
Michael Vogel 26accbe3ef
Merge pull request #7296 from MrPetovan/task/smilies-replace 
Limit smilies replacement to BBCode::convert
 2019-06-24 22:05:37 +02:00
Hypolite Petovan 8214aa287d
Merge pull request #7312 from nupplaphil/task/DBA_Wrapper 
Creating Database class out of DBA (nearly 1:1 - copy)
 2019-06-24 07:05:23 -04:00
Philipp Holzer 91c295b55f
Rebase type-hint based on af9ce6b92a 2019-06-24 09:36:07 +02:00
Philipp Holzer 082634adbc
Moving from DBA to Database 2019-06-24 09:36:07 +02:00
Michael 80f4214d91 Merge remote-tracking branch 'upstream/develop' into contact-discovery 2019-06-24 05:41:10 +00:00
Michael bca1dc1ca4 Moving functionality to the contact model 2019-06-24 03:25:01 +00:00
Michael 037cf01a15 Merge remote-tracking branch 'upstream/master' into contact-discovery 2019-06-24 03:23:57 +00:00
Hypolite Petovan 2fb70bd5f2 Use Unicode to convert multiple hearts in Content\Smilies 2019-06-23 17:53:25 -04:00
Hypolite Petovan b51fb8c994 Fix typo in docblock in include/text 2019-06-23 17:53:25 -04:00
Hypolite Petovan 19b7398c6a Update BBCode::convert test mock-ups 2019-06-23 17:53:25 -04:00
Hypolite Petovan 9545ff614b Limit smilies replacement to BBCode::convert 2019-06-23 17:53:25 -04:00
Hypolite Petovan 5e4ace271b Welcome 2019.09-dev! 2019-06-23 17:52:05 -04:00
Hypolite Petovan b9ab613777 Merge branch 'master' into develop 2019-06-23 17:40:52 -04:00
Hypolite Petovan f0c8543241 Update Composer archive settings 2019-06-23 17:38:12 -04:00
Hypolite Petovan c1f99c70b1 Merge branch '2019.06-rc' 
# Conflicts:
#	CHANGELOG
#	VERSION
#	boot.php
 2019-06-23 15:30:44 -04:00
Hypolite Petovan a25ed827c9 Updated version constants for 2019.06 release 2019-06-23 15:28:38 -04:00
Hypolite Petovan e4714cc504 Updated CHANGELOG for 2019.06 release 2019-06-23 15:26:48 -04:00
Hypolite Petovan fa191bd821
Merge pull request #7305 from deantownsley/imageauthfix 
Make authentication work for local private images
 2019-06-23 15:18:15 -04:00