moon
/
honkoma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,594 Commits 2 Branches 0 Tags 201 MiB
Commit Graph

1977 Commits

Author SHA1 Message Date
rinpatch b57db828c7 Merge branch 'hotfix/ogp-cachex-fix' into 'develop' 
Rich media: Remove :commit since a tuple is already returned

See merge request pleroma/pleroma!649
 2019-01-09 18:42:00 +00:00
rinpatch a2d7f0e0e9 Remove :commit since a tuple is already returned 2019-01-09 21:35:01 +03:00
lain a99e156f2c Add integer casts. 2019-01-09 18:17:23 +01:00
lain 7ac152ed38 TwitterAPI: Add follower/following pagination. 2019-01-09 18:14:32 +01:00
lambda 1881680e28 Merge branch 'scarlett/pleroma-summary-html-api' into 'develop' 
Scarlett/pleroma summary html api

See merge request pleroma/pleroma!647
 2019-01-09 16:26:38 +00:00
lain 5027f82cde Add activity visibility index. 2019-01-09 16:45:09 +01:00
Egor Kislitsyn 44a1e69484 Add Twitter API for the pinned statuses 
```
# Only return statuses that have been pinned
GET /api/statuses/user_timeline.json?pinned=true

# Pin
POST /api/statuses/pin/:id

# Unpin
POST /api/statuses/unpin/:id
```
 2019-01-09 19:54:19 +07:00
lain 9854978b8b Remove recent activity restriction. 
This should be fine now, everything should be covered by indices.
 2019-01-09 12:38:23 +01:00
Egor Kislitsyn 1b06e6fdf3 only non-reblogs, self-authored, public statuses can be pinned 2019-01-09 17:40:15 +07:00
sxsdv1 20c0dd1e24 Support activity+json request for activity 2019-01-09 09:33:30 +01:00
Egor Kislitsyn 0c750bc432 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/pinned-posts 2019-01-08 16:32:07 +07:00
Egor Kislitsyn e679da4c34 add `pinned` property to `StatusView` 2019-01-08 15:27:02 +07:00
lain a16b17cc61 Actually put some onformation in the error user, make it actually properly parse 
in conversations.
 2019-01-07 20:59:30 +01:00
kaniini 74e1093732 Merge branch 'resilient-user-view' into 'develop' 
Make TwAPI UserView more resilient to issues.

See merge request pleroma/pleroma!634
 2019-01-07 17:09:52 +00:00
Egor Kislitsyn f24087f96e Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/pinned-posts 2019-01-07 20:55:32 +07:00
Egor Kislitsyn 380e9fba21 add pinned posts 2019-01-07 20:45:33 +07:00
lain 7382adf407 Make TwAPI UserView more resilient to issues. 
Will work for missing users and badly migrated users.
 2019-01-07 12:41:31 +01:00
scarlett 36fa5e8802 Check visible_for_user when performing a search using a direct link. 2019-01-07 10:36:31 +00:00
scarlett 52493467ac Twitter API: Add a summary_html field. 
The intention here is to allow proper subject copying when it contains
emoji, obviously this will require minor frontend changes, though.
 2019-01-06 10:19:00 +00:00
kaniini 576368237c Merge branch 'activitypub-tombstone-fix' into 'develop' 
Don't crash on AP request for tombstone

See merge request pleroma/pleroma!630
 2019-01-05 22:29:08 +00:00
scarlett 145d6fe6e9 Merge branch 'emoji-in-summary' into 'develop' 
Strip HTML in and allow emoji in summaries.

See merge request pleroma/pleroma!631
 2019-01-05 21:52:02 +00:00
scarlett 6556be344d Resolve some test failures. 2019-01-05 18:20:42 +00:00
scarlett 3c86d907d4 add some brakets to the emoji list. 2019-01-05 17:35:39 +00:00
scarlett 0787f0dfbe Strip HTML in and allow emoji in summaries. 2019-01-05 17:28:47 +00:00
sxsdv1 2d7da5f437 Don't crash on AP request for tombstone 
Because tombstone objects has no addressing the is_public?-predicate
would cause an error that propagated as a 500 error in the api
 2019-01-05 11:16:05 +01:00
rinpatch ba17518a0a Merge branch 'feature/rich-media-cachex' into 'develop' 
rich media: use cachex to avoid flooding remote servers

See merge request pleroma/pleroma!629
 2019-01-04 23:56:42 +00:00
William Pitcock 487c00d36d rich media: disable cachex in test mode 2019-01-04 23:53:26 +00:00
kaniini bf5aaefbb5 Merge branch 'fix/html-cache-content-collision' into 'develop' 
Different caches based on the module. Remove scrubber version since it is not relevant anymore

See merge request pleroma/pleroma!628
 2019-01-04 23:35:56 +00:00
William Pitcock 0964c207eb rich media: use cachex to avoid flooding remote servers 2019-01-04 23:32:01 +00:00
Rin Toshaka 846082e54f Different caches based on the module. Remove scrubber version since it is not relevant anymore 2019-01-05 00:19:46 +01:00
kaniini 4258dd8633 Merge branch 'feature/rich-media' into 'develop' 
URL previews in posts

Closes #402

See merge request pleroma/pleroma!617
 2019-01-04 20:50:18 +00:00
kaniini ffea81b84f Merge branch 'activitypub-c2s-delete-activity' into 'develop' 
Activitypub c2s delete activity

See merge request pleroma/pleroma!618
 2019-01-04 20:32:10 +00:00
kaniini d9d62a110c Merge branch 'mr/retry-queue-remove-fold' into 'develop' 
rewrites List.foldl to Enum.each in RetryQueue

See merge request pleroma/pleroma!621
 2019-01-03 22:30:02 +00:00
rinpatch b73a1a33de Merge branch 'captcha' into 'develop' 
Make captcha (kocaptcha) stateless

See merge request pleroma/pleroma!585
 2019-01-03 17:04:27 +00:00
Michael Loftis 943211b035 rewrites List.foldl to Enum.each 2019-01-02 21:21:40 +00:00
Maxim Filippov 48e81d3d40 Add RichMediaController and tests 2019-01-02 17:02:50 +03:00
sxsdv1 4e1cc2bab6 Implement delete activity 2019-01-01 23:20:43 +01:00
sxsdv1 551c3d9391 Split create activity specifics from update_outbox 2019-01-01 23:20:28 +01:00
Maxim Filippov 917d48d09b Better variable name 2019-01-01 23:29:47 +03:00
Maxim Filippov 2aab4e03c3 Add OGP parser 2019-01-01 23:26:40 +03:00
kaniini 32bed66471 Merge branch 'pool-usage' into 'develop' 
Update of hackney and tesla, removal of superflous default options.

See merge request pleroma/pleroma!614
 2019-01-01 20:12:34 +00:00
rinpatch 34fa709015 Merge branch 'configurable-federator' into 'develop' 
Make Federator options configurable.

See merge request pleroma/pleroma!615
 2019-01-01 18:55:59 +00:00
lambda 32541172cd Merge branch 'cleanup/admin-api-useless-if' into 'develop' 
Web.AdminAPI.AdminAPIController: Remove a useless if in user_delete

See merge request pleroma/pleroma!612
 2019-01-01 13:48:59 +00:00
lain 400337b0a7 Make Federator options configurable. 2019-01-01 14:46:55 +01:00
lain 096a927805 Merge remote-tracking branch 'origin/develop' into pool-usage 2019-01-01 14:19:55 +01:00
lain d4799e0dc2 Remove default pool, it's used automatically anyway. 2019-01-01 13:49:24 +01:00
Haelwenn (lanodan) Monnier 1e6c102bfc
Web.AdminAPI.AdminAPIController: Remove a useless if in user_delete 2018-12-31 19:50:14 +01:00
kaniini 90e157ef80 Merge branch 'features/admin-api-user-views' into 'develop' 
User/Account views: Add rights.admin

Closes #472

See merge request pleroma/pleroma!589
 2018-12-31 15:49:34 +00:00
William Pitcock 980b5288ed update copyright years to 2019 2018-12-31 15:41:47 +00:00
lambda 33e3a7ba7d Merge branch 'fix/scrubber-cache' into 'develop' 
[#481] Store scrubbed posts in Cachex

Closes #481

See merge request pleroma/pleroma!610
 2018-12-31 09:56:26 +00:00
Rin Toshaka 7e09c2bd7d Move scrubber cache-related functions to Pleroma.HTML 2018-12-31 08:19:48 +01:00
kaniini 8e7da98b18 Merge branch 'mr/retry-queue' into 'develop' 
Improves RetryQueue behavior

See merge request pleroma/pleroma!609
 2018-12-30 21:47:50 +00:00
Rin Toshaka dec23500d8 Resolve merge conflict 2018-12-30 21:00:40 +01:00
Rin Toshaka c119ea3a57 Friendship ended with Postgresql now Cachex is my best friend 2018-12-30 20:00:01 +01:00
Rin Toshaka 535fddd286 Friendship ended with Postgresql now Cachex is my best friend 2018-12-30 19:33:36 +01:00
Rin Toshaka d9f40b05b3 Added get_stripped_html_for_object. Renamed a few things 2018-12-30 16:51:16 +01:00
Michael Loftis cb286fdeba Improves RetryQueue behavior 
reduces to one single timer firing once a second
switches to a parallel worker model
 2018-12-30 15:16:26 +00:00
Rin Toshaka bce152aba0 Tidy up the code. Rename key to signature 2018-12-30 15:58:19 +01:00
Rin Toshaka 66d1c31461 Fix some stupid typos 2018-12-30 13:51:01 +01:00
sxsdv1 f40562b4e1 Respond with full activity to outbox post 2018-12-30 12:01:39 +01:00
sxsdv1 1e781715c8 Limit activity types accepted to outbox to only 'Create' 2018-12-30 12:01:39 +01:00
sxsdv1 569bad8210 Create activity when client posts to outbox 2018-12-30 12:01:39 +01:00
sxsdv1 26dc2dddab Implement ActivityPub inbox view 
More or less verbatim copied from the outbox template with only changes
to the activities fetched and url reported
 2018-12-30 12:01:39 +01:00
Rin Toshaka a32e23905a Use Object.change instead of Ecto.Changeset.change 2018-12-30 11:08:19 +01:00
sxsdv1 aa082ca7b6 Wire up stub routes for client calls of activitypub inbox/outbox 
Code style: remove wrapping function of outbox
 2018-12-29 22:22:03 +01:00
Rin Toshaka 9a0163db53 use Kernel.put_in instead of Map.merge 2018-12-29 21:50:34 +01:00
Rin Toshaka 19f9889fbe I am not sure what's going on anymore so I'll just commit and reset all the other files to HEAD 2018-12-29 17:45:50 +01:00
kaniini 3dc5f04976 Merge branch 'carrot-bullying' into 'develop' 
Add some hard limits on inserted activities.

See merge request pleroma/pleroma!595
 2018-12-29 11:46:06 +00:00
kaniini dd8f2196f6 Merge branch '483_blocks_import_export' into 'develop' 
[#483] Blocked users list import & export

Closes #483

See merge request pleroma/pleroma!603
 2018-12-29 11:34:51 +00:00
Maksim Pechnikov 523848d1fd Salmon# fixed publish an activity to remote accounts 2018-12-29 12:48:54 +03:00
Ivan Tashkinov 67b4297f4d [#483] Refactored blocks and follows import, added tests. 2018-12-29 12:02:37 +03:00
kaniini 49cf5f9ce0 Merge branch '471_invalid_accounts_rendering' into 'develop' 
[#471] Prevented rendering of inactive local accounts

Closes #471

See merge request pleroma/pleroma!599
 2018-12-29 03:03:18 +00:00
Ivan Tashkinov 700661b761 [#483] Blocked users list import (TwitterAPI). 2018-12-28 23:01:03 +03:00
Ivan Tashkinov 0a41786624 [#467] Refactored valid / invalid user rendering. 2018-12-28 22:47:42 +03:00
kaniini 68f483ef4c Merge branch 'fix/no-attachment-links' into 'develop' 
Treat any present value in "no_attachment_links" as true

Closes pleroma-fe#175

See merge request pleroma/pleroma!597
 2018-12-28 18:33:14 +00:00
Ivan Tashkinov 6e9a15b181 [#483] Blocked users export for TwitterAPI. 2018-12-28 21:08:07 +03:00
Haelwenn (lanodan) Monnier b43d630f30
Web.TwitterAPI.UserView: Add rights.admin 2018-12-28 17:38:32 +01:00
Ivan Tashkinov 0d1788ce44 [#471] Factored out User.visible_for?/2. 2018-12-28 14:35:25 +03:00
Vyr Cossont d8cc96cb1f Fix Twitter timelines for private instances 2018-12-27 22:43:40 -08:00
kaniini cff0292d4b Merge branch 'reserve-user-names' into 'develop' 
Reserve a few user names

See merge request pleroma/pleroma!594
 2018-12-27 19:35:06 +00:00
Ivan Tashkinov e6aeb1d4a5 [#471] Prevented rendering of inactive local accounts. 2018-12-27 15:46:18 +03:00
Maxim Filippov be70272ab0 Treat only true and "true" as true 2018-12-27 13:21:04 +03:00
Vyr Cossont e4562105e7 Implement exclude_reblogs and include_rts 2018-12-26 21:38:00 -08:00
Maxim Filippov 838c024231 Treat any present value in "no_attachment_links" as true 2018-12-27 02:39:41 +03:00
lain 551d80cc01 Expose restricted names in nodeinfo. 2018-12-26 12:46:16 +01:00
lain 5811e65e67 Add some hard limits on inserted activities. 2018-12-26 12:39:35 +01:00
William Pitcock 2791ce9a1f add license boilerplate to pleroma core 2018-12-23 20:56:42 +00:00
lambda 005b4194ff Merge branch 'bugfix/trans_fix_url_videos' into 'develop' 
Fix "url" of Videos in transmogrifier

Closes #367

See merge request pleroma/pleroma!459
 2018-12-23 14:46:58 +00:00
William Pitcock 34a4ed22c4 twitter api: add "Video" to supported activity types list 2018-12-23 14:00:54 +00:00
William Pitcock 79b51a97fe twitter api: activity representer: remove peertube hack 2018-12-23 14:00:50 +00:00
William Pitcock 32dfc1d12a mastodon api: status view: remove obsolete peertube hack 2018-12-23 13:40:33 +00:00
William Pitcock 71f6d9f418 transmogrifier: significantly rework handling of peertube videos, add test 2018-12-23 13:31:08 +00:00
lambda a3e33fa177 Merge branch 'hotfix/activity-without-content' into 'develop' 
Twitter ActivityView: fix crash with activity without content

See merge request pleroma/pleroma!572
 2018-12-23 13:17:25 +00:00
Haelwenn (lanodan) Monnier 3aff8067e4 transmogrifier: When it’s a Video move "url" to "attachment" 2018-12-23 13:00:25 +00:00
Karen Konou a7f07bb6e5 Implement kaniini's tweaks 2018-12-23 12:24:53 +01:00
Karen Konou c76179419d Renamed the things 2018-12-23 11:14:29 +01:00
Karen Konou 409ff60bf8 Fix formatting 2018-12-22 23:32:38 +01:00
Karen Konou 92362e1e22 Implement large thread filter 2018-12-22 23:18:31 +01:00
Ekaterina Vaartis 336e37d98f Make captcha (kocaptcha) stateless 
Also rename seconds_retained to seconds_valid since that's how it is
now. Put it down from 180 to 20 seconds. The answer data is now
stored in an encrypted text transfered to the client and back, so no
ETS is needed
 2018-12-21 09:55:47 +03:00
kaniini 2e2030ada8 Merge branch '114_email_confirmation' into 'develop' 
[#114] Email confirmation

See merge request pleroma/pleroma!546
 2018-12-20 13:28:36 +00:00
Ivan Tashkinov f69cbf4755 [#114] Added :user_id component to email confirmation path to improve the security. 
Added tests for `confirm_email` action.
 2018-12-20 13:41:30 +03:00
Ivan Tashkinov 8adcd1e80f [#114] Removed flash messages rendering on redirects. 2018-12-20 13:05:42 +03:00
kaniini fda148a9a2 Merge branch 'documentation/copy-pleroma-api' into 'develop' 
Pleroma-API.md: Import from /wikis/Pleroma-only-api-endpoints

See merge request pleroma/pleroma!571
 2018-12-20 04:01:54 +00:00
raeno 652f49d176 Remove extra bracket 2018-12-19 23:06:10 +04:00
raeno 7fb3780431 Merge branch 'develop' into oembed_provider 2018-12-19 22:39:44 +04:00
Ivan Tashkinov b520d44b58 [#114] `mix format` 2018-12-19 19:03:39 +03:00
Ivan Tashkinov 279096228c [#114] Made MastodonAPI and TwitterAPI user show actions return 404 for auth-inactive users 
unless requested by admin or moderator.
 2018-12-19 18:56:52 +03:00
Ivan Tashkinov 968d7490b6 [#114] User.Info: renamed `confirmation_update` to `confirmation_changeset`. 2018-12-19 16:31:03 +03:00
Ivan Tashkinov 59fc5d15df [#114] User.Info: renamed `confirmation_update` to `confirmation_change`. 2018-12-19 16:27:16 +03:00
lain f3eb414e28 Add a way to use the admin api without a user. 2018-12-18 21:08:52 +01:00
Haelwenn (lanodan) Monnier a6dfe1fc6b
Documentation: Move generated files to priv/static/doc, add it to endpoint.ex 2018-12-18 17:05:36 +01:00
href f58f20abbb
Twitter ActivityView: fix crash when activity content is nil 2018-12-18 15:34:27 +01:00
Ivan Tashkinov 3371a45884 [#114] Formatting fix. 2018-12-18 17:30:30 +03:00
Ivan Tashkinov b096e30cff [#114] Added email confirmation resend action. Added tests 
for registration, authentication, email confirmation, confirmation resending.
Made admin methods create confirmed users.
 2018-12-18 17:22:46 +03:00
Ivan Tashkinov aed0f90287 [#114] Added `pleroma.confirmation_pending` to user views, adjusted view tests. 2018-12-18 17:22:45 +03:00
Ivan Tashkinov b86057cc7f [#114] Refactored User.register_changeset to init confirmation data. 
Introduced User.register/1 to encapsulate User record creation and post-registration actions.
 2018-12-18 17:22:42 +03:00
Ivan Tashkinov 1de0aa2f10 [#114] Account confirmation email, registration as unconfirmed (config-based), auth prevention for unconfirmed. 2018-12-18 17:21:05 +03:00
Ivan Tashkinov a05cb10a95 [#114] Email confirmation route, action, node setting, User.Info fields. 2018-12-18 17:18:53 +03:00
raeno a300336459 Merge branch 'develop' into oembed_provider 2018-12-18 14:59:32 +01:00
href b1860fe85a
Instance/Static runtime plug 
This allows to set-up an arbitrary directory which overrides most of the
static files: index.html static/ emoji/ packs/ sounds/ images/ instance/
favicon.png.

If the files are not present in the directory, the bundled ones in
priv/static will be used.
 2018-12-17 22:50:59 +01:00
lambda 3d980daa49 Merge branch '459_fix_user_profile_crash' into 'develop' 
Fix update_profile failing due to OAuth token record in assigns instead of string

Closes #459

See merge request pleroma/pleroma!561
 2018-12-17 20:16:15 +00:00
Maksim Pechnikov 92a5133c42 fix text field 2018-12-17 22:53:16 +03:00
lambda 52ac7dce5c Merge branch 'captcha' into 'develop' 
Captcha

See merge request pleroma/pleroma!550
 2018-12-17 19:45:14 +00:00
lambda 078b8b6d22 Merge branch 'phoenix14' into 'develop' 
Upgrade to Phoenix 1.4

Closes #451

See merge request pleroma/pleroma!560
 2018-12-17 19:30:05 +00:00
href 77b5154c82
Cowboy handler for Mastodon WebSocket 2018-12-17 17:06:18 +01:00
raeno cc87880488 Support both OAuth token record and token string in UserView 2018-12-17 16:02:26 +01:00
lambda 567359790e Merge branch 'testfix/webfinger-jrd' into 'develop' 
WebFinger: Sends a 400 when resource param is missing, fix XRD typo in test

See merge request pleroma/pleroma!554
 2018-12-17 09:19:27 +00:00
href 5dcb7aecea
More put_view. 2018-12-16 17:51:22 +01:00
href f672555ad3
Upgrade to Phoenix 1.4 2018-12-16 17:15:07 +01:00
eal 28478a9c4f Merge branch 'fix/masto-put-settings' into 'develop' 
Mastodon API: Fix PUT /api/web/settings

See merge request pleroma/pleroma!557
 2018-12-16 11:21:26 +00:00
eal 4c783e35c0 Mastodon API: Fix PUT /api/web/settings 2018-12-16 13:15:34 +02:00
Ekaterina Vaartis 23549d3952 Formatting fixes 2018-12-15 22:08:26 +03:00
Haelwenn (lanodan) Monnier cddab5700b
WebFinger: Sends a 400 when resource param is missing, fix XRD typo in test 2018-12-15 17:56:12 +01:00
lambda cc6689cc20 Merge branch 'fix/views-ignore-unhandled-activites' into 'develop' 
TwitterAPI.ActivityView: Ignore unhandled activities

See merge request pleroma/pleroma!547
 2018-12-15 15:23:51 +00:00
Ekaterina Vaartis 28c43a417e Add an ability to disabled captcha 2018-12-15 03:12:47 +03:00
Ekaterina Vaartis a2399c1c7c Add base CAPTCHA support (currently only kocaptcha) 2018-12-15 03:12:44 +03:00
href e74f384b68 Merge branch 'fix/issue_433' into 'develop' 
[#433] fix markdown formatting

See merge request pleroma/pleroma!545
 2018-12-14 20:30:35 +00:00
href bfe27c1b55 Merge branch '114_email_invites' into 'develop' 
[#114] Email invites

See merge request pleroma/pleroma!541
 2018-12-14 20:22:24 +00:00
href acec11626d Merge branch 'fix/issue_272' into 'develop' 
[#272] fix tags

See merge request pleroma/pleroma!540
 2018-12-14 20:20:30 +00:00
Maksim Pechnikov ea72ac549b fix case when tags is invalid 2018-12-14 23:16:12 +03:00
raeno b0c3211984 Scrub html from activity.content or user.bio for opengraph meta 2018-12-14 21:07:06 +01:00
raeno 90b00701ff Merge branch 'develop' into oembed_provider 2018-12-14 20:28:35 +01:00
Maksim Pechnikov d3ec09bb38 fix tags 2018-12-14 22:09:04 +03:00
raeno 46486595ff Handle "users/:id" links as well. Fix comments in MR. 2018-12-14 19:55:40 +01:00
href 980131b4db Merge branch 'pleroma-feature/compat/push-subscriptions' into 'develop' 
Improve web push

Closes #393, #422, and #452

See merge request pleroma/pleroma!524
 2018-12-14 18:50:44 +00:00
href 84b9a9d497
TwitterAPI.ActivityView: Ignore unhandled activities 2018-12-14 18:09:59 +01:00
href 412df2cd38
Warn if push is disabled.. 2018-12-14 16:19:28 +01:00
Maksim Pechnikov baead4ea4b fix markdown formatting 2018-12-14 16:03:58 +03:00
href 91236c60c7 Merge branch 'feature/file-size-checking' into 'develop' 
[#36] Add warnings when file upload fails

See merge request pleroma/pleroma!523
 2018-12-14 13:00:24 +00:00
href 0b4c61e8d5
Fix warning 2018-12-14 13:56:42 +01:00
href ec0e613eca
Pleroma.Activity.mastodon_notification_type/1 2018-12-14 13:22:10 +01:00
href 331396cbcd
Properly disable Web Push if no VAPID key is set 2018-12-14 13:05:51 +01:00
href 6822916183
Typos 2018-12-14 13:05:51 +01:00
href b1bcd97a0f
Push: respect alerts settings 2018-12-14 13:05:49 +01:00
href d8984b7bf8
Push: add missing notification_type field 2018-12-14 13:05:48 +01:00
href 7facbb2b8d
Push.Subscription: convert base64 to base64 urlsafe 2018-12-14 13:05:47 +01:00
Egor Kislitsyn 324933a0ac
improve push message format (compatibility with mastodon) 2018-12-14 13:05:46 +01:00
Egor Kislitsyn 658edb166f
fix and improve web push; add configuration docs 2018-12-14 13:05:29 +01:00
Ivan Tashkinov 69fd63e248 [#114] Added `invitesEnabled` to `metadata` of nodeinfo. 2018-12-14 14:13:13 +03:00
Ivan Tashkinov 66380b0641 [#114] Removed `confirm_email` action stub (to be addressed in a separate MR). 2018-12-14 14:01:00 +03:00
Ivan Tashkinov 9666376f5f [#114] Readded `invites_enabled` config setting, updated readme. 2018-12-14 12:37:06 +03:00
Ivan Tashkinov a89e3b4b60 [#114] Moved email_invite action to AdminAPIController, adjusted tests. 2018-12-14 12:28:23 +03:00
Ivan Tashkinov 3cbf16a5fe [#114] Added UserInviteToken creation, adjusted invitation email link to include it. 2018-12-14 12:28:22 +03:00
Ivan Tashkinov cc83d7ffe7 [#114] Naive implementation of email invitations. 2018-12-14 12:28:14 +03:00
href 30dc81667c Merge branch '114_user_registration_emails' into 'develop' 
[#114] User registration emails

Closes #114

See merge request pleroma/pleroma!531
 2018-12-14 09:16:03 +00:00
Ivan Tashkinov f81213910f [#114] Addressed MR comments. Removed functionality to be extracted to other MRs. 2018-12-14 12:09:55 +03:00
lambda 262cc6d44b Merge branch 'fix/double-rt-or-fav' into 'develop' 
Prevent accidental double RTs or favorites

See merge request pleroma/pleroma!542
 2018-12-14 08:26:08 +00:00
eal 61ad2ce422 TwitterAPI: Include favorited post in json 2018-12-14 08:24:18 +02:00
eal 1ca080c862 Prevent accidental double RTs or favorites 2018-12-14 07:56:49 +02:00
raeno c5c3ad90d0 Fix tests. Remove oembed template 2018-12-14 03:00:50 +01:00
raeno b5de7c4c4d Remove oembed for now, will submit it in another MR. Fix warnings 2018-12-13 22:34:15 +01:00
raeno 018516d3f3 Refactor ostatus_controller, extract metatags redirection to Redirector itself. Set 'html' as default type for ostatus links 2018-12-13 22:21:14 +01:00
raeno 9b3a6cdb07 Extract opengraph/oembed into separate module 2018-12-13 22:17:53 +01:00
raeno d903e34cac Add opengraph/twitter_card:summary support. Add config to toggle on/off specific metadata 2018-12-13 22:17:53 +01:00
raeno 8902942128 WIP. Implement oembed route and handle both json/xml for "Note" type activity 2018-12-13 22:17:53 +01:00
raeno 21afdf6d99 Insert meta tags into static index.html on the fly for OStatus#notice 2018-12-13 22:17:53 +01:00
Ivan Tashkinov 18b9467d1a [#114] Removed `email_invite` implementation (to be addressed separately). 2018-12-13 16:22:42 +03:00
Ivan Tashkinov 00744c6b03 [#114] Initial implementation of user email invitations. 2018-12-13 14:30:48 +03:00
Ivan Tashkinov 908943352f [#114] Refactored `password_reset` (moved to TwitterAPI). Added homepage links to password reset result pages. 2018-12-13 13:17:49 +03:00
Ivan Tashkinov bfff2399ff [#114] Routes and config for `confirm_email` and `email_invite` (Twitter API). 2018-12-12 20:15:43 +03:00
Ivan Tashkinov e3a21bcd45 [#114] Addressed warnings. Fix of `with` statement clause in `password_reset`. 2018-12-12 17:14:31 +03:00
Ivan Tashkinov f5afb11032 [#114] Initial implementation of user password reset emails (user-initiated). 2018-12-12 17:04:39 +03:00
Ivan Tashkinov 12905ce1ad [#114] Added /dev/mailbox dev-only route (emails preview). Added mailer config examples. 2018-12-12 17:02:41 +03:00
Maksim Pechnikov 89b3729afa fix warnings 2018-12-12 09:09:19 +03:00
scarlett 213176c3c3 Add new frontend options to server-side config. 2018-12-10 23:15:01 +00:00
lambda ff10b9927b Merge branch 'support/bugfix_272' into 'develop' 
[#272] fix hashtags in api

See merge request pleroma/pleroma!510
 2018-12-10 19:05:16 +00:00
lain c81c74d847 Treat warnings as errors outside of tests. 2018-12-10 19:13:53 +01:00
Maksim Pechnikov e94c3442f4 updates 2018-12-10 13:27:37 +03:00
Maksim Pechnikov 074fa790ba fix compile warnings 2018-12-09 20:50:08 +03:00
Maksim Pechnikov 068353ac0b formatting 2018-12-09 11:24:46 +03:00
Maksim Pechnikov 9442588ae9 fix hashtags in api response 2018-12-09 11:24:46 +03:00
Rin Toshaka 15616eda5e Make uploadlimit an object that stores upload limits for avatars, banners, backgrounds, general content 2018-12-08 21:48:49 +01:00
lambda beadeaffa1 Merge branch 'fix/nodeinfo-nil-features' into 'develop' 
Nodeinfo: remove null features; relay feature.

See merge request pleroma/pleroma!520
 2018-12-08 09:12:06 +00:00
href bdc8112e40
Media proxy: fix url encoding 2018-12-07 21:57:59 +01:00
Rin Toshaka 578051809f Add uploadlimit to Twitter API config 2018-12-07 20:03:30 +01:00
lambda 94ac0075bf Merge branch 'media-proxy-follow-redirect' into 'develop' 
Media proxy: follow HTTP redirects by default

Closes #421

See merge request pleroma/pleroma!519
 2018-12-07 18:48:26 +00:00
href 134cc94cbd
Nodeinfo: remove null features; relay feature. 2018-12-07 19:44:45 +01:00
href d8fcf7c5cf
Media proxy: follow HTTP redirects by default 2018-12-07 19:36:44 +01:00
lambda 94d8f1ab30 Merge branch '394_user_tags' into 'develop' 
[#394] User tags

Closes #394

See merge request pleroma/pleroma!508
 2018-12-07 18:25:38 +00:00
Ivan Tashkinov 6ed5044c4e [#394] Refactoring (using Ecto.Multi; "untag" route change). 2018-12-07 11:04:39 +03:00