Commit graph

5807 commits

Author SHA1 Message Date
Mark Felder
97d2b1a45a Only run Floki if title is missing from the map 2019-06-12 18:27:35 -05:00
Mark Felder
097fdf6a5d Attempt to use <title> from HTML as a fallback 2019-06-12 17:56:51 -05:00
Ivan Tashkinov
4b2c29016c [#963] No redirect on OOB OAuth authorize request with existing authorization. OAuth-related refactoring. 2019-06-12 21:30:06 +03:00
lain
966543379d MastodonAPI Controller: Band-Aid double vote problem. 2019-06-12 16:36:23 +02:00
sadposter
4cda6ed358 change panel 2019-06-12 15:34:27 +01:00
sadposter
922c25d9c7 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop 2019-06-12 13:19:24 +01:00
lain
822a9f28d0 Merge branch 'release-config-import' into 'develop'
Import release config from env variable or /etc/pleroma/config.exs and warn if the file is missing

See merge request pleroma/pleroma!1269
2019-06-12 09:58:16 +00:00
lain
4265608097 Merge branch 'chore/tagpolicy_docs' into 'develop'
Document TagPolicy in `rewrite_policy` section

See merge request pleroma/pleroma!1271
2019-06-12 09:52:55 +00:00
lain
f46c628e6b Merge branch 'update_auto_linker' into 'develop'
Update `auto_linker` dependency

See merge request pleroma/pleroma!1272
2019-06-12 09:52:29 +00:00
lain
c5acc023a7 Merge branch 'remove-search-result-order' into 'develop'
Remove search result order for non-RUM indexes

Closes #940

See merge request pleroma/pleroma!1273
2019-06-12 09:51:54 +00:00
Egor Kislitsyn
817c66bc3e Remove search result order for non-RUM indexes 2019-06-12 16:22:56 +07:00
Egor Kislitsyn
bf22ed5fbd Update auto_linker dependency 2019-06-12 15:53:33 +07:00
rinpatch
ced59be1ae Document TagPolicy in rewrite_policy section 2019-06-11 22:15:28 +03:00
kaniini
23db6774cf Merge branch 'improve-local-content-limit' into 'develop'
Add option to restrict all users to local content

See merge request pleroma/pleroma!1268
2019-06-11 17:30:13 +00:00
rinpatch
f0d96534a4 Import release config from env variable or /etc/pleroma/config.exs and
warn if the file is missing
2019-06-11 18:55:55 +03:00
Egor Kislitsyn
6f29865d43 Add option to restrict all users to local content 2019-06-11 21:25:53 +07:00
lain
3235923276 Merge branch 'better-default-parameters-for-suggestion' into 'develop'
Better default parameters for suggestion

See merge request pleroma/pleroma!1265
2019-06-11 11:34:23 +00:00
5d5a9a3a35 Better default parameters for suggestion 2019-06-11 11:34:22 +00:00
lain
63ab3c30eb Merge branch 'feature/rate-limiter' into 'develop'
Feature/Rate Limiter

Closes #943

See merge request pleroma/pleroma!1266
2019-06-11 11:32:01 +00:00
lain
3e3dcd223d Merge branch 'update-plug' into 'develop'
Update `plug` dependency

Closes #655

See merge request pleroma/pleroma!1267
2019-06-11 10:24:01 +00:00
Egor Kislitsyn
581d8d3035 Update plug dependency 2019-06-11 16:50:35 +07:00
Egor Kislitsyn
7c063a898d Update ex_rated dependency 2019-06-11 16:25:47 +07:00
Egor Kislitsyn
ad04d12de6 Replace MastodonAPIController.account_register/2 rate limiter 2019-06-11 16:06:03 +07:00
Egor Kislitsyn
f26013cf2e Update CHANGELOG 2019-06-11 14:36:51 +07:00
Egor Kislitsyn
bc8f059367 Add rate limiting for search endpoints 2019-06-11 14:28:39 +07:00
Egor Kislitsyn
2e5affce61 Add RateLimiter 2019-06-11 14:27:41 +07:00
kaniini
e343e4ff91 Merge branch 'change-containment-default' into 'develop'
Configuration: Skip thread containment by default

See merge request pleroma/pleroma!1256
2019-06-11 02:38:13 +00:00
kaniini
f2d72b1fe4 Merge branch 'preload-changes' into 'develop'
Conversations: Fetch users in one query.

See merge request pleroma/pleroma!1258
2019-06-11 02:37:08 +00:00
lain
70edcd1386 Merge branch 'fix/warnings-in-migration' into 'develop'
Remove unused imports and aliases from migration

Closes #964

See merge request pleroma/pleroma!1263
2019-06-10 13:20:37 +00:00
Sergey Suprunenko
a7d956d383 Remove unused imports and aliases from migration 2019-06-10 13:20:37 +00:00
lain
8fd68b8039 Merge branch 'feature/releases' into 'develop'
Releases

See merge request pleroma/pleroma!1261
2019-06-10 13:03:48 +00:00
lain
dbe4c2b7c8 Update pleroma_ctl 2019-06-10 11:47:22 +00:00
lain
3d7bb47124 Merge branch 'issue/media-proxy-whitelist' into 'develop'
Add more tests for using media_proxy and whitelists

See merge request pleroma/pleroma!1262
2019-06-10 11:34:11 +00:00
Sergey Suprunenko
365268d522 Add more tests for using media_proxy and whitelists 2019-06-10 11:34:11 +00:00
rinpatch
cfcc0c8776 Add a changelog entry for releases 2019-06-09 13:56:41 +03:00
rinpatch
3ecfe2a6d4 Merge branch 'develop' into feature/releases 2019-06-09 13:55:32 +03:00
rinpatch
bf391569cf specify that a version is needed for rollback 2019-06-09 13:34:58 +03:00
rinpatch
2a659b35f1 Add migrate/rollback to release tasks 2019-06-09 13:33:44 +03:00
rinpatch
b6d2db42a7 Fix wrong placement of serve_endpoints 2019-06-08 21:27:39 +03:00
rinpatch
7223c1b643 Use Mix.shell().yes? if available 2019-06-08 20:10:48 +03:00
lain
b9544d565d Merge branch 'prod-loglevel-warn' into 'develop'
Set default loglevel to `warn` in prod

Closes #962

See merge request pleroma/pleroma!1260
2019-06-08 16:05:10 +00:00
rinpatch
4f5149c93b Set default loglevel to warn in prod
It's rare that info logs are needed to debug the issue, so I would
suggest setting them to warn in prod by default to make finding the
relevant parts easier and potentially even decrease cpu usage on bigger
instances

Closes #962
2019-06-08 18:02:57 +03:00
rinpatch
d7ec0898e5 Make mix tasks work in a release 2019-06-08 17:40:40 +03:00
rinpatch
4b98a7ce4e Set serve_endpoints to true in prod config as setting it in runtime
config would cause issues with mix tasks
2019-06-08 17:17:28 +03:00
rinpatch
c47dc0de2c Load ex_syslog and copy pleroma_ctl 2019-06-08 17:17:10 +03:00
rinpatch
3d374bf7df Basic release skeleton 2019-06-08 17:16:15 +03:00
lain
1e0fa899b6 Merge branch 'fix/transmogrifier-inReplyTo' into 'develop'
Transmogrifier: Do not crash if inReplyTo does not exist and can't be fetched

See merge request pleroma/pleroma!1259
2019-06-08 10:22:15 +00:00
rinpatch
d7f4f65560 Merge branch 'bugfix/959-emoji-loading' into 'develop'
Emoji: Use full path to check if a file is a directory.

Closes #959

See merge request pleroma/pleroma!1257
2019-06-08 10:10:34 +00:00
rinpatch
dffc9f060a replace missing mock with a 404 2019-06-07 20:48:25 +03:00
rinpatch
d020f68e87 Transmogrifier: Do not crash if inReplyTo does not exist and can't be fetched 2019-06-07 20:40:38 +03:00