Anon/pleroma
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
5,761 Commits 1 Branch 0 Tags 222 MiB
6d0ae264fc
Commit Graph

5761 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Egor Kislitsyn
ce823fa88e Fix rate limit test 2019-06-14 19:24:31 +07:00
lain
7f48b90bfb Merge branch 'fix/hashtag-rich-media' into 'develop' 
Fix hashtags being picked up by rich media parser

Closes #989

See merge request pleroma/pleroma!1288
 2019-06-14 11:52:04 +00:00
lain
a971b35785 Merge branch 'issues/948-account-search' into 'develop' 
[#948] /api/v1/account_search added optional parameters (limit, offset, following)

See merge request pleroma/pleroma!1270
 2019-06-14 11:39:57 +00:00
Maksim
ee4ed87fb4 [#948] /api/v1/account_search added optional parameters (limit, offset, following) 2019-06-14 11:39:57 +00:00
rinpatch
d0ebc0edf3 Fix hashtags being picked up by rich media parser 
Closes #989
 2019-06-14 14:34:42 +03:00
lain
f045d1437c Merge branch 'patch-2' into 'develop' 
Add copyright info to containment.ex

See merge request pleroma/pleroma!1286
 2019-06-14 09:42:04 +00:00
Egor
58a094b605 Add copyright info to containment.ex 2019-06-14 09:26:36 +00:00
lain
28cb9edde9 Merge branch '986-document-how-to-disable-rate-limiting' into 'develop' 
Resolve "Document how to disable rate limiting"

Closes #986

See merge request pleroma/pleroma!1285
 2019-06-14 09:26:26 +00:00
lain
774637a2f4 Mastodon API: Document changes. 2019-06-14 11:24:09 +02:00
lain
eac298083f MastodonAPI: Add a way to update the background image. 2019-06-14 11:19:22 +02:00
Egor Kislitsyn
b22b10d3aa Improve rate limiter documentation 
Documents how to disable rate limiting
 2019-06-14 15:02:10 +07:00
lain
00cc4880ce Merge branch 'feature/ci-release-build' into 'develop' 
CI: build otp releases for master and develop branches

See merge request pleroma/pleroma!1279
 2019-06-14 06:56:27 +00:00
lain
a1bbeef55c Merge branch 'release-move-out-application-dir' into 'develop' 
Set instance static/uploads to be outside of application directory in release config

See merge request pleroma/pleroma!1283
 2019-06-14 06:40:04 +00:00
rinpatch
ac3d43e620 Set instance static/uploads to be outside of application directory in release config 
In case of releases the application directory changes with each version
so the contents will not be accessible
 2019-06-14 01:42:56 +03:00
rinpatch
8fbe1a3b92 remove the feature branch from only 2019-06-13 22:31:15 +03:00
rinpatch
10c067cc47 Merge branch 'fix/pleroma-ctl-shellcheck' into 'develop' 
pleroma_ctl: fix == instead of = and double quote the path to prevent globing

See merge request pleroma/pleroma!1282
 2019-06-13 19:25:48 +00:00
rinpatch
0876ac05ba pleroma_ctl: fix == instead of = and double quote the path to prevent globing 2019-06-13 22:16:57 +03:00
rinpatch
bb6a421afc Merge branch 'develop' into feature/ci-release-build 2019-06-13 21:37:56 +03:00
rinpatch
da4af72180 Merge branch 'remove-prometheus-nif' into 'develop' 
Prometheus: Remove flaky process collection NIF.

See merge request pleroma/pleroma!1281
 2019-06-13 18:37:12 +00:00
lain
315f090f59 Prometheus: Remove flaky process collection NIF. 2019-06-13 20:30:04 +02:00
rinpatch
fc4a8026d8 Remove a TODO 2019-06-13 21:23:37 +03:00
lain
5965efb216 AccountView: Add user background. 2019-06-13 19:08:05 +02:00
rinpatch
6426aefb16 Expire artifacts in 42 years 2019-06-13 18:24:39 +03:00
lain
6f5a0cc14e Merge branch 'fix/ogp-title' into 'develop' 
Rich Media Parser: Attempt to use <title> from HTML as a fallback

Closes #979

See merge request pleroma/pleroma!1277
 2019-06-13 13:26:39 +00:00
feld
163fa180f5 Merge branch 'feld/pleroma-fix/ogp-title' into 'fix/ogp-title' 
Improve <title> fallback; Add a test

See merge request feld/pleroma!1
 2019-06-13 12:49:01 +00:00
rinpatch
e322c665e0 Merge branch 'develop' into feature/ci-release-build 2019-06-13 13:54:24 +03:00
rinpatch
8dff4c7194 CI: Add automatic release builds 2019-06-13 13:53:59 +03:00
lain
a2318e9dd6 Merge branch 'improve-410-handling' into 'develop' 
Handle HTTP 404 and 410 response

Closes #977

See merge request pleroma/pleroma!1278
 2019-06-13 10:47:35 +00:00
Egor Kislitsyn
30e54fd7e2 Handle HTTP 404 response 2019-06-13 17:13:35 +07:00
Egor Kislitsyn
afae3ada22 Handle HTTP "410 Gone" response 2019-06-13 16:34:03 +07:00
Egor Kislitsyn
a12f8e13c8 Improve <title> fallback; Add a test 2019-06-13 15:02:46 +07:00
Mark Felder
7363a0ea8a Revert "Only run Floki if title is missing from the map" 
This reverts commit 97d2b1a45a.
 2019-06-12 18:32:28 -05:00
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
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
Hakaba Hitoyo
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