Ivan Tashkinov
a05cb10a95
[ #114 ] Email confirmation route, action, node setting, User.Info fields.
6 years ago
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.
6 years ago
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
6 years ago
Maksim Pechnikov
92a5133c42
fix text field
6 years ago
lambda
52ac7dce5c
Merge branch 'captcha' into 'develop'
...
Captcha
See merge request pleroma/pleroma!550
6 years ago
lambda
078b8b6d22
Merge branch 'phoenix14' into 'develop'
...
Upgrade to Phoenix 1.4
Closes #451
See merge request pleroma/pleroma!560
6 years ago
href
77b5154c82
Cowboy handler for Mastodon WebSocket
6 years ago
raeno
cc87880488
Support both OAuth token record and token string in UserView
6 years ago
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
6 years ago
href
5dcb7aecea
More put_view.
6 years ago
href
f672555ad3
Upgrade to Phoenix 1.4
6 years ago
eal
28478a9c4f
Merge branch 'fix/masto-put-settings' into 'develop'
...
Mastodon API: Fix PUT /api/web/settings
See merge request pleroma/pleroma!557
6 years ago
eal
4c783e35c0
Mastodon API: Fix PUT /api/web/settings
6 years ago
Ekaterina Vaartis
23549d3952
Formatting fixes
6 years ago
Haelwenn (lanodan) Monnier
cddab5700b
WebFinger: Sends a 400 when resource param is missing, fix XRD typo in test
6 years ago
lambda
cc6689cc20
Merge branch 'fix/views-ignore-unhandled-activites' into 'develop'
...
TwitterAPI.ActivityView: Ignore unhandled activities
See merge request pleroma/pleroma!547
6 years ago
Ekaterina Vaartis
28c43a417e
Add an ability to disabled captcha
6 years ago
Ekaterina Vaartis
a2399c1c7c
Add base CAPTCHA support (currently only kocaptcha)
6 years ago
href
e74f384b68
Merge branch 'fix/issue_433' into 'develop'
...
[#433 ] fix markdown formatting
See merge request pleroma/pleroma!545
6 years ago
href
bfe27c1b55
Merge branch '114_email_invites' into 'develop'
...
[#114 ] Email invites
See merge request pleroma/pleroma!541
6 years ago
href
acec11626d
Merge branch 'fix/issue_272' into 'develop'
...
[#272 ] fix tags
See merge request pleroma/pleroma!540
6 years ago
Maksim Pechnikov
ea72ac549b
fix case when tags is invalid
6 years ago
Maksim Pechnikov
d3ec09bb38
fix tags
6 years ago
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
6 years ago
href
84b9a9d497
TwitterAPI.ActivityView: Ignore unhandled activities
6 years ago
href
412df2cd38
Warn if push is disabled..
6 years ago
Maksim Pechnikov
baead4ea4b
fix markdown formatting
6 years ago
href
91236c60c7
Merge branch 'feature/file-size-checking' into 'develop'
...
[#36 ] Add warnings when file upload fails
See merge request pleroma/pleroma!523
6 years ago
href
0b4c61e8d5
Fix warning
6 years ago
href
ec0e613eca
Pleroma.Activity.mastodon_notification_type/1
6 years ago
href
331396cbcd
Properly disable Web Push if no VAPID key is set
6 years ago
href
6822916183
Typos
6 years ago
href
b1bcd97a0f
Push: respect alerts settings
6 years ago
href
d8984b7bf8
Push: add missing notification_type field
6 years ago
href
7facbb2b8d
Push.Subscription: convert base64 to base64 urlsafe
6 years ago
Egor Kislitsyn
324933a0ac
improve push message format (compatibility with mastodon)
6 years ago
Egor Kislitsyn
658edb166f
fix and improve web push; add configuration docs
6 years ago
Ivan Tashkinov
69fd63e248
[ #114 ] Added `invitesEnabled` to `metadata` of nodeinfo.
6 years ago
Ivan Tashkinov
66380b0641
[ #114 ] Removed `confirm_email` action stub (to be addressed in a separate MR).
6 years ago
Ivan Tashkinov
9666376f5f
[ #114 ] Readded `invites_enabled` config setting, updated readme.
6 years ago
Ivan Tashkinov
a89e3b4b60
[ #114 ] Moved email_invite action to AdminAPIController, adjusted tests.
6 years ago
Ivan Tashkinov
3cbf16a5fe
[ #114 ] Added UserInviteToken creation, adjusted invitation email link to include it.
6 years ago
Ivan Tashkinov
cc83d7ffe7
[ #114 ] Naive implementation of email invitations.
6 years ago
href
30dc81667c
Merge branch '114_user_registration_emails' into 'develop'
...
[#114 ] User registration emails
Closes #114
See merge request pleroma/pleroma!531
6 years ago
Ivan Tashkinov
f81213910f
[ #114 ] Addressed MR comments. Removed functionality to be extracted to other MRs.
6 years ago
lambda
262cc6d44b
Merge branch 'fix/double-rt-or-fav' into 'develop'
...
Prevent accidental double RTs or favorites
See merge request pleroma/pleroma!542
6 years ago
eal
61ad2ce422
TwitterAPI: Include favorited post in json
6 years ago
eal
1ca080c862
Prevent accidental double RTs or favorites
6 years ago
Ivan Tashkinov
18b9467d1a
[ #114 ] Removed `email_invite` implementation (to be addressed separately).
6 years ago
Ivan Tashkinov
00744c6b03
[ #114 ] Initial implementation of user email invitations.
6 years ago
Ivan Tashkinov
908943352f
[ #114 ] Refactored `password_reset` (moved to TwitterAPI). Added homepage links to password reset result pages.
6 years ago
Ivan Tashkinov
bfff2399ff
[ #114 ] Routes and config for `confirm_email` and `email_invite` (Twitter API).
6 years ago
Ivan Tashkinov
e3a21bcd45
[ #114 ] Addressed warnings. Fix of `with` statement clause in `password_reset`.
6 years ago
Ivan Tashkinov
f5afb11032
[ #114 ] Initial implementation of user password reset emails (user-initiated).
6 years ago
Ivan Tashkinov
12905ce1ad
[ #114 ] Added /dev/mailbox dev-only route (emails preview). Added mailer config examples.
6 years ago
Maksim Pechnikov
89b3729afa
fix warnings
6 years ago
scarlett
213176c3c3
Add new frontend options to server-side config.
6 years ago
lambda
ff10b9927b
Merge branch 'support/bugfix_272' into 'develop'
...
[#272 ] fix hashtags in api
See merge request pleroma/pleroma!510
6 years ago
lain
c81c74d847
Treat warnings as errors outside of tests.
6 years ago
Maksim Pechnikov
e94c3442f4
updates
6 years ago
Maksim Pechnikov
074fa790ba
fix compile warnings
6 years ago
Maksim Pechnikov
068353ac0b
formatting
6 years ago
Maksim Pechnikov
9442588ae9
fix hashtags in api response
6 years ago
Rin Toshaka
15616eda5e
Make uploadlimit an object that stores upload limits for avatars, banners, backgrounds, general content
6 years ago
lambda
beadeaffa1
Merge branch 'fix/nodeinfo-nil-features' into 'develop'
...
Nodeinfo: remove null features; relay feature.
See merge request pleroma/pleroma!520
6 years ago
href
bdc8112e40
Media proxy: fix url encoding
6 years ago
Rin Toshaka
578051809f
Add uploadlimit to Twitter API config
6 years ago
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
6 years ago
href
134cc94cbd
Nodeinfo: remove null features; relay feature.
6 years ago
href
d8fcf7c5cf
Media proxy: follow HTTP redirects by default
6 years ago
lambda
94d8f1ab30
Merge branch '394_user_tags' into 'develop'
...
[#394 ] User tags
Closes #394
See merge request pleroma/pleroma!508
6 years ago
Ivan Tashkinov
6ed5044c4e
[ #394 ] Refactoring (using Ecto.Multi; "untag" route change).
6 years ago
Ivan Tashkinov
7a2162bbcb
[ #394 ] User view (Twitter & Mastadon API): wrapped "tags" in "pleroma" map.
6 years ago
Ivan Tashkinov
7bcb6a183a
[ #394 ] Refactoring.
6 years ago
Ivan Tashkinov
7b19487389
[ #394 ] Added `users.tags` and admin routes to tag and untag users. Added tests.
6 years ago
kaniini
1d531fd2f3
Merge branch 'fix/mastodon-api-settings' into 'develop'
...
Fix put_settings and remove info_changeset
See merge request pleroma/pleroma!507
6 years ago
kaniini
abead01ab6
Merge branch 'correct-and-improve-http-options' into 'develop'
...
Correct and improve http options
See merge request pleroma/pleroma!505
6 years ago
kaniini
b0adea30b3
Merge branch 're-mrf' into 'develop'
...
Add a MRF Policy for appending re: to identical subjects in replies.
See merge request pleroma/pleroma!499
6 years ago
rinpatch
2ae1128d9f
MastoAPI: Fix put_settings
6 years ago
scarlett
d27e3f269f
Rename regular expression 'have_re' to 'reply_prefix'.
6 years ago
Egor Kislitsyn
6f36e903b0
use `User.avatar_url`
6 years ago
Egor Kislitsyn
79668c08fc
cleanup
6 years ago
scarlett
3dff61ebec
Harden re: detection.
6 years ago
Egor Kislitsyn
3d492795b7
clean up
6 years ago
Egor Kislitsyn
4944498133
Merge branch 'develop' into feature/compat/push-subscriptions
...
# Conflicts:
# lib/pleroma/application.ex
# lib/pleroma/plugs/oauth_plug.ex
6 years ago
Egor Kislitsyn
bac58b1524
show warning if VAPID is not set
6 years ago
Egor Kislitsyn
8b4397c704
Merge branch 'develop' into feature/compat/push-subscriptions
...
# Conflicts:
# lib/mix/tasks/sample_config.eex
# lib/pleroma/web/twitter_api/controllers/util_controller.ex
# mix.exs
# mix.lock
6 years ago
Egor Kislitsyn
04a48286e6
Add web push support
6 years ago
scarlett
6a6aaa0e1a
Use object.normalize.
6 years ago
Hakaba Hitoyo
a09ed0f5af
avoid mix format bug
6 years ago
kaniini
ccf0b46dd6
Merge branch '210_twitter_api_uploads_alt_text' into 'develop'
...
[#210 ] TwitterAPI: alt text support for uploaded images. Mastodon API uploads security fix.
See merge request pleroma/pleroma!496
6 years ago
Ivan Tashkinov
3e90f688f1
[ #210 ] Mastodon: actor storing for media uploads, ownership check to update_media.
...
Refactoring.
6 years ago
Hakaba Hitoyo
96ba95df2e
remove follow_redirect options
6 years ago
Hakaba Hitoyo
27792b2d77
remove pool and timeout options which duplicate with the default
6 years ago
Hakaba Hitoyo
505d820827
Merge remote-tracking branch 'origin/debug-suggestions-api' into correct-and-improve-http-options
6 years ago
lain
76d6b1c6ab
Merge remote-tracking branch 'origin' into follower-hiding
6 years ago
lain
3ea4476445
MastodonAPI: Show users their own network.
6 years ago
lain
fdac215091
TwitterAPI: Show users their own network.
6 years ago
Ivan Tashkinov
3b5be09f45
[ #210 ] Stylistic change.
6 years ago
lain
839526a913
TwitterAPI: Add network hiding.
6 years ago
Ivan Tashkinov
c4f3c5e939
[ #210 ] Stylistic change.
6 years ago
Ivan Tashkinov
848151f7cb
[ #210 ] [TwitterAPI] Made actor be stored for uploads. Added ownership check
...
to `update_media` action. Added controller tests for `upload` and `update_media` actions.
Refactoring.
6 years ago
Ivan Tashkinov
be187f82f7
[ #210 ] Further refactoring.
6 years ago
hakabahitoyo
a418547bdf
debug /api/v1/suggestions
6 years ago
scarlett
8a1df182cf
Add a MRF Policy for appending re: to identical subjects in replies.
6 years ago
kaniini
ec1ec32f20
Merge branch 'optional-retry-queue' into 'develop'
...
Make retry queue optional.
See merge request pleroma/pleroma!498
6 years ago
lain
925b05054f
Make retry queue optional.
...
At the moment, it can use a lot of memory really fast.
6 years ago
kaniini
114b95cee2
Merge branch 'feature/integration_tesla' into 'develop'
...
[#354 ] Move all http interactions to Tesla
See merge request pleroma/pleroma!487
6 years ago
William Pitcock
b57d83e3c9
MRF: simple policy: fix media removal
6 years ago
Ivan Tashkinov
48e6193bf2
[ #210 ] Refactoring.
6 years ago
Ivan Tashkinov
826fc446d5
[ #210 ] TwitterAPI: implemented /api/media/metadata/create
...
to allow uploads description (alt text) setting.
6 years ago
Maksim Pechnikov
87109482f3
status_code -> status
6 years ago
Maksim Pechnikov
97252a27d9
fix http request in Salmon
6 years ago
Maksim Pechnikov
3ce16e5a56
init tesla and updated the http requests in Pleroma.Web.Websub
6 years ago
lambda
88b05aeabb
Merge branch 'fix/parse-user-bio' into 'develop'
...
Parse user's bio on register
See merge request pleroma/pleroma!492
6 years ago
lambda
42ef7cd227
Merge branch 'fix-media-proxy-defaults' into 'develop'
...
Fix media proxy config defaults
See merge request pleroma/pleroma!495
6 years ago
Maxim Filippov
4b70e5eae9
Parse bio for MastodonAPI
6 years ago
Maxim Filippov
ce98d5eb9b
Parse user's bio on register
6 years ago
lain
8c9a4e8b40
TwitterAPI: Implement hide_network.
6 years ago
lain
2a639de9b3
MastodonApi: Implement hide_network.
6 years ago
lain
6be0ab1e55
Hide network in ap.
6 years ago
href
43d5e4f7fa
Fix media proxy config defaults
6 years ago
lain
f18b86fd5f
More fixes for Info schema.
6 years ago
lain
93f2dc19d9
TwitterAPI: Fix banner and background update.
6 years ago
lain
347df6421d
Fix masto api user updating.
6 years ago
lain
c443c9bd72
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into validate-user-info
6 years ago
lain
1c67277c80
Fix admin api.
6 years ago
href
680716b3c9
Config docs
6 years ago
href
02d3dc6869
Uploads fun, part. 2
6 years ago
href
b19597f602
reverse proxy / uploads
6 years ago
lain
d0ec2812bd
Merge remote-tracking branch 'origin' into validate-user-info
6 years ago
lain
8f1fffebc6
Fix transmogrifier test.
6 years ago
lain
d088ac6286
Fix OStatus user updates.
...
Breaks banner updating.
6 years ago
lain
48b95a9b95
Assorted fixes.
6 years ago
lain
d407f662af
Fix TwitterApiController.
6 years ago
lain
a6812bc9df
Remove "most recent notification" endpoint.
6 years ago
KokaKiwi
87098d1676
Streamer: Don't send unwanted DMs to list streams
6 years ago
lain
3c61df6b9e
Webfinger fixes.
6 years ago
lain
ec464ef20a
HTTP sig fixes.
6 years ago
Haelwenn
5ae6088d37
Merge branch 'feature/mrf-user-allowlist' into 'develop'
...
MRF: user allowlist module
See merge request pleroma/pleroma!477
6 years ago
William Pitcock
271f9f1335
nodeinfo: add mrf_user_allowlist data
6 years ago
William Pitcock
8c05d19c7f
MRF: add user allowlist module
6 years ago
Mark Felder
6cc94404d7
Replace this hardcoded <title>
6 years ago
Haelwenn (lanodan) Monnier
ca029f0b69
Web.Streamer: Get unauthenticated statuses representation
6 years ago
Haelwenn (lanodan) Monnier
d388a99143
Web.MastodonAPI.MastodonSocket: Put access_token at function-level
6 years ago
Haelwenn (lanodan) Monnier
5346fabf14
Web.MastodonAPI.MastodonSocket: Add unauthentified websocket endpoints
...
reported by soka on CRTNet
6 years ago
kaniini
675653ceb7
Merge branch 'feature/admin-api' into 'develop'
...
Add a admin API
See merge request pleroma/pleroma!366
6 years ago
kaniini
182e3e8da2
Merge branch 'feature/improve-version' into 'develop'
...
Improved version string
See merge request pleroma/pleroma!467
6 years ago
kaniini
a591a044a9
Merge branch 'runtime-fixes' into 'develop'
...
Various runtime configuration fixes
See merge request pleroma/pleroma!468
6 years ago
lain
0bea0308f1
Merge branch 'validate-user-info' of git.pleroma.social:pleroma/pleroma into validate-user-info
6 years ago