tobias/friendica
1
0
Fork 0
Code Pull requests Activity
21573 commits 2 branches 61 tags 203 MiB
Commit graph

2283 commits

Author SHA1 Message Date
Hypolite Petovan 97b6d70825
Merge pull request #6096 from annando/ap-emojis 
We now directly support the custom emojis from Mastodon
 2018-11-07 20:10:16 -05:00
Michael cd2c7f782f We now directly support the custom emojis from Mastodon 2018-11-07 20:34:03 +00:00
Adam Magness 003eee5912 Standards 
fix indentation level, replace x() with !empty()
 2018-11-07 14:16:59 -05:00
Adam Magness 7cb9138201 Move another function 
move get_plink to Item class, and also fix up getApp since we extend BaseObject
 2018-11-07 07:19:39 -05:00
Adam Magness e537f7d017 Function calls 
update function calls to new class
 2018-11-06 21:16:27 -05:00
Adam Magness d50a1edef4 Split text to Item 
move functions from text.php to Item class
 2018-11-06 21:12:41 -05:00
Hypolite Petovan dc669fa736
Merge pull request #6090 from zeroadam/TextToL10n 
Split functions to L10n
 2018-11-06 13:44:30 -05:00
Hypolite Petovan dd35cd0701
Merge pull request #6086 from friendica/fabrixxm-patch-1 
Fix Friendica node info json
 2018-11-06 10:48:00 -05:00
fabrixxm 0441a169a9 Fix code style 2018-11-06 16:37:58 +01:00
Adam Magness 301cdd23dc coding standards 2018-11-06 10:28:18 -05:00
Adam Magness dfd48596d3 Add use statement 
add use for core class
 2018-11-06 09:55:14 -05:00
Adam Magness 352da9bcf3 Update function calls 
update function calls for moved functions
 2018-11-06 09:52:58 -05:00
Adam Magness 1d571a527b Split text.php to L10n 
move functions from text.php to L10n class
 2018-11-06 09:52:58 -05:00
Michael ffb03517b6 Fixes PR 6085 2018-11-06 14:00:31 +00:00
Adam Magness 4f07ebb52f Rename properly 
rename function properly this time!
 2018-11-06 06:34:32 -05:00
Adam Magness 3eecd108c5 rename function 
rename function and update calls.
 2018-11-06 06:31:48 -05:00
fabrixxm 1858204cbd
Stop PortableContacts to raise warning on malformed register_policy 2018-11-06 12:10:23 +01:00
Adam Magness 237fc30b4e Missed use 
fix missing use statement
 2018-11-05 21:45:44 -05:00
Adam Magness 591c00dd5c bug fix 
fix variable
 2018-11-05 21:26:58 -05:00
Adam Magness a71eb1d127 functions moved to HTML class 
update function calls to moved class.
 2018-11-05 21:06:26 -05:00
Adam Magness e31dde6084 Split text.php to HTML class 
move functions from text.php to src/Content/Text/HTML
 2018-11-05 20:27:22 -05:00
Hypolite Petovan e8891e9ba4
Merge pull request #6082 from annando/diasppora-delivery 
Improved delivery
 2018-11-05 16:26:02 -05:00
Michael 3b565e80b6 Improved logger text 2018-11-05 20:35:17 +00:00
Philipp Holzer 049cd963f3
Using random_int directly 2018-11-05 21:15:30 +01:00
Philipp Holzer 6e10bdf361
Move random Digits to Crypto class 2018-11-05 21:02:54 +01:00
Michael 59d8cae805 Merge remote-tracking branch 'upstream/develop' into diasppora-delivery 2018-11-05 19:46:59 +00:00
Adam Magness 186cd1d415 Revert "Move methods to new Util/Strings class" 
This reverts commit 97fcf23371.
 2018-11-05 13:07:15 -05:00
Adam Magness 9e51be7554 Revert "Update function calls" 
This reverts commit 748fb8b946.
 2018-11-05 13:07:07 -05:00
Adam Magness 748fb8b946 Update function calls 
update function calls to new class
 2018-11-05 07:40:18 -05:00
Adam Magness 97fcf23371 Move methods to new Util/Strings class 
move string methods from xml to strings class.
 2018-11-05 07:31:45 -05:00
Adam Magness b07d47b0f7 Update function calls 
update function calls to new names
 2018-11-05 07:24:14 -05:00
Adam Magness 6cc339031a Rename functions 
rename functions
 2018-11-05 07:24:14 -05:00
Adam Magness ae4aab872f forgotten self 
forgotten self references
 2018-11-05 07:24:14 -05:00
Adam Magness 61bc9facc8 Implement functions 
implement functions relocated to xml class
 2018-11-05 07:24:14 -05:00
Adam Magness 84e900d96f Move to XML 
move functions from text to xml
 2018-11-05 07:24:14 -05:00
Michael dc4a2aeab8 Merge remote-tracking branch 'upstream/develop' into diasppora-delivery 2018-11-04 23:19:34 +00:00
Michael ef205878b6 Cleaned up the notifier 2018-11-04 23:17:41 +00:00
Michael bd97215147 Merge remote-tracking branch 'upstream/develop' into diasppora-delivery 2018-11-04 18:54:49 +00:00
Michael e759497af3 Fix small typo / Workerqueue count now only counts non deferred entries 2018-11-04 10:51:01 +00:00
Michael ec3cec37eb Fixes #6071: We should use the correct variable ... 2018-11-04 09:18:36 +00:00
Michael 8f27e3aeb1 Support for fetching non-public content / preparations for forum posts 2018-11-03 21:37:08 +00:00
Michael 1395bdc188 Preparations for a relocation message / fix for notice 2018-11-02 21:57:06 +00:00
Michael 1b43d459b6 Fix for delivering forum posts again 2018-11-01 23:52:06 +00:00
Philipp Holzer 83ead5ec48
Test enhancements 2018-11-01 13:44:47 +01:00
Tobias Diekershoff e12942ce7f
Merge pull request #6058 from JonnyTischbein/issue_contact_batch_archive 
[frio] Fix unarchive contact batch action
 2018-11-01 06:41:05 +01:00
Jonny Tischbein 76c9d37006 Fix not working unarchive contact batch action 2018-10-31 21:20:44 +01:00
vinzv fc2b81d0dd
Update Install.php 
Please update messages.po at Transifex as well.
 2018-10-31 21:03:32 +01:00
Jonny Tischbein b66bcb20da Redirect to previous page after NON-AJAX Post delete via second parameter in /item/drop 2018-10-31 20:09:44 +01:00
Hypolite Petovan 8a46c786f3
Merge pull request #6053 from zeroadam/CoreRenderer 
Core Renderer Class
 2018-10-31 13:57:12 -04:00
Adam Magness 70f01d6c00 Template Engine and props to Renderer 
move methods and props from App to Renderer
 2018-10-31 13:25:38 -04:00