kaniini
|
7dcac0bac0
|
Merge branch 'develop' into 'develop'
Add shortcode_globs setting to documentation
See merge request pleroma/pleroma!1087
|
2019-04-23 02:41:21 +00:00 |
|
ilja
|
74ef14b04e
|
Add :emoji settings to config.md
|
2019-04-22 19:42:02 +02:00 |
|
Alex S
|
d35246c449
|
added healthcheck setting to instance config
|
2019-04-22 17:00:06 +07:00 |
|
ilja
|
c876b04aeb
|
Add shortcode_globs setting to documentation
|
2019-04-22 11:17:53 +02:00 |
|
Alexander Strizhakov
|
88f0be9693
|
Feature/826 healthcheck endpoint
|
2019-04-22 07:19:53 +00:00 |
|
kaniini
|
7fcbda702e
|
Merge branch 'rework-emoji-management' into 'develop'
Remove finmoji and add a way to download emojis in packs
Closes #817 and #821
See merge request pleroma/pleroma!1073
|
2019-04-22 02:07:19 +00:00 |
|
Haelwenn (lanodan) Monnier
|
d086319733
|
differences_in_mastoapi_responses.md: content_type parameter of post submission
|
2019-04-21 12:48:40 +02:00 |
|
Ekaterina Vaartis
|
8f93d4c423
|
Remove most finmoji mentions where appropriate
|
2019-04-20 15:42:14 +03:00 |
|
Ekaterina Vaartis
|
31cff7dbca
|
Document the pleroma.emoji task
|
2019-04-20 15:06:07 +03:00 |
|
|
|
8166cefa21
|
Include explicit warning for emerge config line as it will vary more widely based on current version of postgres
|
2019-04-20 07:11:06 +00:00 |
|
Alexander Strizhakov
|
ada384207b
|
typo fix
docs for RelMe provider
|
2019-04-19 07:50:21 +00:00 |
|
Mark Felder
|
1aa4994f6d
|
Do not require authentication for user search in MastoAPI
|
2019-04-18 12:44:25 -05:00 |
|
kaniini
|
73df3046e0
|
Merge branch 'feature/788-separate-email-addresses' into 'develop'
Feature/788 separate email addresses
Closes #788
See merge request pleroma/pleroma!1040
|
2019-04-16 18:44:07 +00:00 |
|
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`.
|
2019-04-16 22:20:56 +08:00 |
|
lain
|
088f378408
|
Custom Emoji docs: Make it clear that config.exs is not for lewd.
|
2019-04-15 15:51:17 +02:00 |
|
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
|
2019-04-13 22:41:54 +02:00 |
|
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
|
2019-04-13 12:24:38 +07:00 |
|
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
|
2019-04-12 10:41:09 +00:00 |
|
Alex S
|
fe511a6c65
|
Merge branch 'develop' into feature/788-separate-email-addresses
|
2019-04-10 18:06:54 +07:00 |
|
Alex S
|
fe13a1d78c
|
adding notify_email setting for trigger emails
|
2019-04-10 17:57:41 +07:00 |
|
lambda
|
e5d553aa45
|
Merge branch 'feature/767-multiple-use-invite-token' into 'develop'
Feature/767 multiple use invite token
See merge request pleroma/pleroma!1032
|
2019-04-10 10:10:08 +00:00 |
|
Sadposter
|
be8350baa2
|
Merge branch 'develop' into feature/user-status-subscriptions
|
2019-04-10 10:44:54 +01:00 |
|
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
|
2019-04-10 06:22:51 +00:00 |
|
Haelwenn (lanodan) Monnier
|
1791ee8ec4
|
s/Pleroma.Mailer/Pleroma.Emails.Mailer/
|
2019-04-10 06:33:19 +02:00 |
|
kaniini
|
97395e013e
|
Merge branch 'notification-pleroma-settings' into 'develop'
Notification controls
Closes #738
See merge request pleroma/pleroma!988
|
2019-04-10 02:10:31 +00:00 |
|
rinpatch
|
b57b43027c
|
Change response format of /api/pleroma/emoji to the one that actually makes sense
|
2019-04-09 23:20:31 +03:00 |
|
Alex S
|
012bb5dcc9
|
renaming expire_at -> expires_at
keyword style change
|
2019-04-08 16:01:28 +07:00 |
|
Alex S
|
b810aac117
|
added docs to docs/api/admin_api.md
code style and little renamings
|
2019-04-07 19:48:52 +07:00 |
|
Sadposter
|
e6778003ab
|
JSON need quotes!
|
2019-04-06 16:24:21 +01:00 |
|
Sadposter
|
c05fe4da0a
|
Document subscription endpoints, fix typos
Also adds a quick error case on the subscription endpoints
to avoid 500s
|
2019-04-06 16:20:06 +01:00 |
|
Mark Felder
|
da64a5aece
|
Document the admin API endpoints for controlling follow/unfollow
|
2019-04-05 11:29:34 -05:00 |
|
|
|
3b12eeda19
|
Add ability to ship logs to a Slack channel
|
2019-04-04 19:52:22 +00:00 |
|
rinpatch
|
79cb34a4b0
|
Fix preview not being usable in form data
|
2019-04-02 23:07:16 +03:00 |
|
lambda
|
a79ce94dd4
|
Merge branch 'feature/fake-statuses' into 'develop'
Add fake status submit
See merge request pleroma/pleroma!995
|
2019-04-02 14:17:43 +00:00 |
|
rinpatch
|
fdb4357e9b
|
Rename fake param to preview and make the tests check that the object was not inserted to the db
|
2019-04-02 14:31:18 +03:00 |
|
rinpatch
|
e2b94d8f33
|
Make only important note bold rather than the whole paragraph because it looks better that way
|
2019-04-01 19:24:50 +03:00 |
|
rinpatch
|
a309b49c2d
|
Remove outdated howto change config and port and move it to config.md instead
|
2019-04-01 19:19:06 +03:00 |
|
rinpatch
|
949cfde065
|
restart makes no sense here as we instructed to stop the service before
|
2019-04-01 16:26:46 +03:00 |
|
rinpatch
|
bff8cde0cf
|
Instruct to stop the service only after git pulling and getting deps to minimize downtimes
|
2019-04-01 16:23:32 +03:00 |
|
rinpatch
|
7c69c6f624
|
change bold text to be proper geadings in introduction.md
|
2019-04-01 16:22:12 +03:00 |
|
rinpatch
|
b46e6f0949
|
Fix backup/restore page to have proper headings
|
2019-04-01 16:10:47 +03:00 |
|
rinpatch
|
42b779527c
|
document fake option
|
2019-03-29 22:15:20 +03:00 |
|
rinpatch
|
afbc905a1c
|
qs
|
2019-03-29 16:38:18 +03:00 |
|
rinpatch
|
11584488d1
|
Improve PleromaJobQeue config documentation
|
2019-03-29 16:11:22 +03:00 |
|
Egor
|
9a39d1d846
|
Replace Pleroma.Jobs with pleroma_job_queue
|
2019-03-29 12:46:05 +00:00 |
|
lambda
|
749d53e2b2
|
Merge branch 'sayonara-gitlab-wiki' into 'develop'
Move out of Gitlab Wiki
See merge request pleroma/pleroma!990
|
2019-03-29 10:24:52 +00:00 |
|
rinpatch
|
634e09e1a8
|
Remove duplicated header from i2p.md
|
2019-03-28 20:29:46 +03:00 |
|
rinpatch
|
9bd80e6044
|
did it really take me 4 commits to fix this?
|
2019-03-28 20:27:01 +03:00 |
|
rinpatch
|
d16e2a2e04
|
Remove duplicated header from admin_api.md
|
2019-03-28 20:16:59 +03:00 |
|
rinpatch
|
e4601b2c1d
|
remove admin tasks as they have their page in mix tasks category already
|
2019-03-28 20:16:14 +03:00 |
|
