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

6362 Commits

Author SHA1 Message Date
Hypolite Petovan 41db5f0912 Display content warning as title if collapsing is deactivated 2018-04-04 23:08:48 -04:00
Hypolite Petovan 296f561878 Rename hook to "prepare_body_content_filter" 2018-04-04 23:08:48 -04:00
Hypolite Petovan d38b86dabf Fix disabled content filter for own posts 2018-04-04 23:08:48 -04:00
Hypolite Petovan f26c99d17b Disable content filter for preview and own posts 2018-04-04 23:08:48 -04:00
Hypolite Petovan d603bf062d Add CSS classes to content-filter wrapper 2018-04-04 23:08:48 -04:00
Hypolite Petovan b755e808df Add new content_filter hook in prepare_body 
- Add content warning processing to prepare_body with use of disable_cw
setting
- Add filter_reasons params to prepare_body hook
 2018-04-04 23:08:48 -04:00
Hypolite Petovan bec46d7b01 Remove content warning processing in put_item_in_cache 2018-04-04 23:08:48 -04:00
Hypolite Petovan 586b0b6e57 Add bash to text_highlight language list 2018-03-29 19:29:09 -04:00
Hypolite Petovan daffc27061 Move suppress_tags config to template 
- Add new item.suppress_tags template variable
- Fix template formatting
 2018-03-25 00:38:23 -04:00
Hypolite Petovan 4eaf0d76b0 Remove include/event 2018-03-23 06:32:34 -04:00
Hypolite Petovan 6e7c6ab0fa Remove references to include/event 2018-03-23 06:32:34 -04:00
Hypolite Petovan f7e2071117 Replace include/event function with method calls 
- Updated scope of Model\Event methods
- Updated use list
 2018-03-23 06:32:34 -04:00
Hypolite Petovan 5aecc758f9 Replace include/event function content by method calls 2018-03-23 06:32:34 -04:00
Hypolite Petovan 27d94023ee Merge branch 'master' into develop 2018-03-23 06:15:55 -04:00
Michael e74f186b34 Event: Prevent SQL errors with events without end 2018-03-21 20:16:43 +00:00
Michael 73efdb99e3 Fix for incorrect datetime values 2018-03-21 05:20:55 +00:00
Tobias Diekershoff f082f0da4f
Merge pull request #4636 from annando/event-diaspora 
Fix: Events on Diaspora now should look fine
 2018-03-20 08:48:37 +01:00
Michael f4ba5d9799 Fix: Events on Diaspora now should look fine 2018-03-20 06:32:17 +00:00
fabrixxm e6c59b0593
fix docstring of get_poke_verbs() 2018-03-19 10:20:01 +01:00
fabrixxm 8a2a4510ec
Small fixes to translatable string 
and some small cosmetic fixup to docstring for `notification()`
 2018-03-19 10:15:09 +01:00
Hypolite Petovan 881c7ccfc1 Add meaningful return value to dba::connect 
- Move System::unavailable call to index
 2018-03-18 05:15:14 -04:00
Michael 537ef83a24 If we aren't connected to the database, we shouldn't return "true" on connect 2018-03-17 09:21:06 +00:00
Hypolite Petovan c53c00ba4e Add rendred-hash to put_item_in_cache todo 2018-03-15 03:23:11 -04:00
Hypolite Petovan 644767519e Ensure the item body stays the same in put_item_in_cache() 
- Add documentation
 2018-03-15 02:13:00 -04:00
Hypolite Petovan e28020c68a Fix for CW: Items weren't cached 2018-03-15 01:32:04 -04: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 5bd519efff There is now a "content-warning" field 2018-03-14 22:28:35 +00:00
Michael d98c6819e7 $contact isn't called by reference anymore 2018-03-14 20:53:03 +00:00
Michael 32ee4ca4b1 OStatus: Fixed communication issues with deleted contacts 2018-03-13 06:21:44 +00:00
Michael 4bb9263e43 Fix: The acl lookup now works in multi threaded posts as well 2018-03-12 04:51:27 +00:00
Michael 052ad155a2 Issue 4115: Events are now formatted better for Diaspora 2018-03-11 21:10:36 +00:00
Hypolite Petovan 9f693cc443 Display attach with missing title 
- Rework preg_match_all call to remove 3 indentation levels
 2018-03-08 23:52:01 -05:00
Hypolite Petovan f633acd8d1 Remove include/html2*.php files 2018-03-07 16:34:48 -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 3bb2f72d05 Replace html2* function content by references to HTML class 2018-03-07 16:21:02 -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 95752b79e8 Add cache performance to API and worker 2018-03-04 23:13:19 -05:00
Hypolite Petovan 6447a45a06 Remove include/bb2diaspora.php 2018-03-04 17:43:51 -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 506f851b23 Bugfix: Avoid that Twidere is crashing 2018-03-04 19:25:02 +00:00
Hypolite Petovan 49f99d94f6 Replace disapora2bb function content with Markdown::toBBCode call 2018-03-04 08:31:40 -05:00
Hypolite Petovan 7bd4a52156
Merge pull request #4532 from annando/dba-array 
[develop] We now accept array as condition parameters
 2018-03-03 18:14:19 -05:00
Michael 74f6dc5373 Renamed functions / each is replaced 2018-03-03 23:02:45 +00:00
Hypolite Petovan b8fca5efe7 [PHP 7.2] Fix missing Countable warning 2018-03-03 08:48:30 -05:00
Michael 194da423e0 An array with fieldnames as keys is important for the "insert" in the "update" function 2018-03-03 13:26:23 +00:00
Tobias Diekershoff 1510b3d948 tyoi, found by 朱陈锬 thanks for that! 2018-03-03 11:02:40 +01:00
Michael 5bda6c7f6d We now accept array as condition parameters 2018-03-03 08:47:13 +00:00
Hypolite Petovan 2f463dfb17 Remove include/acl_selectors 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 207eac4a16 Move navbar_complete to Acl 2018-03-02 18:40:08 -05:00
Hypolite Petovan 824262b824 Move populate_acl to Acl 2018-03-02 18:40:08 -05:00
Hypolite Petovan 2b35938e34 Move get_acl_permissions to Acl 2018-03-02 18:40:08 -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 eef25a3259 Move contact_selector() 2018-03-02 18:40:08 -05:00
Hypolite Petovan e2de86de46 Update references in acl_selectors to new functions 2018-03-02 18:40:08 -05:00
Michael 1be5275eef Some more performance measuring for database stuff 2018-03-02 13:37:49 +00:00
Hypolite Petovan 4fe1d804ab
Merge pull request #4511 from annando/no-activity 
Only show visible activities
 2018-02-27 04:41:12 -05:00
Michael 74ff36eee9 Only show visible activities 2018-02-27 09:29:11 +00:00
Michael 20368cbbf4 Fix for network update (number of maximum comments set to 0) 2018-02-26 22:15:57 +00:00
Michael d2728cad2e Children for the network page are now fetched correctly in the conversation 2018-02-26 06:38:27 +00:00
Michael a1eb5a584f Improve the queries on the network page 2018-02-25 21:33:15 +00:00
Michael a59796d1d4 No gcontact-id anymore (It wasn't really used) 2018-02-21 05:15:55 +00:00
Michael a3af6807ac Improved resource id creation 2018-02-20 10:02:07 +00:00
Hypolite Petovan e2d8c80f33
Revert "Fix PHP Warning: preg_replace(): Compilation failed in include/items" 2018-02-16 11:12:41 -05:00
Hypolite Petovan 31831b9fdb Remove partial preg_quote in include/items 2018-02-16 00:31:32 -05:00
Hypolite Petovan f4d76d10b2 Fix PHP Warning: preg_replace(): Compilation failed in include/items 2018-02-15 22:13:45 -05:00
Hypolite Petovan 71cb1523d5 Remove include/bbcode.php 2018-02-14 22:05:16 -05:00
Hypolite Petovan 9e3bae5caa Remove references to include/bbcode.php 2018-02-14 22:01:14 -05:00
Hypolite Petovan 05a2ea4220 Refactor comments including "bbcode()" 2018-02-14 22:00:43 -05:00
Hypolite Petovan 4e4f5862b2 Remove unused $preserve_nl parameter from bb2diaspora() 2018-02-14 21:45:41 -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
rabuzarus 5fe7a21482 add $no_photos parameter to add_page_info_data() 2018-02-12 03:56:20 +01:00
rabuzarus 26fd6b1c33 fix undeclared variables or wrong variable names (/include) 2018-02-11 22:13:29 +01:00
Michael 30cfca40d8 Use a more simple HTML for API output 2018-02-10 13:33:15 +00:00
Michael ee7c587693 Suppress content from hidden or blocked contacts 2018-02-10 12:34:10 +00:00
Hypolite Petovan 164f4f7cdf
Merge pull request #4424 from annando/manage-admin 
We can now delegate again like before
 2018-02-08 21:41:51 -05:00
Hypolite Petovan 6f9c66b0bc Add missing require in include/text 2018-02-08 19:59:34 -05:00
Michael d42f86e218 We can now delegate again like before 2018-02-08 22:18:34 +00:00
Michael c953784945 Forgotten "use" 2018-02-07 20:22:40 +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 1ec6359faa Duplicate check 2018-02-06 16:44:48 +00:00
Michael e609de2957 Many item calls are now isolated in a single function 2018-02-06 12:40:22 +00:00
Hypolite Petovan a0cdd9c674 Rename Core\Network to Core\Protocol 2018-02-05 12:57:41 -05:00
Adam Magness 8906b98426 Remove old file 
remove old file
 2018-02-05 12:47:37 -05:00
Adam Magness 4be49e706b Remove requires 
remove require_once for old file
 2018-02-05 12:47:37 -05:00
Michael Vogel fa95911fdb
Merge pull request #4393 from MrPetovan/task/3878-move-include-tags-to-src 
Move include/tags to src/
 2018-02-05 18:11:29 +01:00
Hypolite Petovan 8b60cffcb5 Remove most moved functions from include/bbcode 2018-02-04 19:26:22 -05:00
Hypolite Petovan 010cf3b1e8 Update references to BBCode methods 
- Resolve name conflicts with Util\Network
 2018-02-04 19:26:22 -05:00
Hypolite Petovan b4651870db Add references to new methods and constants in include/bbcode 
- Remove all private callback functions from include/bbcode
 2018-02-04 19:25:22 -05:00
Hypolite Petovan 2a5431a59e Rename Model\Term methods 2018-02-04 16:48:50 -05:00
Michael Vogel dad58e0f6f
Merge pull request #4387 from MrPetovan/task/3878-move-datetime-to-src 
Move include/datetime to src/ - Part 2
 2018-02-04 21:05:27 +01:00
Hypolite Petovan fd76b15638 Add is_null check 2018-02-04 08:58:29 -05:00
Hypolite Petovan ef77a772e5 Remove include/tags.php 2018-02-04 00:00:11 -05:00
Hypolite Petovan 2a486903d1 Remove references to include/tags.php 2018-02-03 23:59:31 -05:00
Hypolite Petovan d00c6111fd Replace include/tags function content with references to src methods 2018-02-03 23:52:36 -05:00
Hypolite Petovan 0abe4158d2 Rename Term methods ahead of the move 
- Rename createFromItemURI() to insertFromItemFileByUri()
- Rename createFromItem() to insertFromItemFileById()
 2018-02-03 22:42:31 -05:00