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

21592 Commits

Author SHA1 Message Date
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
Michael b011e42ad2 Issue 6074: Language and "explicit" are now exported 2018-11-05 18:14:58 +00:00
Adam Magness cace4a8991 Update and rename test class 
update and rename test class.
 2018-11-05 13:08:33 -05: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
Michael 9d63c3eb01 Language is now transmitted as well 2018-11-05 18:03:26 +00:00
Michael 58ce0d799b Directory issue 15: Support the "account-type" 2018-11-05 17:59:46 +00:00
Hypolite Petovan 0bfafc63cc
Merge pull request #6076 from nupplaphil/cache_test_fix 
Lock TTL fix
 2018-11-05 10:01:06 -05:00
Adam Magness 119b4afddf Create/Update tests 
create new test class and update old one.
 2018-11-05 07:53:12 -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
Philipp Holzer c2bd69e351
Lock TTL fix 2018-11-05 08:51:35 +01: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
Hypolite Petovan 95a41699cf
Merge pull request #6072 from annando/fix-6071 
Fixes #6071: We should use the correct variable ...
 2018-11-04 15:45:38 -05: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
Hypolite Petovan 62761e1099
Merge pull request #6071 from annando/ap-fetch-signed 
Support for fetching non-public content / preparations for forum posts
 2018-11-04 01:56:09 -05:00
Michael 8f27e3aeb1 Support for fetching non-public content / preparations for forum posts 2018-11-03 21:37:08 +00:00
Hypolite Petovan 0a9dba005c
Merge pull request #6067 from annando/ap-relocation 
Preparations for a relocation message / fix for notice
 2018-11-02 21:16:14 -04:00
Michael 1395bdc188 Preparations for a relocation message / fix for notice 2018-11-02 21:57:06 +00:00
Hypolite Petovan d929e714df
Merge pull request #6065 from annando/fix-forum 
Fix for delivering forum posts again
 2018-11-01 21:48:55 -04:00
Michael 1b43d459b6 Fix for delivering forum posts again 2018-11-01 23:52:06 +00:00
Hypolite Petovan 4f76d21e02
Merge pull request #6062 from nupplaphil/test_enhancements 
Test enhancements
 2018-11-01 10:30:06 -04:00
Philipp Holzer e434ff0196
Test enhancements 2018-11-01 13:45:21 +01:00
Philipp Holzer 83ead5ec48
Test enhancements 2018-11-01 13:44:47 +01:00
Philipp Holzer 70f9d3c596
documentation 2018-11-01 12:48:43 +01:00
Hypolite Petovan 0ccdc2ec0e
Merge pull request #6061 from nupplaphil/autoinstall_test_fix 
AutoInstall Test fix
 2018-11-01 07:41:19 -04:00
Philipp Holzer 4f01a198e1
AutoInstall Test fix 
- New Mock for Renderer
- No need of prepared assert.ini.php anymore
- Mocking Renderer during Autoinstall
 2018-11-01 10:30:44 +01:00
Michael Vogel cbc5e12ea8
Merge pull request #6060 from tobiasd/20181101-lng 
CS, DE, PL translation updates
 2018-11-01 08:12:07 +01:00
Tobias Diekershoff 6dbe307a27 PL translation update THX waldis 2018-11-01 07:59:05 +01:00
Tobias Diekershoff 1ad5f2dc46 CS translation update THX Aditoo 2018-11-01 07:58:53 +01:00
Tobias Diekershoff a4cd01a13a DE translation THX vinz 2018-11-01 07:58:43 +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
Hypolite Petovan fa1328625c
Merge pull request #6057 from vinzv/patch-2 
Update Install.php typos
 2018-10-31 16:21:43 -04:00