Sachin Joshi
|
ee22fff5ac
|
remove deprecated PleromaFE configuration
|
5 years ago |
|
lambda
|
692919c7d2
|
Merge branch 'refactor/use-job-queue-everywhere' into 'develop'
use job queue everywhere
Closes #862
See merge request pleroma/pleroma!1142
|
5 years ago |
|
William Pitcock
|
ac3a3abf6b
|
clean up follow/block imports a little
|
5 years ago |
|
William Pitcock
|
69a9e0563c
|
user: migrate follow/blocks import to job queue
|
5 years ago |
|
Egor Kislitsyn
|
1557b99beb
|
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
|
5 years ago |
|
Alexander Strizhakov
|
ce6ca0fefe
|
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into feature/845-improve-status-deletion
|
5 years ago |
|
Egor Kislitsyn
|
c157e27a00
|
Merge branch 'develop' into feature/disable-account
|
5 years ago |
|
Alex S
|
d35246c449
|
added healthcheck setting to instance config
|
5 years ago |
|
Egor
|
b9cdf6d3b9
|
Use `User.get_cached*` everywhere
|
5 years ago |
|
Alexander Strizhakov
|
88f0be9693
|
Feature/826 healthcheck endpoint
|
5 years ago |
|
Egor Kislitsyn
|
e8c2f9a73a
|
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
|
5 years ago |
|
Ekaterina Vaartis
|
52ed287e87
|
Fix incorrect multiple emoji tag handling introduced in initial impl
|
6 years ago |
|
rinpatch
|
627e5a0a49
|
Merge branch 'develop' into feature/database-compaction
|
6 years ago |
|
Normandy
|
d4a749cfb2
|
Handle new-style mastodon follow lists
Fixes https://git.pleroma.social/pleroma/pleroma/issues/814
|
6 years ago |
|
Egor Kislitsyn
|
db4badc6aa
|
move user disable into deactivation
|
6 years ago |
|
Egor Kislitsyn
|
0f2f7d2cec
|
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
|
6 years ago |
|
lambda
|
c8440b5e0c
|
Merge branch 'fix/emoji-api-nonsense' into 'develop'
Change response format of /api/pleroma/emoji so it makes sense
See merge request pleroma/pleroma!1038
|
6 years ago |
|
kaniini
|
97395e013e
|
Merge branch 'notification-pleroma-settings' into 'develop'
Notification controls
Closes #738
See merge request pleroma/pleroma!988
|
6 years ago |
|
rinpatch
|
b57b43027c
|
Change response format of /api/pleroma/emoji to the one that actually makes sense
|
6 years ago |
|
Alex S
|
fa8483cb80
|
Merging develop into feature/770-add-emoji-tags
Conflict test/web/twitter_api/util_controller_test.exs
|
6 years ago |
|
lambda
|
180b87257c
|
Merge branch 'bugfix/share-mastodon' into 'develop'
[OStatus] adds status to pleroma instance if the url given is a status
See merge request pleroma/pleroma!1002
|
6 years ago |
|
Alex S
|
9e0567ec52
|
Merge develop into feature/770-add-emoji-tags
|
6 years ago |
|
Egor Kislitsyn
|
1b3d921921
|
change `Repo.get(User, id)` => `User.get_by_id(id)`
|
6 years ago |
|
Sachin Joshi
|
f20e8d28de
|
add support for all status type (ostatus) and replase case with if
|
6 years ago |
|
Sachin Joshi
|
6386c1c9c1
|
fetch url for OStatus to know if it is a/c or status
|
6 years ago |
|
Sachin Joshi
|
1d01e8e656
|
[OStatus] adds status to pleroma instance if the url given is a status
|
6 years ago |
|
Alex S
|
3601f03147
|
Adding tag to emoji ets table
changes in apis
|
6 years ago |
|
eugenijm
|
cd90695a34
|
Add PUT /api/pleroma/notification_settings endpoint
|
6 years ago |
|
lain
|
bf27190f7f
|
UtilController: Return state of safe dm mentions.
|
6 years ago |
|
eugenijm
|
43fb03be5a
|
Allow to mark a single notification as read
|
6 years ago |
|
Haelwenn (lanodan) Monnier
|
a3a9cec483
|
[Credo] fix Credo.Check.Readability.AliasOrder
|
6 years ago |
|
Egor Kislitsyn
|
eb84de0143
|
allow users to disable their own account
|
6 years ago |
|
Haelwenn (lanodan) Monnier
|
6a6a5b3251
|
de-group alias/es
|
6 years ago |
|
Haelwenn (lanodan) Monnier
|
60ea29dfe6
|
Credo fixes: alias grouping/ordering
|
6 years ago |
|
lain
|
8e8a1e1ba8
|
Return new-style config if old-style config is set to false.
This is in preparation for 1.0. We'll be able to switch the config to the new
mechanism on PleromaFE then as well.
|
6 years ago |
|
lain
|
e221c681dc
|
New frontend configuration mechanism.
|
6 years ago |
|
William Pitcock
|
980b5288ed
|
update copyright years to 2019
|
6 years ago |
|
Ivan Tashkinov
|
67b4297f4d
|
[#483] Refactored blocks and follows import, added tests.
|
6 years ago |
|
Ivan Tashkinov
|
700661b761
|
[#483] Blocked users list import (TwitterAPI).
|
6 years ago |
|
William Pitcock
|
2791ce9a1f
|
add license boilerplate to pleroma core
|
6 years ago |
|
Ivan Tashkinov
|
1de0aa2f10
|
[#114] Account confirmation email, registration as unconfirmed (config-based), auth prevention for unconfirmed.
|
6 years ago |
|
Ekaterina Vaartis
|
a2399c1c7c
|
Add base CAPTCHA support (currently only kocaptcha)
|
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
|
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
|
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
|
331396cbcd
|
Properly disable Web Push if no VAPID key is set
|
6 years ago |
|
Ivan Tashkinov
|
9666376f5f
|
[#114] Readded `invites_enabled` config setting, updated readme.
|
6 years ago |
|
scarlett
|
213176c3c3
|
Add new frontend options to server-side config.
|
6 years ago |
|
Maksim Pechnikov
|
074fa790ba
|
fix compile warnings
|
6 years ago |
|
Rin Toshaka
|
15616eda5e
|
Make uploadlimit an object that stores upload limits for avatars, banners, backgrounds, general content
|
6 years ago |
