fedward/distraction.party
1
0
Fork 0
forked from AkkomaGang/akkoma
Code Issues Pull requests Projects Releases Packages Wiki Activity
5967 commits 4 branches 73 tags 298 MiB
Commit graph

379 commits

Author SHA1 Message Date
rinpatch
d7a34b604b Extend MastoAPI to provide attachment mimetypes 2019-03-15 11:58:12 +03:00
kaniini
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
William Pearson
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
rinpatch
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
rinpatch
e2fe796c63 Add some tests 2019-03-14 22:02:48 +03:00
link0ff
54e7087ab4 Merge remote-tracking branch 'upstream/develop' into feature/openldap-support 2019-03-14 17:43:30 +02:00
link0ff
9338f061a3 Support LDAP method start_tls 2019-03-12 18:20:02 +02:00
lain
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
lambda
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
lambda
66774b5567 Update Differences-in-MastodonAPI-Responses.md 2019-03-11 13:21:03 +00:00
lain
4811eefa6e MastoAPI StatusView: Add locality indicator. 2019-03-11 13:48:27 +01:00
rinpatch
6caa500cf1 Change order of source code to align with platforms 2019-03-11 08:36:56 +03:00
rinpatch
85632a38f9 Update homepages and provide source code links for Roma apps in Clients.md 2019-03-11 08:33:57 +03:00
Hakaba Hitoyo
4826c06172 Rename Mastalab -> Fedilab in Clients.md 2019-03-11 01:40:34 +00:00
kaniini
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
Ekaterina Vaartis
5021b7836f Fetch user's outbox posts on first federation with that user 2019-03-08 16:27:56 +03:00
kaniini
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
Maxim Filippov
76160122f6 Keep heading short 2019-03-06 05:01:38 +03:00
Haelwenn (lanodan) Monnier
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
Maxim Filippov
2d30fc279f Typo 2019-03-05 02:11:15 +03:00
Maxim Filippov
02359d686c local -> only_local 2019-03-04 21:36:47 +03:00
Maxim Filippov
e34710b988 Format & update docs 2019-03-04 21:33:53 +03:00
link0ff
88a672fe88 Move LDAP code to LDAPAuthenticator. Use Authenticator for token_exchange with grant_type as well 2019-03-03 21:20:36 +02:00
link0ff
19e2b85247 Merge remote-tracking branch 'upstream/develop' into feature/openldap-support 2019-03-03 18:29:37 +02:00
kaniini
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
Maxim Filippov
08c6aeeed7 Add docs 2019-03-02 17:32:46 +03:00
Maxim Filippov
5b08b470f6 Add "local" params to users search 2019-03-01 20:13:02 +03:00
Maxim Filippov
adac745512 Add docs to /users/search 2019-03-01 17:34:14 +03:00
lain
c4235f96bd Add with_muted param. 2019-02-27 16:37:42 +01:00
Maxim Filippov
ed7fd6b47e Add missing docs and tests 2019-02-27 03:08:03 +03:00
Egor
c3ac9424d2 AutoLinker 2019-02-26 23:32:26 +00:00
link0ff
e278d47023 OpenLDAP support 2019-02-22 15:03:43 +02:00
Egor
bff9eb5ef7 Reports 2019-02-20 16:51:25 +00:00
eugenijm
25b9e7a8c3 Added admin API for changing user activation status 2019-02-19 19:37:02 +03:00
kaniini
833161b5d2 Merge branch 'feature/jobs' into 'develop' 
Job Queue

See merge request pleroma/pleroma!732
 2019-02-18 19:43:06 +00:00
kaniini
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
lambda
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
lambda
6a8a8e90da Update Differences-in-MastodonAPI-Responses.md 2019-02-17 17:01:22 +00:00
Haelwenn (lanodan) Monnier
4df455f69b
[MastoAPI] Add switching of frontend flavours 2019-02-16 19:50:13 +01:00
rinpatch
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
rinpatch
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
lain
27375e5575 WelcomeMessage: specify that the user has to be local. 2019-02-16 17:25:06 +01:00
lain
d812a347ca Add optional welcome message. 2019-02-16 16:42:34 +01:00
Hakaba Hitoyo
16b7c07115 Mark streaming feature for desktop apps in Clients.md 2019-02-13 07:51:14 +00:00
Hakaba Hitoyo
84f22d1cb8 Mark streaming feature for mobile/web apps in Clients.md 2019-02-12 02:35:15 +00:00
Egor Kislitsyn
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
succfemboi
db407e4d50
add feather to webclients 2019-02-10 16:18:04 +01:00
Haelwenn (lanodan) Monnier
94385313b5
docs/Clients.md: Add Nekonium 
[ci skip]
 2019-02-10 14:42:32 +01:00
Haelwenn (lanodan) Monnier
daa25f3403
docs/Clients.md: Add Twidere, Remove SubwayTooter, sort alphabetically 
[ci skip]
 2019-02-10 14:32:42 +01:00
Haelwenn (lanodan) Monnier
f2d5989ffa
docs/Clients.md: Add Social (GNOME) 
[ci skip]
 2019-02-10 14:32:42 +01:00
Haelwenn (lanodan) Monnier
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
Haelwenn (lanodan) Monnier
5f767be331
docs/Clients.md: Add Brutaldon, Sengi, Halcyon, Pinafore 2019-02-10 14:32:42 +01:00
Haelwenn (lanodan) Monnier
d0cf58d032
WIP: docs/Clients.md: Add documentation about clients supporting pleroma 
[ci skip]
 2019-02-10 14:32:42 +01:00
rinpatch
9a23f8f3ea Add tests and fix a typo in docs 2019-02-08 20:23:26 +03:00
rinpatch
38ff9b3568 fix typo in config.md 2019-02-08 15:12:44 +03:00
rinpatch
6c21f5aa16 Merge branch 'develop' into feature/keyword-policy 2019-02-08 13:12:33 +03:00
rinpatch
8a0b755c19 rename ftl_removal to federated_timeline_removal to keep consistent naming with SimplePolicy 2019-02-08 13:12:09 +03:00
rinpatch
46aa8c18a2 Add keyword policy 2019-02-08 12:38:24 +03:00
Michael Loftis
ab80c8ebb8 adds a couple of explicit examples for ExSyslogger 2019-02-06 17:54:30 +00:00
Egor Kislitsyn
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
rinpatch
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
Karen Konou
e10cda7541 implemented tweaks 2019-02-03 22:46:06 +01:00
Karen Konou
10130fa7d6 made toggleable, added docs 2019-02-03 20:27:28 +01:00
Mark Felder
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
href
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
Haelwenn
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
Haelwenn (lanodan) Monnier
a7c55c61bb
docs/Pleroma-API.md: Add missing token field documentation 
[ci skip]
 2019-01-31 23:23:53 +01:00
kaniini
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
rinpatch
7057891db6 Make rich media support toggleable 2019-01-31 18:18:20 +03:00
Alice
a0dc95d084 Clarify the description of the logo_mask configuration key. 2019-01-31 13:14:22 +00:00
Egor Kislitsyn
d3677d2b4d Merge remote-tracking branch 'MAIN/develop' into feature/jobs 2019-01-31 15:07:49 +07:00
kaniini
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
href
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
Haelwenn (lanodan) Monnier
7db517ff06
docs/config.md: Fix syntax, pleroma_fe isn’t an atom 2019-01-30 11:51:12 +01:00
Haelwenn (lanodan) Monnier
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
Haelwenn (lanodan) Monnier
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
kaniini
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
Egor Kislitsyn
55affbca7f add a job queue 2019-01-28 22:17:17 +07:00
Ivan Tashkinov
d3f9e6f6fe [#534] Merged upstream/develop. 2019-01-28 15:39:14 +03:00
lain
bcc559e4e6 Update config.md 2019-01-28 13:06:28 +01:00
Haelwenn (lanodan) Monnier
37520e1e79
docs/Pleroma-API.md: Add note about emoji endpoints similarities 
[ci skip]
 2019-01-27 14:31:07 +01:00
Ivan Tashkinov
656ed7c84a [#534] Configurable outgoing federation reachability timeout. 2019-01-25 15:10:21 +03:00
lain
e221c681dc New frontend configuration mechanism. 2019-01-23 12:40:57 +01:00
rinpatch
74346a7035 Fix merge conflict 2019-01-18 18:31:25 +03:00
Mark Felder
8c368d42a2 Make attachment links configurable 
Thanks @href!
 2019-01-17 15:48:14 +00:00
rinpatch
4d5f15cd42 Introduce optional unfurling of nsfw content 2019-01-17 11:00:02 +03:00
rinpatch
bfe2a11a6b Add config doc 2019-01-16 10:45:56 +03:00
scarlett
9eba6b96dc Fix spellign. 2019-01-11 09:55:33 +00:00
Egor Kislitsyn
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
Egor Kislitsyn
0c750bc432 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/pinned-posts 2019-01-08 16:32:07 +07:00
Egor Kislitsyn
6428ef77ad add default configuration for the pinned statuses and some doc 2019-01-08 16:11:03 +07:00
lain
0fae04c4e3 Add a setting for users to autofollow on sign up. 2019-01-08 09:57:53 +01:00
Haelwenn (lanodan) Monnier
c9b99d4486
config/config.exs: Add syslog backends 2019-01-06 01:11:53 +01:00
rinpatch
b73a1a33de Merge branch 'captcha' into 'develop' 
Make captcha (kocaptcha) stateless

See merge request pleroma/pleroma!585
 2019-01-03 17:04:27 +00:00
lain
1a0391c8a4 Add documentation. 2019-01-01 17:40:42 +01:00
Haelwenn (lanodan) Monnier
286632dfa2
Add docs/Admin-API.md 
[ci skip]
 2018-12-31 12:27:46 +01:00
lain
5811e65e67 Add some hard limits on inserted activities. 2018-12-26 12:39:35 +01:00
Karen Konou
c76179419d Renamed the things 2018-12-23 11:14:29 +01:00
Karen Konou
c92f91ffeb Add documentation 2018-12-23 10:41:56 +01:00
Ekaterina Vaartis
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
kaniini
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
kaniini
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
rinpatch
d6b133ec51
Pleroma-API.md: Additionnal endpoints 2018-12-18 18:33:39 +01:00
Haelwenn (lanodan) Monnier
6adea5a7b2
Move to docs 2018-12-18 17:16:26 +01:00
rinpatch
4a6855d9ee Provide plaintext representations of content/cw in MastoAPI 2017-01-01 03:10:08 +03:00
Egor Kislitsyn
9abf832b03 Merge remote-tracking branch 'pleroma/develop' into use-jobs-in-webpush 2019-04-08 18:48:10 +07:00
lambda
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
lambda
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
lambda
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
Egor Kislitsyn
c3d5c3513a Merge remote-tracking branch 'pleroma/develop' into use-jobs-in-webpush 2019-04-08 16:46:59 +07:00
Egor Kislitsyn
a1a854646e Merge branch 'develop' into use-jobs-in-webpush 2019-04-08 16:29:20 +07:00
Ivan Tashkinov
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
lambda
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
Ivan Tashkinov
e3328bc138 [#923] Removed <br> elements from auth forms, adjusted docs, minor auth settings refactoring. 2019-04-07 11:08:37 +03:00
eugenijm
2056efa714 Add scheduler for sending scheduled activities to the queue 2019-04-06 23:56:29 +03:00
eugenijm
fc92a0fd8d Added limits and media attachments for scheduled activities. 2019-04-06 23:55:58 +03:00
feld
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
Alex S
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
Egor Kislitsyn
f1712cd2f1 Use PleromaJobQueue in Pleroma.Web.Push 2019-04-05 19:38:44 +07:00
Ivan Tashkinov
47a236f753 [#923] OAuth consumer mode refactoring, new tests, tests adjustments, readme. 2019-04-05 15:12:02 +03:00
Mark Felder
66e7b03372 Merge branch 'develop' into feature/prometheus 2019-04-04 15:39:42 -05:00
Mark Felder
5564cd421d Document Prometheus 2019-04-04 12:19:31 -05:00
Egor Kislitsyn
cfa6e7289f Improve Transmogrifier.upgrade_user_from_ap_id/2 2019-04-04 16:10:43 +07:00
Alex S
d140738edf second level of headertext change in doc 2019-04-02 20:36:36 +07:00
Alex S
3465b7ba9a syntax highlighting 2019-04-02 20:32:37 +07:00
Alex S
9e0567ec52 Merge develop into feature/770-add-emoji-tags 2019-04-02 19:16:29 +07:00
Alex S
08d64b977f little changes and typos 2019-04-02 16:13:34 +07:00
Alex S
851c5bf093 updating custom_emoji docs 2019-04-02 15:57:57 +07:00
Alex S
3601f03147 Adding tag to emoji ets table 
changes in apis
 2019-04-01 17:17:57 +07:00