c157e27a00
Merge branch 'develop' into feature/disable-account
2019-04-25 13:41:10 +07:00
4baea6e6d9
Fix leaking private configuration parameters in Mastodon and Twitter APIs, and add new configuration parameters to Mastodon API
...
This patch:
- Fixes `rights` in twitterapi ignoring `show_role`
- Fixes exposing default scope of the user to anyone in Mastodon API
- Extends Mastodon API to be able to show and set `no_rich_text`, `default_scope`, `hide_follows`, `hide_followers`, `hide_favorites` (requested by the FE in #674 )
Sorry in advance for 500 line one commit diff, I should have split it up to separate MRs
2019-04-24 20:01:42 +03:00
9dd36e5bcb
Extend Mastodon API with public endpoint for getting Favorites timeline of any user ( #789 )
2019-04-23 02:47:43 +00:00
10c40e13d2
Merge branch 'mastoapi/add-in-reply-to-screen-name' into 'develop'
...
Add `in_reply_to_account_acct` to MastoAPI status entity
See merge request pleroma/pleroma!1086
2019-04-23 02:43:53 +00:00
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
74ef14b04e
Add :emoji settings to config.md
2019-04-22 19:42:02 +02:00
d35246c449
added healthcheck setting to instance config
2019-04-22 17:00:06 +07:00
c876b04aeb
Add shortcode_globs setting to documentation
2019-04-22 11:17:53 +02:00
f60d072bbb
Add `pleroma.in_reply_to_account_acct` to MastoAPI status entity
2019-04-22 11:54:27 +03:00
88f0be9693
Feature/826 healthcheck endpoint
2019-04-22 07:19:53 +00:00
e8c2f9a73a
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
2019-04-22 13:08:30 +07:00
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
d086319733
differences_in_mastoapi_responses.md: `content_type` parameter of post submission
2019-04-21 12:48:40 +02:00
8f93d4c423
Remove most finmoji mentions where appropriate
2019-04-20 15:42:14 +03:00
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
ada384207b
typo fix
...
docs for RelMe provider
2019-04-19 07:50:21 +00:00
1aa4994f6d
Do not require authentication for user search in MastoAPI
2019-04-18 12:44:25 -05:00
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
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
088f378408
Custom Emoji docs: Make it clear that config.exs is not for lewd.
2019-04-15 15:51:17 +02:00
38926a063a
add `/api/pleroma/disable_account` to `docs/api/pleroma_api.md`
2019-04-15 16:39:42 +07:00
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
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
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
fe511a6c65
Merge branch 'develop' into feature/788-separate-email-addresses
2019-04-10 18:06:54 +07:00
fe13a1d78c
adding notify_email setting for trigger emails
2019-04-10 17:57:41 +07:00
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
be8350baa2
Merge branch 'develop' into feature/user-status-subscriptions
2019-04-10 10:44:54 +01:00
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
1791ee8ec4
s/Pleroma.Mailer/Pleroma.Emails.Mailer/
2019-04-10 06:33:19 +02:00
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
b57b43027c
Change response format of /api/pleroma/emoji to the one that actually makes sense
2019-04-09 23:20:31 +03:00
012bb5dcc9
renaming expire_at -> expires_at
...
keyword style change
2019-04-08 16:01:28 +07:00
b810aac117
added docs to docs/api/admin_api.md
...
code style and little renamings
2019-04-07 19:48:52 +07:00
e6778003ab
JSON need quotes!
2019-04-06 16:24:21 +01:00
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
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
79cb34a4b0
Fix preview not being usable in form data
2019-04-02 23:07:16 +03:00
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
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
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
a309b49c2d
Remove outdated howto change config and port and move it to config.md instead
2019-04-01 19:19:06 +03:00
949cfde065
restart makes no sense here as we instructed to stop the service before
2019-04-01 16:26:46 +03:00
bff8cde0cf
Instruct to stop the service only after git pulling and getting deps to minimize downtimes
2019-04-01 16:23:32 +03:00
7c69c6f624
change bold text to be proper geadings in introduction.md
2019-04-01 16:22:12 +03:00
b46e6f0949
Fix backup/restore page to have proper headings
2019-04-01 16:10:47 +03:00
3fc4ea45df
BBS: Add documentation.
2019-03-31 18:14:51 +02:00
42b779527c
document fake option
2019-03-29 22:15:20 +03:00
afbc905a1c
qs
2019-03-29 16:38:18 +03:00
11584488d1
Improve PleromaJobQeue config documentation
2019-03-29 16:11:22 +03:00
9a39d1d846
Replace Pleroma.Jobs with `pleroma_job_queue`
2019-03-29 12:46:05 +00:00
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
634e09e1a8
Remove duplicated header from i2p.md
2019-03-28 20:29:46 +03:00
9bd80e6044
did it really take me 4 commits to fix this?
2019-03-28 20:27:01 +03:00
d16e2a2e04
Remove duplicated header from admin_api.md
2019-03-28 20:16:59 +03:00
e4601b2c1d
remove admin tasks as they have their page in mix tasks category already
2019-03-28 20:16:14 +03:00
d0026761b7
cringe
2019-03-28 20:13:22 +03:00
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
2019-03-28 19:46:30 +03:00
cd90695a34
Add PUT /api/pleroma/notification_settings endpoint
2019-03-28 18:55:16 +03:00
10c81fc902
Add user show endpoint for Pleroma admin API
2019-03-27 21:44:15 +03:00
3cf7539bca
Add more user filters + move search to its own module
2019-03-27 03:51:59 +05:00
1c3d3d0c2b
Merge branch 'safe-mentions' into 'develop'
...
Add safe dm mode option.
See merge request pleroma/pleroma!958
2019-03-22 00:50:24 +00:00
ae8fa5d0aa
docs: document `conversation_id` extension
2019-03-21 23:27:42 +00:00
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.
2019-03-21 19:59:43 +03:00
8468f3f6d4
Add safe dm mode option.
2019-03-20 21:09:36 +01:00
325c106cb5
Document additional pleroma changes to /api/v1/accounts/:id
2019-03-18 19:48:56 +00:00
9971bf5be1
Added documentation for Pleroma-specific is_seen in Mastodon API
2019-03-18 10:40:10 +03:00
43fb03be5a
Allow to mark a single notification as read
2019-03-15 23:56:14 +03:00
8b352af4dd
Merge branch 'feature/openldap-support' into 'develop'
...
OpenLDAP support
Closes #203
See merge request pleroma/pleroma!859
2019-03-15 19:57:09 +00:00
f5b54acc81
Fix headers and add !929 docs to extras
...
[ci skip]
2019-03-15 10:58:15 +01:00
41fc67aa49
Merge branch 'mastoapi/mime_type' into 'develop'
...
Extend MastoAPI to provide attachment mimetypes
See merge request pleroma/pleroma!938
2019-03-15 09:48:50 +00:00
d7a34b604b
Extend MastoAPI to provide attachment mimetypes
2019-03-15 11:58:12 +03:00
c708656b5e
Merge branch 'robotstxt' into 'develop'
...
Add robots.txt
Closes #723
See merge request pleroma/pleroma!929
2019-03-15 02:50:27 +00:00
3dadaa4432
robots.txt
...
Add default robots.txt that allows bots access to all paths.
Add mix task to generate robots.txt taht allows bots access to no paths.
Document custom emojis, MRF and static_dir
static_dir documentation includes docs for the robots.txt Mix task.
2019-03-15 02:28:18 +00:00
cbdd11c381
Merge develop to bump elixir version in the CI so I don't get failing formatting
2019-03-14 22:33:20 +03:00
e2fe796c63
Add some tests
2019-03-14 22:02:48 +03:00
54e7087ab4
Merge remote-tracking branch 'upstream/develop' into feature/openldap-support
2019-03-14 17:43:30 +02:00
9338f061a3
Support LDAP method start_tls
2019-03-12 18:20:02 +02:00
3474066f6d
MastoAPI Accounts: Add fetching by nickname.
...
This is to make it easier for the frontends to handle domain.com/users/nickname
urls.
2019-03-11 15:18:32 +01:00
2c8deecdd2
Merge branch 'add-local-field-to-status' into 'develop'
...
MastoAPI StatusView: Add locality indicator.
See merge request pleroma/pleroma!920
2019-03-11 13:26:12 +00:00
66774b5567
Update Differences-in-MastodonAPI-Responses.md
2019-03-11 13:21:03 +00:00
4811eefa6e
MastoAPI StatusView: Add locality indicator.
2019-03-11 13:48:27 +01:00
6caa500cf1
Change order of source code to align with platforms
2019-03-11 08:36:56 +03:00
85632a38f9
Update homepages and provide source code links for Roma apps in Clients.md
2019-03-11 08:33:57 +03:00
4826c06172
Rename Mastalab -> Fedilab in Clients.md
2019-03-11 01:40:34 +00:00
130fc9eae6
Merge branch 'fetch-posts-on-first-federation' into 'develop'
...
Fetch user's outbox posts on first federation with that user
Closes #131
See merge request pleroma/pleroma!907
2019-03-08 22:33:31 +00:00
5021b7836f
Fetch user's outbox posts on first federation with that user
2019-03-08 16:27:56 +03:00
0fe715f3ba
Merge branch 'chore/merge-search-into-list-users' into 'develop'
...
Merge search endpoint into /users
See merge request pleroma/pleroma!898
2019-03-06 22:27:42 +00:00
76160122f6
Keep heading short
2019-03-06 05:01:38 +03:00
a283a1fcd0
Add default config for masto_fe
...
Related to: https://git.pleroma.social/pleroma/mastofe/merge_requests/22
2019-03-06 02:26:14 +01:00
2d30fc279f
Typo
2019-03-05 02:11:15 +03:00
02359d686c
local -> only_local
2019-03-04 21:36:47 +03:00
e34710b988
Format & update docs
2019-03-04 21:33:53 +03:00
88a672fe88
Move LDAP code to LDAPAuthenticator. Use Authenticator for token_exchange with grant_type as well
2019-03-03 21:20:36 +02:00
19e2b85247
Merge remote-tracking branch 'upstream/develop' into feature/openldap-support
2019-03-03 18:29:37 +02:00
6c6a2dbfdd
Merge branch 'feature/add-pagination-to-users-admin-api' into 'develop'
...
Add pagination and search to users
See merge request pleroma/pleroma!873
2019-03-03 15:59:15 +00:00
08c6aeeed7
Add docs
2019-03-02 17:32:46 +03:00
5b08b470f6
Add "local" params to users search
2019-03-01 20:13:02 +03:00
adac745512
Add docs to /users/search
2019-03-01 17:34:14 +03:00
c4235f96bd
Add `with_muted` param.
2019-02-27 16:37:42 +01:00
ed7fd6b47e
Add missing docs and tests
2019-02-27 03:08:03 +03:00
c3ac9424d2
AutoLinker
2019-02-26 23:32:26 +00:00
e278d47023
OpenLDAP support
2019-02-22 15:03:43 +02:00
bff9eb5ef7
Reports
2019-02-20 16:51:25 +00:00
25b9e7a8c3
Added admin API for changing user activation status
2019-02-19 19:37:02 +03:00
833161b5d2
Merge branch 'feature/jobs' into 'develop'
...
Job Queue
See merge request pleroma/pleroma!732
2019-02-18 19:43:06 +00:00
c23bd05737
Merge branch 'features/flavour-switching' into 'develop'
...
[MastoAPI] Add switching of frontend flavours
See merge request pleroma/pleroma!807
2019-02-18 04:01:51 +00:00
f26582aae9
Merge branch 'mastoapi-stop-capping-attachments' into 'develop'
...
Remove a limit on attachments in Mastodon API and document the changes in responses from vanilla Mastodon
See merge request pleroma/pleroma!834
2019-02-17 17:37:48 +00:00
6a8a8e90da
Update Differences-in-MastodonAPI-Responses.md
2019-02-17 17:01:22 +00:00
4df455f69b
[MastoAPI] Add switching of frontend flavours
2019-02-16 19:50:13 +01:00
c788f1543c
Add a section on how to identify a pleroma instance, clarify that post upload limit is not capped too
2019-02-16 21:14:07 +03:00
96c725328b
Remove a limit on attachments in Mastodon API and document the changes in responses from vanilla mastodon
2019-02-16 20:38:25 +03:00
27375e5575
WelcomeMessage: specify that the user has to be local.
2019-02-16 17:25:06 +01:00
d812a347ca
Add optional welcome message.
2019-02-16 16:42:34 +01:00
16b7c07115
Mark streaming feature for desktop apps in Clients.md
2019-02-13 07:51:14 +00:00
84f22d1cb8
Mark streaming feature for mobile/web apps in Clients.md
2019-02-12 02:35:15 +00:00
305d219413
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs
...
# Conflicts:
# lib/pleroma/web/federator/federator.ex
# lib/pleroma/web/websub/websub.ex
2019-02-11 13:54:21 +07:00
db407e4d50
add feather to webclients
2019-02-10 16:18:04 +01:00
94385313b5
docs/Clients.md: Add Nekonium
...
[ci skip]
2019-02-10 14:42:32 +01:00
daa25f3403
docs/Clients.md: Add Twidere, Remove SubwayTooter, sort alphabetically
...
[ci skip]
2019-02-10 14:32:42 +01:00
f2d5989ffa
docs/Clients.md: Add Social (GNOME)
...
[ci skip]
2019-02-10 14:32:42 +01:00
91a41ec670
docs/Clients.md: Add per-type sections
...
helps differenciate between Electrons and others like Brutaldon.
[ci skip]
2019-02-10 14:32:42 +01:00
5f767be331
docs/Clients.md: Add Brutaldon, Sengi, Halcyon, Pinafore
2019-02-10 14:32:42 +01:00
d0cf58d032
WIP: docs/Clients.md: Add documentation about clients supporting pleroma
...
[ci skip]
2019-02-10 14:32:42 +01:00
9a23f8f3ea
Add tests and fix a typo in docs
2019-02-08 20:23:26 +03:00
38ff9b3568
fix typo in config.md
2019-02-08 15:12:44 +03:00
6c21f5aa16
Merge branch 'develop' into feature/keyword-policy
2019-02-08 13:12:33 +03:00
8a0b755c19
rename ftl_removal to federated_timeline_removal to keep consistent naming with SimplePolicy
2019-02-08 13:12:09 +03:00
46aa8c18a2
Add keyword policy
2019-02-08 12:38:24 +03:00
ab80c8ebb8
adds a couple of explicit examples for ExSyslogger
2019-02-06 17:54:30 +00:00
3a3a3996b7
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs
...
# Conflicts:
# lib/pleroma/web/activity_pub/activity_pub.ex
# lib/pleroma/web/federator/federator.ex
2019-02-04 20:50:28 +07:00
89762ad230
Merge branch 'feature/hellthread-filter-improvements' into 'develop'
...
Improve hellthread filter
Closes #584
See merge request pleroma/pleroma!766
2019-02-04 12:36:50 +00:00
e10cda7541
implemented tweaks
2019-02-03 22:46:06 +01:00
10130fa7d6
made toggleable, added docs
2019-02-03 20:27:28 +01:00
0c08bd4181
Update Mogrify docs and warning for deprecated syntax to encourage
...
users to enable both strip and auto-orient
2019-02-03 16:39:42 +00:00
b3b0855456
Merge branch '534_federation_targets_reachability' into 'develop'
...
[#534 ] Unreachable federation targets retirement
Closes #534
See merge request pleroma/pleroma!703
2019-02-01 09:14:35 +00:00
0340fcaeca
Merge branch 'docs/pleroma-api-invite-token' into 'develop'
...
docs/Pleroma-API.md: Add missing token field documentation
See merge request pleroma/pleroma!752
2019-01-31 22:28:08 +00:00
a7c55c61bb
docs/Pleroma-API.md: Add missing token field documentation
...
[ci skip]
2019-01-31 23:23:53 +01:00
dea33f4aec
Merge branch 'develop' into 'develop'
...
Clarify the description of the `logo_mask` configuration key.
See merge request pleroma/pleroma!747
2019-01-31 16:28:40 +00:00
7057891db6
Make rich media support toggleable
2019-01-31 18:18:20 +03:00
a0dc95d084
Clarify the description of the `logo_mask` configuration key.
2019-01-31 13:14:22 +00:00
d3677d2b4d
Merge remote-tracking branch 'MAIN/develop' into feature/jobs
2019-01-31 15:07:49 +07:00
bd5086731e
Merge branch 'multiple-hackney-pools' into 'develop'
...
Use multiple hackney pools
See merge request pleroma/pleroma!739
2019-01-30 19:01:57 +00:00
4aff4efa8d
Use multiple hackney pools
...
* federation (ap, salmon)
* media (rich media, media proxy)
* upload (uploader proxy)
Each "part" will stop fighting others ones -- a huge federation outbound
could before make the media proxy fail to checkout a connection in time.
splitted media and uploaded media for the good reason than an upload
pool will have all connections to the same host (the uploader upstream).
it also has a longer default retention period for connections.
2019-01-30 15:06:46 +01:00
7db517ff06
docs/config.md: Fix syntax, pleroma_fe isn’t an atom
2019-01-30 11:51:12 +01:00
aa492af6c2
docs/config.md: Fix typo, provide an example key with camelCase and where to find more
...
[ci skip]
2019-01-30 11:33:39 +01:00
3f9d0c08ea
docs/Pleroma-API.md: Fix ex_doc title by changing the first h1 to it
...
[ci skip]
2019-01-29 19:11:54 +01:00
d03a116654
Merge branch 'hj-happiness-improvement' into 'develop'
...
New frontend configuration mechanism.
Closes #445
See merge request pleroma/pleroma!700
2019-01-29 13:54:10 +00:00
55affbca7f
add a job queue
2019-01-28 22:17:17 +07:00
d3f9e6f6fe
[ #534 ] Merged `upstream/develop`.
2019-01-28 15:39:14 +03:00
bcc559e4e6
Update config.md
2019-01-28 13:06:28 +01:00
37520e1e79
docs/Pleroma-API.md: Add note about emoji endpoints similarities
...
[ci skip]
2019-01-27 14:31:07 +01:00
656ed7c84a
[ #534 ] Configurable outgoing federation reachability timeout.
2019-01-25 15:10:21 +03:00
e221c681dc
New frontend configuration mechanism.
2019-01-23 12:40:57 +01:00
74346a7035
Fix merge conflict
2019-01-18 18:31:25 +03:00
8c368d42a2
Make attachment links configurable
...
Thanks @href!
2019-01-17 15:48:14 +00:00
4d5f15cd42
Introduce optional unfurling of nsfw content
2019-01-17 11:00:02 +03:00
bfe2a11a6b
Add config doc
2019-01-16 10:45:56 +03:00
9eba6b96dc
Fix spellign.
2019-01-11 09:55:33 +00:00
48591aab98
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/pinned-posts
...
# Conflicts:
# docs/config.md
2019-01-09 16:56:31 +07:00
0c750bc432
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/pinned-posts
2019-01-08 16:32:07 +07:00
6428ef77ad
add default configuration for the pinned statuses and some doc
2019-01-08 16:11:03 +07:00
0fae04c4e3
Add a setting for users to autofollow on sign up.
2019-01-08 09:57:53 +01:00
c9b99d4486
config/config.exs: Add syslog backends
2019-01-06 01:11:53 +01:00
b73a1a33de
Merge branch 'captcha' into 'develop'
...
Make captcha (kocaptcha) stateless
See merge request pleroma/pleroma!585
2019-01-03 17:04:27 +00:00
1a0391c8a4
Add documentation.
2019-01-01 17:40:42 +01:00
286632dfa2
Add docs/Admin-API.md
...
[ci skip]
2018-12-31 12:27:46 +01:00
5811e65e67
Add some hard limits on inserted activities.
2018-12-26 12:39:35 +01:00
c76179419d
Renamed the things
2018-12-23 11:14:29 +01:00
c92f91ffeb
Add documentation
2018-12-23 10:41:56 +01:00
336e37d98f
Make captcha (kocaptcha) stateless
...
Also rename seconds_retained to seconds_valid since that's how it is
now. Put it down from 180 to 20 seconds. The answer data is now
stored in an encrypted text transfered to the client and back, so no
ETS is needed
2018-12-21 09:55:47 +03:00
2e2030ada8
Merge branch '114_email_confirmation' into 'develop'
...
[#114 ] Email confirmation
See merge request pleroma/pleroma!546
2018-12-20 13:28:36 +00:00
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
2018-12-20 04:01:54 +00:00
d6b133ec51
Pleroma-API.md: Additionnal endpoints
2018-12-18 18:33:39 +01:00
6adea5a7b2
Move to docs
2018-12-18 17:16:26 +01:00
4a6855d9ee
Provide plaintext representations of content/cw in MastoAPI
2017-01-01 03:10:08 +03:00
9abf832b03
Merge remote-tracking branch 'pleroma/develop' into use-jobs-in-webpush
2019-04-08 18:48:10 +07:00
e19590c93f
Merge branch 'improve_upgrade_user_from_ap_id' into 'develop'
...
Improve Transmogrifier.upgrade_user_from_ap_id/2
See merge request pleroma/pleroma!1019
2019-04-08 11:42:20 +00:00
fd45cab9ec
Merge branch 'twitter_oauth' into 'develop'
...
OAuth consumer (sign in / sign up with external provider)
See merge request pleroma/pleroma!923
2019-04-08 11:41:50 +00:00
23067908de
Merge branch 'feature/770-add-emoji-tags' into 'develop'
...
Feature/770 add emoji tags
See merge request pleroma/pleroma!998
2019-04-08 09:50:00 +00:00
c3d5c3513a
Merge remote-tracking branch 'pleroma/develop' into use-jobs-in-webpush
2019-04-08 16:46:59 +07:00
a1a854646e
Merge branch 'develop' into use-jobs-in-webpush
2019-04-08 16:29:20 +07:00
bffddf5e31
[ #923 ] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
...
# Conflicts:
# docs/config.md
# test/support/factory.ex
2019-04-08 12:20:26 +03:00
b4da2bc1d0
Merge branch 'develop' into 'improve_upgrade_user_from_ap_id'
...
# Conflicts:
# config/config.exs
# docs/config.md
2019-04-08 09:18:01 +00:00
e3328bc138
[ #923 ] Removed <br> elements from auth forms, adjusted docs, minor auth settings refactoring.
2019-04-07 11:08:37 +03:00
2056efa714
Add scheduler for sending scheduled activities to the queue
2019-04-06 23:56:29 +03:00
fc92a0fd8d
Added limits and media attachments for scheduled activities.
2019-04-06 23:55:58 +03:00
9aeac7dcca
Merge branch 'feature/prometheus' into 'develop'
...
Upstream: Metrics and debugging
See merge request pleroma/pleroma!1020
2019-04-06 14:51:46 +00:00
7410aee886
Merge develop to 770-add-emoji-tags
...
Merge conflict in test/web/mastodon_api/mastodon_api_controller_test.exs
2019-04-06 20:34:00 +07:00
f1712cd2f1
Use PleromaJobQueue in Pleroma.Web.Push
2019-04-05 19:38:44 +07:00
47a236f753
[ #923 ] OAuth consumer mode refactoring, new tests, tests adjustments, readme.
2019-04-05 15:12:02 +03:00
66e7b03372
Merge branch 'develop' into feature/prometheus
2019-04-04 15:39:42 -05:00
5564cd421d
Document Prometheus
2019-04-04 12:19:31 -05:00
cfa6e7289f
Improve Transmogrifier.upgrade_user_from_ap_id/2
2019-04-04 16:10:43 +07:00
d140738edf
second level of headertext change in doc
2019-04-02 20:36:36 +07:00
3465b7ba9a
syntax highlighting
2019-04-02 20:32:37 +07:00
9e0567ec52
Merge develop into feature/770-add-emoji-tags
2019-04-02 19:16:29 +07:00
08d64b977f
little changes and typos
2019-04-02 16:13:34 +07:00
Egor Kislitsyn
rinpatch
Sergey Suprunenko
kaniini
ilja
Alex S
Haelwenn (lanodan) Monnier
Ekaterina Vaartis
witches.live
Mark Felder
Hakurei Reimu
lain
Sadposter
feld
eugenijm
Maxim Filippov
William Pitcock
Quentin Rameau
Haelwenn
William Pearson
link0ff
lambda
Hakaba Hitoyo
succfemboi
Michael Loftis
Karen Konou
href
Alice
href
Ivan Tashkinov
scarlett
Ivan Tashkinov