dannypsnl/akkoma
1
0
Fork 0
forked from AkkomaGang/akkoma
Code Issues Pull requests Projects Releases Packages Wiki Activity
8780 commits 8 branches 75 tags 292 MiB
Commit graph

8780 commits

This branch
This branch
All branches
Author SHA1 Message Date
Haelwenn (lanodan) Monnier
ee57663d34
captcha_test.exs: Use the same testing logic in Kocaptcha and native 2020-02-24 01:27:16 +01:00
Ivan Tashkinov
0cf1d4fcd0 [#1560] Restricted AP- & OStatus-related routes for non-federating instances. 2020-02-22 19:48:41 +03:00
feld
1961a680ec Merge branch 'fix/missing-config-settings' into 'develop' 
Add missing invites_enabled and account_activation_required settings

See merge request pleroma/pleroma!2234
 2020-02-22 15:35:33 +00:00
Mark Felder
9fe60c3b9c Add missing invites_enabled and account_activation_required settings 2020-02-22 09:29:05 -06:00
lain
c05cbc47f9 Better advice for vacuuming after restoring. 2020-02-22 13:14:30 +00:00
Ivan Tashkinov
8f0ca19b9c Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation 
# Conflicts:
#	CHANGELOG.md
#	config/config.exs
 2020-02-22 09:31:43 +03:00
lain
114e7b764e Merge branch 'patch-1' into 'develop' 
added why doing a vacuum after restoring a backup is so important

See merge request pleroma/pleroma!2230
 2020-02-21 19:34:45 +00:00
Igeljäger
1ed485ec1d added why doing a vacuum after restoring a backup is so important 2020-02-21 15:30:52 +00:00
Haelwenn
292031f6dd Merge branch 'migration-fixes-20' into 'develop' 
Migrations: Make them not fail for old databases

See merge request pleroma/pleroma!2227
 2020-02-20 23:53:52 +00:00
Haelwenn
499d9405d5 Merge branch 'fix/gin-fuzzy' into 'develop' 
Improve GIN full text search performance

See merge request pleroma/pleroma!2228
 2020-02-20 23:52:45 +00:00
Haelwenn
c5570e0493 Merge branch 'single_emoji_reaction' into 'develop' 
Single emoji reaction

Closes #1578

See merge request pleroma/pleroma!2226
 2020-02-20 23:50:40 +00:00
Mark Felder
b6bb73f43e Apply database session parameter to improve GIN full text search 2020-02-20 15:34:10 -06:00
lain
2d5cf0f8cd Migrations: Make them not fail for old databases 2020-02-20 16:44:31 +01:00
Ivan Tashkinov
0d14c3f410 [#1505] Typo fix. 2020-02-20 15:18:28 +03:00
lain
3eddd9caa6 Merge branch 'require-signature' into 'develop' 
Add an option to require fetches to be signed

Closes #1444

See merge request pleroma/pleroma!2071
 2020-02-20 12:13:21 +00:00
lain
c69b04c490 Merge branch 'features/remote-follow-userpage-redirect' into 'develop' 
remote_follow_controller.ex: Redirect to the user page on success

Closes #1245

See merge request pleroma/pleroma!2123
 2020-02-20 12:04:29 +00:00
lain
d536a00d42 Merge branch 'docs_updating' into 'develop' 
DOCS Add OTP to updating.md

See merge request pleroma/pleroma!2108
 2020-02-20 12:03:21 +00:00
Ivan Tashkinov
0c65a8c3d0 Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation 
# Conflicts:
#	config/config.exs
 2020-02-20 15:00:48 +03:00
lain
e0b2de6385 Merge branch 'feature/new-registrations-digest' into 'develop' 
New users digest email

Closes #1514

See merge request pleroma/pleroma!2128
 2020-02-20 11:58:37 +00:00
Ivan Tashkinov
3432294657 [#1505] Fixed @spec for Queries.by_object_in_reply_to_id/3 2020-02-20 14:48:46 +03:00
lain
cf4ecffcea Merge branch 'tests-clear-config-tweaks' into 'develop' 
Tweaks to `clear_config` calls in tests

See merge request pleroma/pleroma!2209
 2020-02-20 11:36:48 +00:00
lain
3af6d3f8e2 Emoji Reactions: Add documentation 2020-02-19 17:17:05 +01:00
lain
314928333a Pleroma API: Add endpoint to get reaction information on a single emoji 2020-02-19 17:16:45 +01:00
feld
3b78695c98 Merge branch 'fix/mrf-sample-doc' into 'develop' 
Update MRF docs, make sample code actually compile

See merge request pleroma/pleroma!2210
 2020-02-18 21:03:01 +00:00
feld
53a7680c16 Merge branch 'develop' into 'fix/mrf-sample-doc' 
# Conflicts:
#   docs/configuration/mrf.md
 2020-02-18 20:58:15 +00:00
feld
3416948cdf Merge branch 'fix/mrf-docs' into 'develop' 
Fix MRF documentation

See merge request pleroma/pleroma!2187
 2020-02-18 20:57:23 +00:00
feld
264d18be32 Merge branch 'chore/config-descriptions' into 'develop' 
Additional config description improvements

See merge request pleroma/pleroma!2207
 2020-02-18 20:45:31 +00:00
lain
cf8307e71c Merge branch 'fix/status-view/expires_at' into 'develop' 
Fix `status.expires_at` type

Closes #1573

See merge request pleroma/pleroma!2222
 2020-02-18 14:56:59 +00:00
Ivan Tashkinov
226f4d5ef9 Merge remote-tracking branch 'remotes/origin/develop' into tests-clear-config-tweaks 
# Conflicts:
#	test/web/admin_api/admin_api_controller_test.exs
 2020-02-18 17:52:31 +03:00
Ivan Tashkinov
61d9f43e46 Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation 2020-02-18 17:46:09 +03:00
lain
3fa2ac68df Merge branch 'chore/standardize-mrf-behavior' into 'develop' 
Standardize @behaviour usage in MRFs

See merge request pleroma/pleroma!2212
 2020-02-18 14:36:10 +00:00
lain
c07efd5b42 Merge branch 'need-reboot-flag' into 'develop' 
need_reboot flag for adminFE

See merge request pleroma/pleroma!2188
 2020-02-18 14:32:03 +00:00
Egor Kislitsyn
ca7ac068f0
Add a test 2020-02-18 17:09:50 +04:00
lain
fb6c2576dc Merge branch 'chore/floki-update' into 'develop' 
Update floki to 0.25

See merge request pleroma/pleroma!2217
 2020-02-18 13:09:37 +00:00
Egor Kislitsyn
2ef70b55f5
Fix status.expires_at type 2020-02-18 14:52:11 +04:00
feld
962eb8d4ac Merge branch 'update/admin-fe-20200217' into 'develop' 
Update adminFE build

See merge request pleroma/pleroma!2221
 2020-02-17 22:22:53 +00:00
Mark Felder
6a97c1b9ff Update adminFE build 2020-02-17 15:50:45 -06:00
Mark Felder
81cc9dd085 Merge branch 'develop' into chore/floki-update 2020-02-17 14:13:05 -06:00
rinpatch
5178c8dbc3 Merge branch 'upgrade_crypto' into 'develop' 
Update plug_crypto

See merge request pleroma/pleroma!2219
 2020-02-17 11:13:37 +00:00
lain
7df13e6f3a Update plug_crypto 2020-02-17 11:41:14 +01:00
rinpatch
02809dc276 Merge branch 'feat/git-attributes-elixir' into 'develop' 
.gitattributes: use native support for elixir definitions

See merge request pleroma/pleroma!2218
 2020-02-17 10:34:32 +00:00
rinpatch
b4b472d782 .gitattributes: use native support for elixir definitions 
see https://github.com/elixir-lang/elixir/pull/9823
 2020-02-17 13:27:28 +03:00
rinpatch
472132215e Use floki's new APIs for parsing fragments 2020-02-16 01:55:26 +03:00
Ivan Tashkinov
269d592181 [#1505] Restricted max thread distance for fetching replies on incoming federation (in addition to reply-to depth restriction). 2020-02-15 20:41:38 +03:00
lain
0b5a2bbe5b Merge branch 'bugfix/link-preview-site_name' into 'develop' 
MastodonAPI.StatusView: Do not use site_name

See merge request pleroma/pleroma!2216
 2020-02-15 12:56:32 +00:00
Haelwenn (lanodan) Monnier
1257331291
MastodonAPI.StatusView: Do not use site_name 
site_name allow to spoof the origin of the domain and so hacks like:

<!-- served on https://hacktivis.me/tmp/joinmastodon.org.html -->
<meta property="og:image" content="https://hacktivis.me/datalove/img/meme/pleroma/mastodon%2C%20forbidden%20amuse%20yourself.jpeg" />
<meta property="og:title" content="Mastodon: Forbidden Amuse Yourself" />
<meta property="og:site_name" content="joinmastodon.org" />
<meta http-equiv="refresh" content="0; url=http://joinmastodon.org/">
 2020-02-15 00:36:09 +01:00
rinpatch
631eed8799 Merge branch 'chores/deps-to-hexpm' into 'develop' 
Move ex_syslogger & recon to hexpm, update dependencies

See merge request pleroma/pleroma!2213
 2020-02-14 18:25:54 +00:00
Haelwenn (lanodan) Monnier
a4a90ae422
Update all dependencies 
Upgraded:
  db_connection 2.2.0 => 2.2.1
  earmark 1.4.2 => 1.4.3
  ecto 3.3.1 => 3.3.3
  ecto_sql 3.3.2 => 3.3.4
  esshd 0.1.0 => 0.1.1
  ex_doc 0.21.2 => 0.21.3
  excoveralls 0.12.1 => 0.12.2
  gettext 0.17.1 => 0.17.4
  html_entities 0.5.0 => 0.5.1
  httpoison 1.6.1 => 1.6.2
  joken 2.1.0 => 2.2.0
  jose 1.9.0 => 1.10.1
  nimble_parsec 0.5.1 => 0.5.3
  phoenix 1.4.10 => 1.4.13
  phoenix_ecto 4.0.0 => 4.1.0
  phoenix_html 2.13.3 => 2.14.0
  plug_cowboy 2.1.0 => 2.1.2
  plug_crypto 1.1.0 => 1.1.1
  prometheus 4.4.1 => 4.5.0
  tesla 1.3.0 => 1.3.2
 2020-02-14 19:16:22 +01:00
Haelwenn (lanodan) Monnier
04139c28fe
mix.exs: Move ex_syslogger and recon to hexpm 2020-02-14 19:09:41 +01:00
Haelwenn
5fcee577f9 Merge branch 'update/ferd/recon' into 'develop' 
Update ferd/recon

See merge request pleroma/pleroma!2211
 2020-02-14 17:58:26 +00:00