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

21661 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Vogel ab20a83c0a
Merge pull request #5930 from tobiasd/20181015-installdocs 
added links to alternative ways to install Friendica to the docs
 2018-10-15 14:10:50 +02:00
Tobias Diekershoff 092125edb6 ypot 2018-10-15 13:45:21 +02:00
Tobias Diekershoff 4496fdba24 use the right bracket 2018-10-15 13:44:09 +02:00
Tobias Diekershoff c2c2f25d92 added links to alternative ways to install Friendica to the docs 2018-10-15 10:36:27 +02:00
Tobias Diekershoff 664afbcafb
Merge pull request #5926 from annando/defer-worker 
Poddibility to defer worker execution
 2018-10-15 08:02:51 +02:00
Michael e2762e032c Poddibility to defer worker execution 2018-10-15 05:19:35 +00:00
Michael Vogel 0080d117ee
Merge pull request #5923 from MrPetovan/task/improve-contact-module 
Improve Contact module
 2018-10-15 06:02:55 +02:00
Hypolite Petovan ea8b159df4 Fix wrong use statement in mod/update_contacts 2018-10-14 23:09:11 -04:00
Hypolite Petovan aa8039373a Update formatting of Module\Contact 
- Replace double quotes with single
- Align array declarations
- Replace q() call with Model\User::getOwnerDataById()
 2018-10-14 18:30:02 -04:00
Hypolite Petovan a883a99fe6 Replace string fields by array in Module\Contact 2018-10-14 18:27:24 -04:00
Hypolite Petovan 12ddb3bb54 Replace unwarranted uses of $a->data['contact'] 2018-10-14 18:25:44 -04:00
Hypolite Petovan 57e8fb5cb1 Normalize uses of defaults() in Module\Contact 
- Remove uses without default value
- Add relevant uses
 2018-10-14 18:24:02 -04:00
Hypolite Petovan 756a4f1111 Fix remaining instances of "contacts" 2018-10-14 18:02:54 -04:00
Hypolite Petovan ce8b0d0c45
Merge pull request #5922 from JonnyTischbein/issue_delete_since 
Admin: Change User deleted since to delete in
 2018-10-14 17:17:18 -04:00
Jonny Tischbein 3a95644848 Add Support for relativeDateTime in future + update Admin user waiting for deleting table header 2018-10-14 22:57:44 +02:00
Hypolite Petovan 74c5f1f684
Merge pull request #5891 from JonnyTischbein/move_module_contacts 
Move module contacts
 2018-10-14 16:42:50 -04:00
Ralf Thees a97b540ebb Merge branch 'develop' of https://github.com/friendica/friendica into develop 2018-10-14 21:48:20 +02:00
Jonny Tischbein e41c59b193 Fix batch action choice - All Actions for one contact were taken before 2018-10-14 21:38:38 +02:00
Jonny Tischbein d54e56c659 Fix batch action query + Fix Namespace import 2018-10-14 21:14:32 +02:00
Hypolite Petovan ce74a4d9a1
Merge pull request #5921 from annando/ap-video 
ActivityPub: Rudimentary support for videos
 2018-10-14 14:05:51 -04:00
Jonny Tischbein 5fd4402074 code standards + fixing navigation links to /contact/... 2018-10-14 20:03:22 +02:00
Michael Vogel 68af56a10e
Merge pull request #5912 from MrPetovan/bug/fix-code-tag-nonsense 
Fix [code] tag whitespace nonsense
 2018-10-14 20:00:19 +02:00
Michael 37ad4a7d22 ActivityPub: Rudimentary support for videos 2018-10-14 17:57:44 +00:00
Hypolite Petovan 540adaf829 Use Model\Register methods in modules 
- Update registration emails to avoid storing the plaintext password in
the register table
- Remove redundant sprintf() when used with L10n::t()
- Remove redundant Systen::baseUrl() with goaway()
 2018-10-14 12:26:18 -04:00
Hypolite Petovan 59d6dd809d
Merge pull request #5906 from annando/ap-switch 
OStatus contacts are now automatically converted to AP
 2018-10-14 12:04:52 -04:00
Hypolite Petovan 123992384b Create Model\Register 
- Add Model\User::exists method
 2018-10-14 11:34:34 -04:00
Hypolite Petovan 7f143c3159 Fix various spelling mistakes 2018-10-14 11:32:54 -04:00
Hypolite Petovan f2bde919e5 Fix ignored show_in_notification_page parameter in notification() 2018-10-14 11:30:39 -04:00
Hypolite Petovan 0563a28438 Replace System::baseUrl() by App->getBaseURL() in mod/register 
- Remove redundant System::baseUrl() in goaway() calls
- Add more generic Friendica\Model use statement
- Allow empty path in goaway()
 2018-10-14 11:19:59 -04:00
Hypolite Petovan f7c020af04 Add HTML result boxes to mod/babel 2018-10-14 07:44:07 -04:00
Hypolite Petovan a769efae38 Remove whitespace clearing around code tags 
- Normalize inline code blocks to <code>
 2018-10-14 07:43:44 -04:00
Hypolite Petovan 6606c9cbb2
Merge pull request #5910 from nupplaphil/acctlink_followup 
FollowUp Acctlink move
 2018-10-14 06:27:02 -04:00
Hypolite Petovan 6c80601a4a
Merge pull request #5902 from nupplaphil/Install_Class_to_methods 
Install class bugfixing & tests & changed method signature
 2018-10-14 06:23:33 -04:00
Philipp Holzer 248c1b8074
Type hinting & call bugfixing 2018-10-14 10:37:19 +02:00
Philipp Holzer 753f61f633
FollowUp Acctlink move 2018-10-14 10:31:11 +02:00
Tobias Diekershoff fe9b283057
Merge pull request #5909 from annando/ap-receiver 
The outbox is now more complete / No more duplicates in the receiver
 2018-10-14 10:06:39 +02:00
Michael 6be04a73e3 The outbox is now more complete / No more duplicates in the receiver array 2018-10-14 07:47:04 +00:00
Hypolite Petovan db0b848ae3
Merge pull request #5904 from annando/ap-announce 
AP: Announce will now work
 2018-10-13 20:17:14 -04:00
Hypolite Petovan 07da170bcf
Merge pull request #5905 from nupplaphil/move_global_functions 
Move global functions
 2018-10-13 19:46:57 -04:00
Michael e829e074fc Location, coord and app are now processed as well 2018-10-13 21:37:39 +00:00
Michael aab4fa0c31 The instrument is now added, updating AP contacts is now enabled 2018-10-13 20:36:44 +00:00
Michael f60468677e We now transmit location and application as well. 2018-10-13 19:49:20 +00:00
Michael 8b9aa80aad "to" is now used for mentions, "cc" for everything else 2018-10-13 18:59:39 +00:00
Michael efad4936b0 OStatus contacts are now automatically converted to AP 2018-10-13 18:13:01 +00:00
Philipp Holzer 4f7cb049fb
isAjax bugfix 2018-10-13 19:10:46 +02:00
Michael Vogel 514ec1be6d
Merge pull request #5903 from nupplaphil/move_module_acctlink 
Move module AcctLink
 2018-10-13 19:09:59 +02:00
Philipp Holzer 059bd1307f
rename argv to getArgumentValue 2018-10-13 19:05:54 +02:00
Philipp Holzer 3f729df258
Renamed AcctLink to Acctlink 2018-10-13 19:03:38 +02:00
Philipp Holzer 2c541afd47
Moved functions out of boot.php into class 
- z_root() => $a->getBaseURL()
- absurl() => removed because no usage
- is_ajax() => $a->isAjax()
- current_load() => System::currentLoad()
- argc() => $a->argc
- argv($x) => $a->getArgumentValue($x)
 2018-10-13 19:03:08 +02:00
Michael 3c48a1f787 AP: Announce will now work 2018-10-13 16:41:29 +00:00