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
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
37ad4a7d22
ActivityPub: Rudimentary support for videos
2018-10-14 17:57:44 +00:00
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
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
123992384b
Create Model\Register
...
- Add Model\User::exists method
2018-10-14 11:34:34 -04:00
7f143c3159
Fix various spelling mistakes
2018-10-14 11:32:54 -04:00
f2bde919e5
Fix ignored show_in_notification_page parameter in notification()
2018-10-14 11:30:39 -04:00
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
f7c020af04
Add HTML result boxes to mod/babel
2018-10-14 07:44:07 -04:00
a769efae38
Remove whitespace clearing around code tags
...
- Normalize inline code blocks to <code>
2018-10-14 07:43:44 -04:00
6606c9cbb2
Merge pull request #5910 from nupplaphil/acctlink_followup
...
FollowUp Acctlink move
2018-10-14 06:27:02 -04:00
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
248c1b8074
Type hinting & call bugfixing
2018-10-14 10:37:19 +02:00
753f61f633
FollowUp Acctlink move
2018-10-14 10:31:11 +02:00
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
6be04a73e3
The outbox is now more complete / No more duplicates in the receiver array
2018-10-14 07:47:04 +00:00
db0b848ae3
Merge pull request #5904 from annando/ap-announce
...
AP: Announce will now work
2018-10-13 20:17:14 -04:00
07da170bcf
Merge pull request #5905 from nupplaphil/move_global_functions
...
Move global functions
2018-10-13 19:46:57 -04:00
e829e074fc
Location, coord and app are now processed as well
2018-10-13 21:37:39 +00:00
aab4fa0c31
The instrument is now added, updating AP contacts is now enabled
2018-10-13 20:36:44 +00:00
f60468677e
We now transmit location and application as well.
2018-10-13 19:49:20 +00:00
8b9aa80aad
"to" is now used for mentions, "cc" for everything else
2018-10-13 18:59:39 +00:00
efad4936b0
OStatus contacts are now automatically converted to AP
2018-10-13 18:13:01 +00:00
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
059bd1307f
rename argv to getArgumentValue
2018-10-13 19:05:54 +02:00
3f729df258
Renamed AcctLink to Acctlink
2018-10-13 19:03:38 +02:00
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
3c48a1f787
AP: Announce will now work
2018-10-13 16:41:29 +00:00
508032cf9a
Move Module AcctLink
2018-10-13 18:32:14 +02:00
c32ac7f194
Install Class to methods
...
- Bugfixing Install checks (worked not as expected)
- Changed static methods from Install to class functions
- Added tests
2018-10-13 18:09:53 +02:00
6b2a12319c
Merge pull request #5901 from annando/catch-error
...
Catching error when compacting doesn't work
2018-10-13 10:52:18 -04:00
d23386f9b2
Catching error when compacting doesn't work
2018-10-13 13:17:10 +00:00
Jonny Tischbein
bfa05156ca
change links from /contacts to /contact
2018-10-13 13:29:56 +02:00
Jonny Tischbein
738cb4ace6
finish refactoring to Module\Contact
2018-10-13 11:35:51 +02:00
Jonny Tischbein
cdbddd0103
Renaming functions and class
2018-10-13 11:23:52 +02:00
14e7686df4
Merge pull request #5899 from annando/avoid-flooding
...
Avoid beeing flooded by invalid requests
2018-10-13 08:41:32 +02:00
b6f2144237
Avoid beeing flooded by invalid requests
2018-10-13 04:31:37 +00:00
af8a383be0
Merge pull request #5897 from annando/fix-diaspora-signature
...
The virtual fields for the diaspora signatures have to be removed at any time
2018-10-12 19:58:10 -04:00
4d4dd1a99c
Some beautification
2018-10-12 20:52:22 +00:00
5af0ee1b95
We can now store it without any problem
2018-10-12 18:53:13 +00:00
914b3a9e3e
Merge remote-tracking branch 'upstream/develop' into fix-diaspora-signature
2018-10-12 18:52:22 +00:00
1b18be6715
The virtuel fields for the diaspora signatures have to be removed at any time
2018-10-12 18:47:32 +00:00
10d194075e
Merge pull request #5894 from friendica/revert-5889-ap-store-diaspora
...
Revert "We now store the diaspora comment data as well"
2018-10-12 10:36:06 -04:00