Commit graph

17142 commits

Author SHA1 Message Date
Michael Vogel a86ffd878d
Merge pull request #4152 from MrPetovan/task/4137-add-posts-only-feed
Add posts only feed
2018-01-02 10:14:56 +01:00
Michael Vogel 158cb8dd53
Merge pull request #4156 from MrPetovan/bug/4155-move-oembed-to-src
Move oembed to src
2018-01-02 09:58:22 +01:00
Hypolite Petovan 7e2a08c7bc Review changes
- Add file comment in Content\OEmbed
- Add self where relevant
- Remove useless spaces from the XPath expression
2018-01-01 17:43:03 -05:00
Hypolite Petovan 23e38cd559 Revert "Updated hcard with the new feed links"
This reverts commit cc84939658.
2018-01-01 17:29:50 -05:00
Hypolite Petovan eb1b6605b7 Remove include/oembed and mod/oembed 2017-12-31 20:58:32 -05:00
Hypolite Petovan e7c53af6fa Add Module\Oembed and Content\OEmbed 2017-12-31 20:58:09 -05:00
Hypolite Petovan e376e1abf6
Merge pull request #4153 from zeroadam/Crypto-#3878
Move Crypto to src
2017-12-31 08:47:06 -06:00
Adam Magness dc5de5adbd Public function
Make private function public.
2017-12-31 08:31:06 -05:00
Adam Magness fe3dac4825 Fix self call
was self when in Crypto..
2017-12-31 08:29:03 -05:00
Adam Magness db653e4451 Move salmonKey to Salmon class
move the salmonKey function from Crypto to Salmon
2017-12-31 08:04:36 -05:00
Adam Magness 0131fd5745 ASNValue
add missing ASNValue
2017-12-30 12:44:43 -05:00
Adam Magness a00303a6a0 Another ASN
attempt #2
2017-12-30 12:23:45 -05:00
Adam Magness 5d352641a8 ASN_BASE
error ASN_BASE not found. Probably a namespace thing.
2017-12-30 12:09:08 -05:00
Adam Magness 9e6bf79380 Crypto to src
move Crypto to src and Friendica\Util namespace
2017-12-30 11:51:49 -05:00
Hypolite Petovan cc84939658 Updated hcard with the new feed links 2017-12-30 00:40:21 -05:00
Hypolite Petovan a25d07e5e8 Renamed type to filter in OStatus::feed 2017-12-30 00:34:50 -05:00
Hypolite Petovan 62391d321b Merge branch 'task/4137-add-posts-only-feed' of https://github.com/MrPetovan/friendica into task/4137-add-posts-only-feed
# Conflicts:
#	src/Module/Feed.php
2017-12-30 00:34:23 -05:00
Hypolite Petovan a75a27e08f Add Feed module
- Update profile alternate links
2017-12-30 00:32:45 -05:00
Hypolite Petovan fec3aaf9b2 Add Feed module
- Update profile alternate links
2017-12-30 00:19:45 -05:00
Hypolite Petovan c2e29f2685 Add type parameter to OStatus::feed
- Removed unused parameter $a
- Added $nocache parameter
- Updated usages
2017-12-30 00:19:16 -05:00
Hypolite Petovan 095d458de4 Fix formatting mod/profile 2017-12-29 22:23:58 -05:00
Hypolite Petovan 19878a6397 Fix formatting dfrn_poll 2017-12-29 22:12:18 -05:00
Hypolite Petovan 6d6d83012c
Merge pull request #4151 from annando/connect-follow
Don't show the connect link in the profile on the "follow" page
2017-12-29 17:49:44 -06:00
Michael 69d16d9cfa Don't show the connect link in the profile on the "follow" page 2017-12-29 22:53:08 +00:00
Hypolite Petovan 6bd19e7dab
Merge pull request #4149 from annando/send_participation
Follow up to PR 4147
2017-12-29 14:06:27 -06:00
Hypolite Petovan 2f7ef735f7
Merge pull request #4147 from annando/send_participation
We now send participations when receiving public posts
2017-12-29 14:02:25 -06:00
Michael 10bea2f120 Use the "real" receiver when possible 2017-12-29 20:02:15 +00:00
Michael d3b626a266 We should send "Post" 2017-12-29 19:18:25 +00:00
Michael 80a41922a9 We now send participations when receiving public posts 2017-12-29 18:52:26 +00:00
Hypolite Petovan d38cf3cc13
Merge pull request #4145 from annando/photo-twist
Reformatted file, improved coding for "twist"
2017-12-29 10:09:20 -06:00
Michael 319e21f6e3 Added explanation 2017-12-29 12:47:56 +00:00
Michael c7bcc13451 Reformatted file, improved coding for "twist" 2017-12-28 20:37:23 +00:00
Hypolite Petovan c40466fe2d
Merge pull request #4143 from annando/comment-public
Likes on "uid=0" does work now
2017-12-27 20:05:20 -06:00
Michael 0bcbe6034e Like on uid=0 does work now 2017-12-27 22:21:40 +00:00
Michael 9acc2ffc24 Make it easier 2017-12-27 21:51:16 +00:00
Michael 1c72a71933 Use another uid for likes 2017-12-27 21:44:22 +00:00
Michael d7039c6862 Merge remote-tracking branch 'upstream/develop' into comment-public 2017-12-27 15:51:36 +00:00
Hypolite Petovan 0b790b4a76
Merge pull request #4138 from annando/follow-include
Missing include
2017-12-27 09:28:57 -06:00
Michael d0a43b8533 Missing include 2017-12-27 15:26:17 +00:00
Michael d707c5afcd Merge remote-tracking branch 'upstream/develop' into comment-public 2017-12-26 23:59:32 +00:00
Hypolite Petovan b39e06ed23
Merge pull request #4136 from Rudloff/feature/update_profile_api
Cleaner way to get user URL in api_account_update_profile
2017-12-26 17:13:58 -06:00
Pierre Rudloff 8b10bfe3a8 Cleaner way to get user URL in api_account_update_profile 2017-12-26 21:50:08 +01:00
Hypolite Petovan 06f32aaaa6
Merge pull request #4130 from Rudloff/feature/update_profile_api
Basic support for account/update_profile API (fixes #4094)
2017-12-25 20:06:34 -05:00
Pierre Rudloff c490a718ac Update profile in directory when calling api_account_update_profile 2017-12-26 01:09:51 +01:00
Pierre Rudloff 94244024ac Improve conditions in api_account_update_profile 2017-12-26 01:05:12 +01:00
Hypolite Petovan f09b139ead
Merge pull request #4132 from annando/jabberlog
Some more logging for auth_ejabberd
2017-12-25 18:37:17 -05:00
Michael Vogel b571906463
Merge pull request #4131 from Rudloff/feature/types
Add missing return types in docblocks
2017-12-26 00:06:09 +01:00
Michael 869af9f323 Some more logging for auth_ejabberd 2017-12-25 23:03:14 +00:00
Pierre Rudloff 8c17b96749 Missing return types in docblocks 2017-12-25 21:14:02 +01:00
Pierre Rudloff ee5301018a Fix typo 2017-12-25 21:12:08 +01:00