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

21323 commits

This branch
This branch
All branches
Author SHA1 Message Date
Vinzenz Vietzke 934639654c reverted css changes, adapted credits.tpl from default theme for frio 2018-10-21 22:50:41 +02:00
Michael bb3f07b0b7 We now send the previous followers collection as well 2018-10-21 20:49:50 +00:00
Michael 9b387a226c Fix webmentions and microformats ("redir" only for logged in users) 2018-10-21 20:23:08 +00:00
Hypolite Petovan c1bca43fee Changing default/max values for username_min/max_length 
- Restoring legacy default values (3 and 48 respectively)
- Lowering the max value to 150 to take the full profile URL length into
account
 2018-10-21 15:10:51 -04:00
Hypolite Petovan b08408c086 Add safeguard for username_min|max_length mutual exclusion 2018-10-21 08:28:24 -04:00
Ralf Thees 9cb189049e Merge branch 'develop' of https://github.com/friendica/friendica into develop 2018-10-21 10:27:46 +02:00
Michael Vogel f14dae8d77
Merge pull request #5979 from MrPetovan/task/mock-legacy-module 
Encapsulate legacy module functions in a BaseModule-inherited class
 2018-10-21 10:02:44 +02:00
Michael Vogel 614a549d28
Merge pull request #5976 from MrPetovan/bug/5975-add-missing-l10n-poplang 
Add missing L10n::popLang calls
 2018-10-21 09:40:49 +02:00
Hypolite Petovan b6075de6f8
Merge pull request #5982 from annando/ap-inboxes 
Bugfix: We hadn't deliverd AP posts to all intended receivers
 2018-10-21 02:57:22 -04:00
Michael 1c54c27784 Bugfix: We hadn't deliverd AP posts to all intended receivers 2018-10-21 06:10:24 +00:00
Hypolite Petovan 0e7e5446d6
Merge pull request #5980 from annando/dbclean-limit 
The limit for dbclean is now configurable
 2018-10-21 02:09:08 -04:00
Michael c4cc7a4afb The limit for dbclean is now configurable 2018-10-21 05:41:40 +00:00
Hypolite Petovan 1a37224910 Change file_exists to is_readable in LegacyModule 2018-10-20 22:42:04 -04:00
Hypolite Petovan b27ff9d2b7 Remove direct module function calls in index.php 2018-10-20 22:34:55 -04:00
Hypolite Petovan 5326cc0c2e Add Friendica\LegacyModule class 2018-10-20 22:34:26 -04:00
Hypolite Petovan d360bf926a Use username_min/max_length config keys in Model\User::create 2018-10-20 16:33:54 -04:00
Hypolite Petovan 2ed5c42cdd Add system.username_min_length and system.username_max_length config keys 2018-10-20 16:32:59 -04:00
Ralf Thees 3263f724c6 Merge branch 'develop' of https://github.com/friendica/friendica into develop 2018-10-20 19:37:24 +02:00
Hypolite Petovan 49c7b5481b
Merge pull request #5977 from nupplaphil/move_global_functions_3 
Move Global Functions - Part 3
 2018-10-20 13:19:44 -04:00
Philipp Holzer 4392858662
Move Global Functions - Part 3 
- Replaced every CACHE definition
- Moved check_url to App->checkURL()
- Removed unused definition "ZCURL_TIMEOUT"
 2018-10-20 18:19:55 +02:00
Hypolite Petovan 4ffcb77554 Simplify L10n::t + sprintf instances 2018-10-20 09:02:35 -04:00
Hypolite Petovan a8d3a4d218 Add missing L10n::popLang calls 2018-10-20 09:02:10 -04:00
Ralf Thees 0b6f43113f Merge branch 'develop' of https://github.com/friendica/friendica into develop 2018-10-20 14:33:03 +02:00
Hypolite Petovan ec9f1563f9
Merge pull request #5974 from annando/ap-receiver 
AP: Transmitting and receiving with non AP contacts
 2018-10-20 07:42:54 -04:00
Ralf Thees a29073f006 Merge branch 'develop' of https://github.com/friendica/friendica into develop 2018-10-20 10:50:36 +02:00
Michael Vogel 7a79ac912c
Merge pull request #5973 from friendica/bug/5946-remove-last-include-security 
Update Addon documentation about location of logged_in hook
 2018-10-20 10:10:56 +02:00
Michael fea48fa85e AP: Transmitting and receiving with non AP contacts 2018-10-20 07:53:45 +00:00
Ralf Thees 2f7f9ffdd8 Merge branch 'develop' of https://github.com/friendica/friendica into develop 2018-10-20 04:40:48 +02:00
Hypolite Petovan 0f44e03a9e
Updated german addons doc with new location for logged_in hook 2018-10-19 15:18:10 -04:00
Hypolite Petovan 6b1f490a2a
Updated documentation for logged_in hook location 2018-10-19 15:15:24 -04:00
Michael Vogel 97c181a391
Merge pull request #5972 from friendica/bug/5946-remove-last-include-security 
Remove last references to include/security.php
 2018-10-19 21:14:10 +02:00
Hypolite Petovan ed52b5d0a9
Remove reference to deleted include/security in mod/pubsub 2018-10-19 15:12:53 -04:00
Hypolite Petovan a2666b0d02
Remove reference to deleted include/security.php 2018-10-19 15:11:51 -04:00
Michael Vogel d6864311e3
Merge pull request #5971 from MrPetovan/bug/5970-use-temppath-passwordexposed 
Use system.temppath for PasswordExposedChecker cache
 2018-10-19 19:00:00 +02:00
Michael Vogel bb3efd97ad
Merge pull request #5969 from friendica/bug/5968-add-click-through-image-caption 
[frio] Enable click through image caption in file browser
 2018-10-19 18:58:57 +02:00
Benjamin Lorteau 7795643134 Add system.temppath description to config/settings.ini.php 2018-10-19 11:27:11 -04:00
Benjamin Lorteau d9209b9c7a Use local temporary directory for PasswordExposedChecker cache 2018-10-19 11:26:48 -04:00
Hypolite Petovan afeb6df225
[frio] Enable click through image caption in file browser 2018-10-19 10:46:09 -04:00
Hypolite Petovan f104817967
Merge pull request #5967 from annando/ap-nick 
Fix function naming
 2018-10-19 10:38:51 -04:00
Michael bedab33e0b Fix function naming 2018-10-19 13:08:46 +00:00
Hypolite Petovan ec0d3a6eac
Merge pull request #5946 from JonnyTischbein/move_include_security 
Move and Split include/security
 2018-10-19 08:55:08 -04:00
Hypolite Petovan 6e164ed09f
Merge pull request #5965 from annando/ap-nick 
Use nickname based mentions for AP
 2018-10-19 08:51:38 -04:00
Jonny Tischbein cafd5ca781 update function names in logger and comments 2018-10-19 10:03:52 +02:00
Michael cdeb4682ef Use nickname based mentions for AP 2018-10-19 05:27:54 +00:00
Hypolite Petovan ee5f86d836
Merge pull request #5964 from annando/item-thread 
Use item class instead of direct call
 2018-10-18 23:52:40 -04:00
Michael Vogel 8cecc9fb97
Merge pull request #5962 from friendica/bug/5960-fix-register-email-translation-params 
Remove superfluous L10n::t() parameter in Model\user
 2018-10-19 05:34:24 +02:00
Michael Vogel 45156652cc
Merge pull request #5963 from MrPetovan/bug/5956-catch-more-diaspora-magic-links 
Diaspora: Widen the magic link regular expression
 2018-10-19 05:30:52 +02:00
Michael 4ae37c6196 Merge remote-tracking branch 'upstream/develop' into item-thread 2018-10-19 03:19:34 +00:00
Hypolite Petovan d0681075bf Add itemsource module 2018-10-18 22:49:25 -04:00
Hypolite Petovan eb714f0487 Diaspora: Widen the magic link regular expression 2018-10-18 22:39:06 -04:00