friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity
21,834 Commits 2 Branches 63 Tags 238 MiB
Commit Graph

21834 Commits

Author SHA1 Message Date
Adam Magness fd597472f1 Split text.php to Strings class 
move functions to new strings class
Split text.php to Strings class

move functions to new Strings class
 2018-11-08 08:33:28 -05:00
Hypolite Petovan 1a3c88b042
Merge pull request #6097 from nupplaphil/refactor_user_identities 
Refactoring identities to Model\User::identities
 2018-11-08 06:54:48 -05:00
Hypolite Petovan c464ec33e1
Merge pull request #6099 from annando/ap-emojis 
Using CSS for custom emojis
 2018-11-08 06:54:05 -05:00
Hypolite Petovan df6436d982
Merge pull request #6098 from annando/worker-speed 
New indexes to speed up the worker
 2018-11-08 06:52:36 -05:00
Michael 077a96fb28 Using CSS for custom emojis 2018-11-08 07:42:19 +00:00
Philipp Holzer 61971287c4
Fixing tests 2018-11-08 08:11:27 +01:00
Michael e6c1c74126 New indexes to speed up the worker 2018-11-08 07:09:09 +00:00
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
Hypolite Petovan 5d03232dc7
Merge pull request #6093 from zeroadam/TextToItem 
Split text.php to Item class
 2018-11-07 20:06:32 -05:00
Philipp Holzer 8ad721988b
Refactoring identities to Model\User::identities 2018-11-08 00:38:55 +01: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
Andy H 8821d33f73 Merge remote-tracking branch 'upstream/master' into develop 2018-11-07 21:05:12 +07: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 27dd913fcc
Merge pull request #6092 from JonnyTischbein/issue_drop_item_return_non-frio 
Fix return url when dropping post loaded by update_* in non-frio
 2018-11-06 20:16:28 -05:00
Jonny Tischbein 93d50af700 move live update: update_contacts to update_contact 2018-11-06 22:22:42 +01:00
Jonny Tischbein 509dc29b2d Fix return url when dropping post loaded by update_* in non-frio 2018-11-06 21:37:10 +01: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 Vogel 7389dc0b20
Merge pull request #6089 from annando/fix-6085 
Fixes PR 6085
 2018-11-06 15:01:36 +01:00
Michael ffb03517b6 Fixes PR 6085 2018-11-06 14:00:31 +00:00
Hypolite Petovan 017f19d574
Merge pull request #6085 from zeroadam/TextToHTML 
Split text.php functions to HTML class
 2018-11-06 08:30:32 -05: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
fabrixxm 56484eaaeb
Fix Friendica node info json 
And stop worker sending warning from PortableContacts.php
 2018-11-06 10:07:22 +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 9264059945 Missing Include 
missed use statement
 2018-11-05 21:15:47 -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
Hypolite Petovan 26acf3d78e
Merge pull request #6077 from nupplaphil/move_random_digits 
Move random digits
 2018-11-05 15:23:24 -05:00
Philipp Holzer 6949841947
Removed unnecessary function 2018-11-05 21:17:46 +01:00
Philipp Holzer 47095d70a9
Using random_int directly 2018-11-05 21:16:18 +01:00
Philipp Holzer 049cd963f3
Using random_int directly 2018-11-05 21:15:30 +01:00
Philipp Holzer c94936a149
copy/paste error 2018-11-05 21:03:55 +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
Hypolite Petovan 0472c7b57d
Merge pull request #6070 from zeroadam/TextToXML 
split xml functions out of text.php
 2018-11-05 13:50:09 -05:00
Hypolite Petovan 81e81bd8c8
Merge pull request #6079 from annando/issue-dir-15 
Directory issue 15: Support the "account-type"
 2018-11-05 13:49:28 -05:00
Hypolite Petovan e53bba0457
Merge pull request #6080 from annando/issue-6074 
Issue 6074: Language and "explicit" are now exported
 2018-11-05 13:47:40 -05:00