kaniini
73df3046e0
Merge branch 'feature/788-separate-email-addresses' into 'develop'
...
Feature/788 separate email addresses
Closes #788
See merge request pleroma/pleroma!1040
6 years ago
Hakurei Reimu
10096bbf2b
add extra_cookie_attrs option to config
...
Allow instance admins to set their own SameSite cookie policy from
the config. Default value in the config is `Lax`.
6 years ago
lain
088f378408
Custom Emoji docs: Make it clear that config.exs is not for lewd.
6 years ago
Haelwenn (lanodan) Monnier
48982169dc
docs/installation/arch_linux_en.md: Remove useless ODBC
...
See [1] for confirmation.
1: https://git.pleroma.social/pleroma/pleroma/merge_requests/1050#note_24402
6 years ago
Alex S
c349573791
Merge develop to 788-separate-email-addresses
...
Merge conflicts:
test/web/twitter_api/twitter_api_test.exs
test/web/twitter_api/twitter_api_controller_test.exs
test/web/admin_api/admin_api_controller_test.exs
6 years ago
lambda
184ae60b21
Merge branch 'bugfix/pleroma-email-naming' into 'develop'
...
Make the filename and module name of Pleroma.Emails.* orthogonal
See merge request pleroma/pleroma!1029
6 years ago
Alex S
fe511a6c65
Merge branch 'develop' into feature/788-separate-email-addresses
6 years ago
Alex S
fe13a1d78c
adding notify_email setting for trigger emails
6 years ago
lambda
e5d553aa45
Merge branch 'feature/767-multiple-use-invite-token' into 'develop'
...
Feature/767 multiple use invite token
See merge request pleroma/pleroma!1032
6 years ago
Sadposter
be8350baa2
Merge branch 'develop' into feature/user-status-subscriptions
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
Haelwenn (lanodan) Monnier
1791ee8ec4
s/Pleroma.Mailer/Pleroma.Emails.Mailer/
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
012bb5dcc9
renaming expire_at -> expires_at
...
keyword style change
6 years ago
Alex S
b810aac117
added docs to docs/api/admin_api.md
...
code style and little renamings
6 years ago
Sadposter
e6778003ab
JSON need quotes!
6 years ago
Sadposter
c05fe4da0a
Document subscription endpoints, fix typos
...
Also adds a quick error case on the subscription endpoints
to avoid 500s
6 years ago
Mark Felder
da64a5aece
Document the admin API endpoints for controlling follow/unfollow
6 years ago
feld
3b12eeda19
Add ability to ship logs to a Slack channel
6 years ago
rinpatch
79cb34a4b0
Fix preview not being usable in form data
6 years ago
lambda
a79ce94dd4
Merge branch 'feature/fake-statuses' into 'develop'
...
Add fake status submit
See merge request pleroma/pleroma!995
6 years ago
rinpatch
fdb4357e9b
Rename fake param to preview and make the tests check that the object was not inserted to the db
6 years ago
rinpatch
e2b94d8f33
Make only important note bold rather than the whole paragraph because it looks better that way
6 years ago
rinpatch
a309b49c2d
Remove outdated howto change config and port and move it to config.md instead
6 years ago
rinpatch
949cfde065
restart makes no sense here as we instructed to stop the service before
6 years ago
rinpatch
bff8cde0cf
Instruct to stop the service only after git pulling and getting deps to minimize downtimes
6 years ago
rinpatch
7c69c6f624
change bold text to be proper geadings in introduction.md
6 years ago
rinpatch
b46e6f0949
Fix backup/restore page to have proper headings
6 years ago
rinpatch
42b779527c
document fake option
6 years ago
rinpatch
afbc905a1c
qs
6 years ago
rinpatch
11584488d1
Improve PleromaJobQeue config documentation
6 years ago
Egor
9a39d1d846
Replace Pleroma.Jobs with `pleroma_job_queue`
6 years ago
lambda
749d53e2b2
Merge branch 'sayonara-gitlab-wiki' into 'develop'
...
Move out of Gitlab Wiki
See merge request pleroma/pleroma!990
6 years ago
rinpatch
634e09e1a8
Remove duplicated header from i2p.md
6 years ago
rinpatch
9bd80e6044
did it really take me 4 commits to fix this?
6 years ago
rinpatch
d16e2a2e04
Remove duplicated header from admin_api.md
6 years ago
rinpatch
e4601b2c1d
remove admin tasks as they have their page in mix tasks category already
6 years ago
rinpatch
d0026761b7
cringe
6 years ago
rinpatch
dfae0050af
Move out of Gitlab Wiki
...
I understand that this change is quite unreadable and hard to review, sorry for forgetting to do atomic commits. This patch does not change too much content wise, it just
* Gets everything from gitlab wiki
* Removes some specific gitlab hacks
* Formats all documentation file names to be in snake case so they look the same way as our code does
6 years ago
eugenijm
cd90695a34
Add PUT /api/pleroma/notification_settings endpoint
6 years ago
eugenijm
10c81fc902
Add user show endpoint for Pleroma admin API
6 years ago
Maxim Filippov
3cf7539bca
Add more user filters + move search to its own module
6 years ago
kaniini
1c3d3d0c2b
Merge branch 'safe-mentions' into 'develop'
...
Add safe dm mode option.
See merge request pleroma/pleroma!958
6 years ago
William Pitcock
ae8fa5d0aa
docs: document `conversation_id` extension
6 years ago
Quentin Rameau
80bc9ed2ba
Add a gopher url port config option
...
This lets the user advertise a different port in the gopher urls,
for example listening locally on port 7070 but telling clients to
connect to the regular port 70.
6 years ago
lain
8468f3f6d4
Add safe dm mode option.
6 years ago
Mark Felder
325c106cb5
Document additional pleroma changes to /api/v1/accounts/:id
6 years ago
eugenijm
9971bf5be1
Added documentation for Pleroma-specific is_seen in Mastodon API
6 years ago
eugenijm
43fb03be5a
Allow to mark a single notification as read
6 years ago