hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
15,284 commits 1 branch 0 tags 241 MiB
Commit graph

15,284 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Henry Jameson
f0e2fb1609 Merge remote-tracking branch 'origin/develop' into shigusegubu 
* origin/develop: (193 commits)
  Remove search result order for non-RUM indexes
  Update `auto_linker` dependency
  Document TagPolicy in `rewrite_policy` section
  Import release config from env variable or /etc/pleroma/config.exs and warn if the file is missing
  Add option to restrict all users to local content
  Better default parameters for suggestion
  Update `plug` dependency
  Update `ex_rated` dependency
  Replace `MastodonAPIController.account_register/2` rate limiter
  Update CHANGELOG
  Add rate limiting for search endpoints
  Add RateLimiter
  Remove unused imports and aliases from migration
  Update pleroma_ctl
  Add more tests for using media_proxy and whitelists
  Add a changelog entry for releases
  specify that a version is needed for rollback
  Add migrate/rollback to release tasks
  Fix wrong placement of serve_endpoints
  Use Mix.shell().yes? if available
  ...
 2019-06-12 22:20:20 +03: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
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