moon
/
honkoma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,924 Commits 2 Branches 0 Tags 201 MiB
Commit Graph

368 Commits

Author SHA1 Message Date
kaniini e4babb1c9f Merge branch 'explicit-addressing' into 'develop' 
Explicit addressing

See merge request pleroma/pleroma!1239
 2019-06-05 08:28:20 +00:00
Egor Kislitsyn 6ba9055b51 Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists 2019-06-05 12:54:30 +07:00
Maksim Pechnikov 96121315f3 fix merge 2019-06-04 12:41:24 +03:00
Egor Kislitsyn 9ce928d823 Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists 2019-06-04 16:28:23 +07:00
lain 4cab98b7bf Merge remote-tracking branch 'origin/develop' into explicit-addressing 2019-06-04 11:23:46 +02:00
lain 25198d48f7 Docs: Add Explicit addressing to Readme and changelog. 2019-06-04 10:49:57 +02:00
Maksim Pechnikov 4f2e359687 Merge branch 'develop' into issue/941 2019-06-04 09:49:08 +03:00
kaniini 9f0d0d0805 Merge branch 'feature/mrf-subchain' into 'develop' 
MRF: subchain policy

See merge request pleroma/pleroma!1233
 2019-06-04 05:49:54 +00:00
kaniini 9d2563a3de Merge branch 'generic-fe-settings' into 'develop' 
Generic settings store for frontend user settings

See merge request pleroma/pleroma!1221
 2019-06-04 05:43:43 +00:00
kaniini a536f515dd Merge branch 'ueberauth_config_extension' into 'develop' 
Ueberauth: extended format of OAUTH_CONSUMER_STRATEGIES to allow explicit dependency specification

See merge request pleroma/pleroma!1234
 2019-06-04 05:42:49 +00:00
Maksim Pechnikov f13d6c7f78 update api to set skip_thread_containment 2019-06-03 21:02:57 +03:00
Maksim Pechnikov 080e1aa70e add option skip_thread_containment 2019-06-03 16:13:37 +03:00
rinpatch 026b245dbc Merge branch 'develop' into feature/polls-2-electric-boogalo 2019-06-03 11:14:52 +03:00
Ivan Tashkinov 83663caa81 Ueberauth: extended format of OAUTH_CONSUMER_STRATEGIES to allow explicit dependency specification. 2019-06-02 17:45:32 +03:00
William Pitcock c724d8df98 docs: document mrf_subchain 2019-06-02 10:14:56 +00:00
rinpatch 65db5e9f52 Resolve merge conflicts 2019-06-01 16:29:58 +03:00
Haelwenn (lanodan) Monnier 5d3ece2861
Remove now useless flavours switching 2019-06-01 01:44:10 +02:00
lain 10fe02acef Documentation: Document Settings store mechanism. 2019-05-31 14:59:24 +02:00
feld 88414151b4 Formatting 2019-05-30 21:35:31 +00:00
feld 75a37a68d4 Install docs should clone from master branch 2019-05-30 21:30:42 +00:00
Egor Kislitsyn f333041a0a Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists 2019-05-24 21:05:57 +07:00
kaniini 75e78d4e23 Merge branch 'feature/mrf-user-filter' into 'develop' 
mrf: add support for filtering users

See merge request pleroma/pleroma!1188
 2019-05-22 19:03:14 +00:00
kaniini f0516d9114 Merge branch 'ssh-fixes' into 'develop' 
Ssh fixes

Closes #869 and #925

See merge request pleroma/pleroma!1191
 2019-05-22 18:57:34 +00:00
William Pitcock 7d9b33b3ce update documentation for the new MRF features [no-ci] 2019-05-22 18:53:30 +00:00
Maksim 620908a2db [#699] add worker to clean expired oauth tokens 2019-05-22 15:44:50 +00:00
lambda 714d8d4ef9 Merge branch 'feature/object-pruning' into 'develop' 
Object pruning

See merge request pleroma/pleroma!1181
 2019-05-22 11:04:30 +00:00
lain b22145cbc4 Documentation: Specify PEM format for SSH keys. 
Otherwise openssh-client 7.9 will generate a different format that can't be used
by esshd.
 2019-05-22 10:44:26 +02:00
kaniini 79c2cef2fb Merge branch 'mongooseim-support' into 'develop' 
MongooseIM: Add basic integration endpoints.

See merge request pleroma/pleroma!1172
 2019-05-22 04:06:54 +00:00
William Pitcock 16b260fb19 add mix task to prune the object database using a configured retention period 2019-05-21 21:38:56 +00:00
lain d378b342ba MongooseIM: Add documentation. 2019-05-21 18:57:36 +02:00
rinpatch 76a7429bef Add poll limits to /api/v1/instance and initial state 2019-05-21 09:13:10 +03:00
kaniini 943d1b2f26 Merge branch 'feature/user-configurable-mascot' into 'develop' 
Feature: user configurable mascot

See merge request pleroma/pleroma!1177
 2019-05-20 18:17:42 +00:00
Aaron Tinio 5aa107d912 Document MRF.Simple :report_removal 2019-05-21 00:59:12 +08:00
Sadposter daeae8e2e7
Move default mascot configuration to `config/` 2019-05-20 16:12:55 +01:00
Sadposter 54e9cb5c2d
Add API endpoints for a custom user mascot 2019-05-20 12:39:23 +01:00
Egor Kislitsyn 557f0e33a7 Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists 2019-05-17 19:57:14 +07:00
lain 412a3d8a0f Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into rum-index 2019-05-17 12:26:59 +02:00
kaniini bf84d50c76 Merge branch 'feature/890-add-report-uri' into 'develop' 
Feature/890 add report uri

Closes #890

See merge request pleroma/pleroma!1164
 2019-05-16 20:11:12 +00:00
Sergey Suprunenko e2b3a27204 Add Reports to Admin API 2019-05-16 19:09:18 +00:00
Egor Kislitsyn fc7246d715 Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists 2019-05-16 17:54:24 +07:00
Alex S 8355d0607e trailing spaces 2019-05-16 17:03:12 +07:00
Alex S 9d14214eb9 Merge branch 'develop' into feature/890-add-report-uri 2019-05-16 12:54:06 +07:00
Alex S aa11fa4864 add report uri and report to 2019-05-16 12:49:40 +07:00
kaniini a2771869a3 Merge branch 'docs/update_debian_instructions' into 'develop' 
Added package to dependency list documentation

See merge request pleroma/pleroma!1161
 2019-05-16 05:03:37 +00:00
Angelina Filippova 107c83ab2b Note that nicknames is an array 2019-05-16 01:48:53 +03:00
Angelina Filippova 0641e685c1 Note that nicknames is an array 2019-05-16 01:46:43 +03:00
Angelina Filippova 1d2923e5d0 Update tag/untag docs 2019-05-16 01:36:26 +03:00
PolymerWitch 0ae15c2306 Added package to dependency list 
Added the erlang-ssh package to the dependency list and the installation
command instructions. The project wouldn't build otherwise.
 2019-05-15 15:36:20 -07:00
lain f1e67bdc31 Search: Add optional rum indexing / searching. 2019-05-15 15:28:01 +02:00
Egor Kislitsyn a7a8f3bc2c Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists 2019-05-15 14:31:24 +07:00
Egor Kislitsyn fc9b4410c4 Add documentation 2019-05-14 20:27:40 +07:00
Egor Kislitsyn 5e2b491276 Merge remote-tracking branch 'pleroma/develop' into feature/disable-account 2019-05-14 18:15:56 +07:00
Alexander Strizhakov a2be420f94 differences_in_mastoapi_responses.md: fullname & bio are optionnal 
[ci skip]
 2019-05-13 18:35:45 +00:00
Sachin Joshi f01f995816 make url uniform in admin api 2019-05-11 14:46:00 +05:45
Alexander Strizhakov bfeb33e951 Merge develop 
Merge conflict in lib/pleroma/activity.ex
 2019-05-08 14:34:36 +00:00
Egor Kislitsyn 1557b99beb Merge remote-tracking branch 'pleroma/develop' into feature/disable-account 2019-05-07 16:51:11 +07:00
Alex S f46295faa7 unused config paramater 2019-05-07 09:07:06 +07:00
Maksim 1040caf096 fix format 
Modified-by: Maksim Pechnikov <parallel588@gmail.com>
 2019-05-06 17:51:03 +00:00
lambda aacac9da0b Merge branch 'feature/bbs' into 'develop' 
BBS / SSH

See merge request pleroma/pleroma!997
 2019-05-06 17:17:03 +00:00
Alexander Strizhakov ce6ca0fefe Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into feature/845-improve-status-deletion 2019-05-06 16:45:22 +00:00
lain 6ad8ddfd29 Merge remote-tracking branch 'origin/develop' into feature/bbs 2019-05-04 15:00:45 +02:00
xse 2982061dfa Fix syntax highlighting + clarify :frontend_configuration 2019-05-01 01:26:14 +02:00
rinpatch ce3789e39a Add default_scope to /api/v1/update_credentials 2019-04-27 23:55:54 +03:00
kaniini 48f68fd133 Merge branch 'feature/mastoapi-new-config' into 'develop' 
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

See merge request pleroma/pleroma!1093
 2019-04-26 02:41:35 +00:00
Mark Felder 24c3e2db2c Add mediaproxy whitelist capability 2019-04-25 18:11:47 -05:00
rinpatch dfc8425659 Move settings to Source subentity 2019-04-25 10:31:14 +03:00
Egor Kislitsyn c157e27a00 Merge branch 'develop' into feature/disable-account 2019-04-25 13:41:10 +07:00
rinpatch 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
Sergey Suprunenko 9dd36e5bcb Extend Mastodon API with public endpoint for getting Favorites timeline of any user (#789) 2019-04-23 02:47:43 +00:00
kaniini 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
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
rinpatch f60d072bbb Add `pleroma.in_reply_to_account_acct` to MastoAPI status entity 2019-04-22 11:54:27 +03:00
Alexander Strizhakov 88f0be9693 Feature/826 healthcheck endpoint 2019-04-22 07:19:53 +00:00
Egor Kislitsyn e8c2f9a73a Merge remote-tracking branch 'pleroma/develop' into feature/disable-account 2019-04-22 13:08:30 +07: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
witches.live 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
Egor Kislitsyn 38926a063a add `/api/pleroma/disable_account` to `docs/api/pleroma_api.md` 2019-04-15 16:39:42 +07: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
feld 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
lain 3fc4ea45df BBS: Add documentation. 2019-03-31 18:14:51 +02: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
rinpatch d0026761b7 cringe 2019-03-28 20:13:22 +03:00
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
 2019-03-28 19:46:30 +03:00
eugenijm cd90695a34 Add PUT /api/pleroma/notification_settings endpoint 2019-03-28 18:55:16 +03:00
eugenijm 10c81fc902 Add user show endpoint for Pleroma admin API 2019-03-27 21:44:15 +03:00
Maxim Filippov 3cf7539bca Add more user filters + move search to its own module 2019-03-27 03:51:59 +05:00
kaniini 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
William Pitcock ae8fa5d0aa docs: document `conversation_id` extension 2019-03-21 23:27:42 +00:00
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.
 2019-03-21 19:59:43 +03:00
lain 8468f3f6d4 Add safe dm mode option. 2019-03-20 21:09:36 +01:00
Mark Felder 325c106cb5 Document additional pleroma changes to /api/v1/accounts/:id 2019-03-18 19:48:56 +00:00
eugenijm 9971bf5be1 Added documentation for Pleroma-specific is_seen in Mastodon API 2019-03-18 10:40:10 +03:00
eugenijm 43fb03be5a Allow to mark a single notification as read 2019-03-15 23:56:14 +03:00
kaniini 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
Haelwenn (lanodan) Monnier f5b54acc81
Fix headers and add !929 docs to extras 
[ci skip]
 2019-03-15 10:58:15 +01:00
Haelwenn 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
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