clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
18,642 Commits 3 Branches 0 Tags 183 MiB
Commit Graph

963 Commits

Author SHA1 Message Date
Hypolite Petovan d376ed6f61
Merge pull request #4596 from annando/attachment-encode 
Attachment encode
 2018-03-14 18:59:25 -04:00
Michael 4ba3ba391a The attachment text had already been in HTML and mustn't be converted again 2018-03-14 22:51:14 +00:00
Hypolite Petovan 65b0159282
Merge pull request #4593 from annando/fix-ostatus 
OStatus: Fixed communication issues with deleted contacts
 2018-03-14 18:46:21 -04:00
Michael 2bedead6f4 Remove commented code 2018-03-14 22:31:52 +00:00
Michael 5bd519efff There is now a "content-warning" field 2018-03-14 22:28:35 +00:00
Michael 8c42e2e62e Avoid double encoding of the attachment content 2018-03-14 21:47:24 +00:00
Michael d98c6819e7 $contact isn't called by reference anymore 2018-03-14 20:53:03 +00:00
Michael 7db0b850cb Avoid an error in OnePoll when the contact was "null". 2018-03-14 19:47:14 +00:00
Michael 6352aa112b Add the nsfw removal behind a config switch 2018-03-14 07:13:17 +00:00
Michael 858fd127a1 Fix: subscribing to the old followers hadn't worked 2018-03-14 00:27:15 +00:00
Michael f49391a21c "nsfw" at "content warning" content doesn't fit together 2018-03-13 22:39:08 +00:00
Michael 3f6fefaa9a Pleroma with the Mastodon UI handles content warning different 2018-03-13 21:58:05 +00:00
Michael 32ee4ca4b1 OStatus: Fixed communication issues with deleted contacts 2018-03-13 06:21:44 +00:00
Michael 23718aeae3 OStatus: Only posts from followers will be imported (Issue 4369) 2018-03-12 10:45:40 +00:00
Michael 052ad155a2 Issue 4115: Events are now formatted better for Diaspora 2018-03-11 21:10:36 +00:00
Michael b7a5e076fc Fix: The ownership of forum items had been wrong 2018-03-11 18:12:38 +00:00
Michael cc4347d72f Issue 4497: Forum feeds had been empty 2018-03-11 14:01:40 +00:00
Michael fbb38837b0 Shortener deactivated, due to Diaspora problems 2018-03-11 12:16:17 +00:00
Michael 229fb0439e Links to Diaspora had sometimes been cut 2018-03-11 10:54:02 +00:00
Michael Vogel 28615ae24b
Merge pull request #4576 from MrPetovan/bug/fix-attach-display 
Formatting changes to Protocol/Feed
 2018-03-11 00:43:16 +01:00
Hypolite Petovan 9b14165cc8 Formatting changes to Protocol/Feed 
- Change attribute name condition
- Singularize $attributes variable name
 2018-03-10 18:35:24 -05:00
Michael Vogel 2009c06195
Merge pull request #4573 from MrPetovan/bug/fix-attach-display 
Add support for Atom enclosure
 2018-03-11 00:34:26 +01:00
Hypolite Petovan a80d77f328 Add support for Atom enclosure 2018-03-10 12:40:21 -05:00
Michael fa496d3e5f Issue 4556: Adding index hints to improve the notifications speed (hopefully) 2018-03-09 22:53:19 +00:00
Michael 7706616640 Bugfix: Reshare with added content to Diaspora looked ugly 2018-03-09 20:04:31 +00:00
Michael 3e51fa73b1 Additional checks 2018-03-09 05:38:15 +00:00
Michael c9095386c8 Diaspora: Avoid warning "supplied key param cannot be coerced into a public key" 2018-03-09 05:31:13 +00:00
Michael f23596421d Avoid SQL errors due to duplicate entries in the "participation" table 2018-03-08 21:04:11 +00:00
Michael 480fde7ca8 Bugfix: missing "use" 2018-03-08 20:48:00 +00:00
Michael c438e47827 Bugfix: Avoid "Class not found" error 2018-03-08 19:58:35 +00:00
Michael Vogel b6b67c9044
Merge pull request #4540 from MrPetovan/task/4520-load-whole-config 
[develop] Performance: Add preloading config adapter
 2018-03-08 20:35:14 +01:00
Michael Vogel 26b6cbcb3b
Merge pull request #4560 from MrPetovan/task/3878-move-html2_-to-src 
[develop] Move include/html2* to src/
 2018-03-08 20:24:09 +01:00
Hypolite Petovan 49bd2903c7 Fix wrong SQL query syntax in Core\ACL 2018-03-08 04:42:07 -05:00
Hypolite Petovan 789561c7a2 Remove/Update references to include/html2*.php 2018-03-07 16:34:17 -05:00
Hypolite Petovan 5e806ff598 Replace html2plain calls by HTML::toPlaintext 2018-03-07 16:29:44 -05:00
Hypolite Petovan b5666bd27f Replace html2bbcode calls by HTML::toBBCode 2018-03-07 16:24:13 -05:00
Hypolite Petovan 1df4bb6db8 Create Content\Text\HTML class 
- Move BBCode::cleanCss to HTML::sanitizeCSS
 2018-03-07 16:20:04 -05:00
Michael Vogel e2fd882134
Merge pull request #4557 from MrPetovan/task/4518-add-memcached-support 
[develop] Hotfix: Fix wrong session expire set for custom duration
 2018-03-07 08:10:28 +01:00
Hypolite Petovan ef0701a97a Fix wrong session expire set for custom duration 2018-03-06 21:34:00 -05:00
Hypolite Petovan 87f2d18554 Move *ConfigValue functions to App 2018-03-06 20:04:04 -05:00
Hypolite Petovan 047f949967 Remove irrelevant else case 2018-03-06 19:52:36 -05:00
Hypolite Petovan dcd1f18611 Add refresh feature to Preload (P)Config adapters 
- Add private methods to manipulat the App config variable
 2018-03-06 19:52:36 -05:00
Hypolite Petovan 7afcd6d49e Update PConfig class with adapter 2018-03-06 19:52:36 -05:00
Hypolite Petovan 6fec043375 Update Config class with adapter 2018-03-06 19:52:36 -05:00
Hypolite Petovan d760d33989 Add Config adapter interfaces/classes 2018-03-06 19:52:36 -05:00
Michael Vogel cc688e2b4f
Merge pull request #4549 from MrPetovan/task/4518-add-memcached-support 
[develop] Performance: Add memcached support/Improve database cache (redux)
 2018-03-06 16:34:28 +01:00
Hypolite Petovan 059b1f63f8 Add support for multiple Memcached servers 
- Updated htconfig documentation
 2018-03-04 23:28:49 -05:00
Hypolite Petovan 95752b79e8 Add cache performance to API and worker 2018-03-04 23:13:19 -05:00
Hypolite Petovan 22fd2409ca Add cache to performance arrays 2018-03-04 23:13:19 -05:00
Hypolite Petovan 4954c4b9aa Add cache timing points 2018-03-04 23:13:19 -05:00
Hypolite Petovan 3df34d33d5 Fix DatabaseCacheDriver::get SQL select 
- Fix typo
- Fix wrong usage of NOW()
 2018-03-04 23:13:19 -05:00
Hypolite Petovan 3628b62aeb Add support for Memcached/Improve database cache 
- Create Cache Driver interface
- Update cache table fields
- Add CacheSessionHandler
 2018-03-04 23:13:19 -05:00
Hypolite Petovan bb7f459b47 Remove references to include/bb2diaspora.php 2018-03-04 17:43:41 -05:00
Hypolite Petovan 26ea6f69d7 Update references to bb2diaspora and diaspora2bb 2018-03-04 17:39:41 -05:00
Hypolite Petovan fe5ce67ef8 Move bb2diaspora() content to Content\Text\BBCode::toMarkdown 
- Use self where appropriate
- Add BaseObject extension
 2018-03-04 17:34:59 -05:00
Michael cd79ce3a57 Fix: Multiple accounts per mail address are allowed when not explicit forbidden 2018-03-04 22:23:52 +00:00
Hypolite Petovan a233ce1658 Create Markdown::toBBCode() method 
- Create private callback Markdown::diasporaMention2BBCodeCallback
 2018-03-04 08:31:05 -05:00
Michael 13df527d62 Bugfix: Don't cache when looking for maintenance mode 2018-03-04 13:01:46 +00:00
Hypolite Petovan ab544e1e9f Add missing dba::close() call in Contact::pruneUnavailable 2018-03-03 07:41:49 -05:00
Hypolite Petovan 1907a5dbe7
Rename Acl.php to ACL.php 2018-03-03 07:40:18 -05:00
Hypolite Petovan cd3ff100ab Rename Acl.php to ACL.php 2018-03-03 07:38:15 -05:00
Hypolite Petovan 35d09fdad1 Fix query mistake in Acl::getSuggestContactSelectHTML 2018-03-02 18:40:09 -05:00
Hypolite Petovan 09c717d751 Remove references to include/acl_selectors 2018-03-02 18:40:09 -05:00
Hypolite Petovan ce9e0f3649 Move prune_deadguys to Contact 2018-03-02 18:40:08 -05:00
Hypolite Petovan 113ea38d50 Move contact_select to Acl 
- Simplify Acl::getMessageContactSelectHTML parameters
 2018-03-02 18:40:08 -05:00
Hypolite Petovan eeafb59c31 Add new class/functions 
- Create class Core\Acl
- Add Contact::pruneUnavailable
- Add mod_content
 2018-03-02 18:40:08 -05:00
Tobias Diekershoff b5f8d73833
Merge pull request #4527 from annando/fix-no-constant-update 
Bugfix: No constant update in "getIdForUrl"
 2018-03-02 10:58:17 +01:00
Michael 361af7bc78 Bugfix: No constant update in "getIdForUrl" 2018-03-02 03:55:24 +00:00
Hypolite Petovan 41678ec3cd Add no_update flag to speed up Contact::getIdForURL instances 2018-03-01 19:54:45 -05:00
Hypolite Petovan 9f21e7f34f Use default value for uid parameter in Contact::getIdForURL 2018-03-01 19:54:12 -05:00
Michael 0cc121cf44 Bugfix: Deleting comments via DFRN had only partly worked 2018-03-01 21:52:36 +00:00
Michael 2f121aa828 When deleting, don't send the parent via DFRN 2018-03-01 20:44:44 +00:00
Hypolite Petovan 4d3ea08c97 Use NOT EXISTS to improve performance 2018-02-28 08:50:26 -05:00
Hypolite Petovan f58d8f4108 Add attendance check to event reminder 2018-02-27 20:47:18 -05:00
Michael d4c95e0032 Contact updates should now work more reliable 2018-02-26 21:53:42 +00:00
Hypolite Petovan 2b9561a774
Merge pull request #4502 from annando/guid-from-mail 
guid creation: Take the hostname from mail addresses for mail posts
 2018-02-26 09:36:56 -05:00
Michael 9e721c0908 guid creation: Take the hostname from mail addresses for mail posts 2018-02-26 11:48:05 +00:00
Michael fe68e99c7c The tag query should be much faster now 2018-02-26 06:59:32 +00:00
Hypolite Petovan 8a3927e12c
Merge pull request #4489 from annando/missing-fid 
When refreshing the fcontact, the returned array was incomplete
 2018-02-22 05:03:30 -05:00
Michael a74b5fdde8 When refreshing the fcontact, the returned array was incomplete 2018-02-22 09:59:21 +00:00
Michael 2f2e7b9d5a fetch_first is now used / additional logging 2018-02-22 09:51:59 +00:00
Michael 046352606e Bugfix: $uid wasn't available in that context 2018-02-22 07:05:56 +00:00
Michael 2897333c28 Most queries are now done with the dba functions 2018-02-22 06:52:58 +00:00
Michael 8ad2ebbf47 $u is now $user 2018-02-21 23:10:29 +00:00
Michael 8e0496c040 Better naming of variables 2018-02-21 22:55:23 +00:00
Michael 5a91c746e9 $arr is now $item 2018-02-21 21:39:07 +00:00
Michael 82bd26edb9 The item class had been improved (e.g. database calls) 2018-02-21 21:08:37 +00:00
Michael ae705261f1 Function is only used locally 2018-02-21 05:21:55 +00:00
Michael a59796d1d4 No gcontact-id anymore (It wasn't really used) 2018-02-21 05:15:55 +00:00
Hypolite Petovan eed35c3e69
Merge pull request #4484 from annando/item-guid 
The guid creation for posts is now done in a separate function
 2018-02-20 23:22:11 -05:00
Michael 475969a1d3 The guid creation for posts is now done in a separate function 2018-02-21 04:13:13 +00:00
Michael 3e46382459 Standard stuff 2018-02-20 11:20:28 +00:00
Michael a3af6807ac Improved resource id creation 2018-02-20 10:02:07 +00:00
Michael d90b93cfda Several more improvements to the database structure 2018-02-20 07:40:21 +00:00
Michael 6c26dcf1c7 The network is now just a 4 character field 2018-02-19 13:58:04 +00:00
Michael 0062fede79 Issue 1312: Improve account expiry 2018-02-18 22:19:20 +00:00
Michael d0fa80b195 Issue 4228: Don't post an item if it belongs to a picture upload without an post 2018-02-18 17:29:14 +00:00
Michael a9a85849f4 Issue 4369: Added logging to know why a post is stored 2018-02-18 16:43:18 +00:00
Michael d119beef3f Issue 4396: Avoid SQL error during UImport 2018-02-17 10:37:14 +00:00
Hypolite Petovan 9e3bae5caa Remove references to include/bbcode.php 2018-02-14 22:01:14 -05:00
Hypolite Petovan 0c52866693 Refactor bbcode() into BBCode::convert() 2018-02-14 21:33:55 -05:00
Hypolite Petovan 29f5270313 Remove unused parameter preserve_nl in BBCode::convert 2018-02-14 21:31:28 -05:00
Hypolite Petovan ee380c3149 Fix undeclared variable in Content\Text\BBCode 2018-02-14 20:25:23 -05:00
Michael 3e456ddcb8 Issue 4396: WSOD with uimport 2018-02-14 23:13:53 +00:00
Hypolite Petovan bcd896c604
Merge pull request #4460 from annando/bugfix-dfrn-mail 
DFRN: Bugfix for not storing mails
 2018-02-14 17:11:47 -05:00
Michael 2f71a6f80f DFRN: Bugfix for not storing mails 2018-02-14 22:08:16 +00:00
Hypolite Petovan 41cd5af54f
Merge pull request #4459 from annando/unmark-contact 
Bugfix and improvements for unmarking potentially archived contacts
 2018-02-14 17:01:17 -05:00
Michael Vogel 79696a19e5
Merge pull request #4455 from MrPetovan/task/4176-fix-undeclared-variables-2 
[Scrutinizer] Fix undeclared variables part 6: src/ (except Protocol/)
 2018-02-14 22:49:43 +01:00
Michael 43b1eccbcd Bugfix and improvements for unmarking potentially archived contacts 2018-02-14 21:18:16 +00:00
Hypolite Petovan cdc8a3b68d
Merge pull request #4457 from annando/accept-archived 
Diaspora: Accept posts from archived contacts
 2018-02-14 09:46:24 -05:00
Michael 878b2be63d Diaspora: Accept posts from archived contacts 2018-02-14 14:29:28 +00:00
Hypolite Petovan d419d07f73 [Scrutinizer] Fix undeclared variables in src/ (except Protocol/) 
- Use dba::selectFirst to remove intermediate variables `$r`
- Remove unused variable `$url_recipients` in Worker\Dellivery
 2018-02-14 00:05:00 -05:00
Hypolite Petovan d8e9ed5ff8 [Scrutinizer] Fix undeclared variables in src/Protocol/ 
- Use dba::selectFirst to remove intermediate variables `$r`
- Remove unused variable `$sender` in Protocol\Email
- Simplify Protocol\OStatus:fetchAuthor cascading queries
 2018-02-13 23:58:46 -05:00
Hypolite Petovan 2234bb92ae
Merge pull request #4449 from annando/probe-pump 
Improved profile probing for pump.io
 2018-02-13 08:25:47 -05:00
Michael 6a486aa92b Remove address from name 2018-02-13 07:10:05 +00:00
Tobias Diekershoff 4c91729bc9
Merge pull request #4447 from MrPetovan/bug/4445-improve-bbcode-quote-html 
Add paragraph to BBCode conversion of [quote]
 2018-02-13 07:09:22 +01:00
Michael 7df60ae634 Improved profile probing for pump.io 2018-02-13 05:54:09 +00:00
Hypolite Petovan 4bc1672921 Add paragraph to BBCode conversion of [quote] 2018-02-12 22:37:30 -05:00
Hypolite Petovan 219182d41e
Merge pull request #4446 from annando/worker-priority 
Bugfix: The provided worker priority had been ignored
 2018-02-12 22:29:53 -05:00
Michael 6289e307aa Bugfix: The provided worker priority had been ignored 2018-02-13 02:26:35 +00:00
rabuzarus af3a57376a Item::tagDeliver(): remove contact as array key for hooks because it was never declared 2018-02-12 17:05:01 +01:00
rabuzarus 58b4169097 fix undeclared $uid variables in Item::insert() 2018-02-12 16:56:52 +01:00
rabuzarus 342b9af734 fix undeclared variables or wrong variable names (/src) 2018-02-12 16:08:28 +01:00
Michael Vogel e90b3f606d
Merge pull request #4439 from MrPetovan/bug/4396-use-dba-exists-in-uimport 
Add dba::exists usages to UserImport::importAccount
 2018-02-12 06:02:30 +01:00
Hypolite Petovan f68667e301
Merge pull request #4438 from rabuzarus/20180211_-_fix_variables_part_one 
fix undeclared variables or wrong variable names (/include) - part 1
 2018-02-11 22:00:42 -05:00
rabuzarus 5fe7a21482 add $no_photos parameter to add_page_info_data() 2018-02-12 03:56:20 +01:00
Hypolite Petovan 1d035ae2ae Add dba::exists usages to UserImport::importAccount 2018-02-11 19:28:39 -05:00
Michael 2a762868e9 Some clean up for the worker, arrays are now supported as parameter 2018-02-11 16:18:39 +00:00
Michael 30cfca40d8 Use a more simple HTML for API output 2018-02-10 13:33:15 +00:00
Hypolite Petovan 8b557c3157
Merge pull request #4433 from annando/direct-block 
Suppress content from hidden or blocked contacts
 2018-02-10 07:49:34 -05:00
Michael ee7c587693 Suppress content from hidden or blocked contacts 2018-02-10 12:34:10 +00:00
rabuzarus 9a4d19e284 move membersince addon to core 2018-02-09 20:44:45 +01:00
Michael Vogel 25fbdd21c5
Merge pull request #4429 from MrPetovan/bug/4426-handle-auth-exceptions 
Handle authentication exceptions in Login module
 2018-02-09 19:03:52 +01:00
Michael a2f172e084 Bugfix for check that the DFRN entry already exists 2018-02-09 06:20:01 +00:00
Hypolite Petovan 8a9917857e Handle authentication exceptions in Login module 
- Break down large methods into smaller ones
- Add more authentication exception
- Add a legacy User::authenticate method
 2018-02-09 00:08:01 -05:00
Michael 15a857e411 Line endings are converted to unix style 2018-02-09 03:49:49 +00:00
Michael d42f86e218 We can now delegate again like before 2018-02-08 22:18:34 +00:00
Michael 1424559bee Forgotten "+" 2018-02-08 19:47:47 +00:00
Michael 70c31a6149 Improved date time formula thing. 2018-02-08 19:33:40 +00:00
Michael d70a20a466 We now incrementally calculate the queue delivery time 2018-02-08 18:39:48 +00:00
Michael ac7b0661d2 Added documentation 2018-02-08 15:03:18 +00:00
Michael 8ea572ebd1 Added a config value to ignore server checks 2018-02-08 13:09:09 +00:00
Michael 0093f863fd Don't add already queued items from Diaspora to the queue again 2018-02-08 11:26:24 +00:00
Michael 87280ebf57 Bugfix: a forgotten "use" in bbcode.php 2018-02-08 06:08:07 +00:00
Michael 3890dfee4a Wrong function order in Item::update 2018-02-07 20:09:37 +00:00
Michael b1e91f7401 Quickfix: Removed exception since it blocked message delivery 2018-02-07 13:31:17 +00:00
Tobias Diekershoff 85c8bf0228
Merge pull request #4399 from MrPetovan/task/3878-move-include-bbcode-to-src 
Move include/bbcode to src/ part 1 : Everything but bbcode()
 2018-02-07 07:18:39 +01:00
Michael 4859a18ae4 Fixed wrong capitalation (or however this is written) 2018-02-06 23:17:18 +00:00
Michael 053cb31eea Forgotten commented out text 2018-02-06 22:57:56 +00:00
Michael 47d165cb25 Hook calls can now be forked into a worker queue entry 2018-02-06 22:52:36 +00:00