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
6 years ago
f98ee9402f
Merge branch 'userless-admin' into 'develop'
...
Add a way to use the admin api without a user.
See merge request pleroma/pleroma!576
6 years ago
f3eb414e28
Add a way to use the admin api without a user.
6 years ago
ef318fb8a9
Merge branch 'develop' into fix/formatter-ignore-html-chars
6 years ago
059dd6f681
Ignore HTML characters in formatter.ex
6 years ago
a6dfe1fc6b
Documentation: Move generated files to priv/static/doc, add it to endpoint.ex
6 years ago
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
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
92a5133c42
fix text field
6 years ago
52ac7dce5c
Merge branch 'captcha' into 'develop'
...
Captcha
See merge request pleroma/pleroma!550
6 years ago
c6d5f189d9
Merge branch 'fix-tags' into 'develop'
...
Fix tagging problems for existing instances.
See merge request pleroma/pleroma!562
6 years ago
98c31deaa9
Merge branch 'test-mix-tasks' into 'develop'
...
Add tests for Mix tasks
See merge request pleroma/pleroma!555
6 years ago
078b8b6d22
Merge branch 'phoenix14' into 'develop'
...
Upgrade to Phoenix 1.4
Closes #451
See merge request pleroma/pleroma!560
6 years ago
e4763cd459
Fix tagging problems for existing instances.
6 years ago
35522fef09
Use :ets.match_delete to delete old captchas
6 years ago
77b5154c82
Cowboy handler for Mastodon WebSocket
6 years ago
cc87880488
Support both OAuth token record and token string in UserView
6 years ago
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
ef6829382a
Clean captchas up periodically, not schedule it after theyre created
6 years ago
3a31fdaf06
Change minutes_retained config to seconds_retained
6 years ago
6062885df6
Add a configurable auto-cleanup for captchas
6 years ago
5dcb7aecea
More put_view.
6 years ago
22d483d4f7
Use bindings dbuser and dbname in sample_psql.eex
6 years ago
f672555ad3
Upgrade to Phoenix 1.4
6 years ago
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
4c783e35c0
Mastodon API: Fix PUT /api/web/settings
6 years ago
8d55a549e6
Replace HTTPoison with Tesla for kocaptha
6 years ago
23549d3952
Formatting fixes
6 years ago
b5518da904
Separate captcha implementation into a behaviour and use it
6 years ago
cddab5700b
WebFinger: Sends a 400 when resource param is missing, fix XRD typo in test
6 years ago
cc6689cc20
Merge branch 'fix/views-ignore-unhandled-activites' into 'develop'
...
TwitterAPI.ActivityView: Ignore unhandled activities
See merge request pleroma/pleroma!547
6 years ago
4a895a46d1
Allow port specification in instance.ex
6 years ago
28c43a417e
Add an ability to disabled captcha
6 years ago
a2399c1c7c
Add base CAPTCHA support (currently only kocaptcha)
6 years ago
e74f384b68
Merge branch 'fix/issue_433' into 'develop'
...
[#433 ] fix markdown formatting
See merge request pleroma/pleroma!545
6 years ago
bfe27c1b55
Merge branch '114_email_invites' into 'develop'
...
[#114 ] Email invites
See merge request pleroma/pleroma!541
6 years ago
acec11626d
Merge branch 'fix/issue_272' into 'develop'
...
[#272 ] fix tags
See merge request pleroma/pleroma!540
6 years ago
ea72ac549b
fix case when tags is invalid
6 years ago
d3ec09bb38
fix tags
6 years ago
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
bc6262d250
fixed typo
6 years ago
84b9a9d497
TwitterAPI.ActivityView: Ignore unhandled activities
6 years ago
412df2cd38
Warn if push is disabled..
6 years ago
baead4ea4b
fix markdown formatting
6 years ago
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
0b4c61e8d5
Fix warning
6 years ago
ec0e613eca
Pleroma.Activity.mastodon_notification_type/1
6 years ago
331396cbcd
Properly disable Web Push if no VAPID key is set
6 years ago
6822916183
Typos
6 years ago
b1bcd97a0f
Push: respect alerts settings
6 years ago
kaniini