sam/pleroma
sam/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
8436 commits 2 branches 40 tags 290 MiB
Commit graph

8436 commits

This branch
This branch
All branches
Author SHA1 Message Date
Alexander Strizhakov
400fbc7629
wait in mix task while pleroma is rebooted 2020-03-01 12:36:09 +03:00
rinpatch
438394d404 Merge branch 'fix/easy-timeline-dos' into 'develop' 
Cap the number of requested statuses in timelines to 40 and rate limit them

See merge request pleroma/pleroma!2253
 2020-02-29 23:08:14 +00:00
rinpatch
b5465bf385 timeline controller: add a TODO for replacing copypaste with a macro 2020-03-01 02:03:46 +03:00
rinpatch
e6ccf12129 changelog: entries for timeline DoS fixes 2020-03-01 01:13:08 +03:00
rinpatch
ffcebe7e22 timeline controller: rate limit timelines to 3 requests per 500ms per timeline per ip/user 2020-03-01 01:13:08 +03:00
rinpatch
4d416343fa rate limiter: Fix a race condition 
When multiple requests are processed by rate limiter plug at the same
time and the bucket is not yet initialized, both would try to initialize
the bucket resulting in an internal server error.
 2020-03-01 01:13:07 +03:00
rinpatch
df2173343a pagination: limit the number of elements returned at one time to 40 2020-03-01 01:11:54 +03:00
rinpatch
19e559fe51 Merge branch 'rate-limiter-runtime-settings' into 'develop' 
RateLimiter improvements: runtime configurability, no default limits in tests

See merge request pleroma/pleroma!2250
 2020-02-29 21:52:33 +00:00
Ivan Tashkinov
c747260989 [#2250] Tiny refactoring per merge request review. 2020-02-29 22:04:09 +03:00
rinpatch
269aa9c8a5 Merge branch 'chore/update-cachex' into 'develop' 
deps: update cachex to 3.2.0

See merge request pleroma/pleroma!2259
 2020-02-29 17:58:48 +00:00
rinpatch
c026128325 deps: update cachex to 3.2.0 2020-02-29 20:40:23 +03:00
rinpatch
0fefc4033f Merge branch 'mastofe/bundle-2020-01-20' into 'develop' 
MastoFE: Bundle 2020-01-20

See merge request pleroma/pleroma!2257
 2020-02-29 16:31:31 +00:00
Haelwenn
5db2fb3ce7 Merge branch 'descriptions-changes' into 'develop' 
Adding streamer group & Oban crontab child to descriptions.exs

Closes #1592

See merge request pleroma/pleroma!2258
 2020-02-29 11:29:45 +00:00
Alexander Strizhakov
04b03e4762
streamer group & Oban crontab child 2020-02-29 11:26:34 +03:00
Haelwenn (lanodan) Monnier
2a850abbeb
MastoFE: Bundle 2020-01-20 2020-02-29 06:41:13 +01:00
feld
aad057a2d6 Merge branch 'update/pleroma-fe-20200228' into 'develop' 
Update PleromaFE bundle for the 2.0 release

See merge request pleroma/pleroma!2255
 2020-02-28 23:28:58 +00:00
Mark Felder
bdd603e9f3 Merge branch 'develop' into update/pleroma-fe-20200228 2020-02-28 16:18:09 -06:00
Mark Felder
c28de93912 Update PleromaFE bundle for the 2.0 release 2020-02-28 16:15:12 -06:00
feld
d075bdc9e9 Merge branch 'update/admin-fe-20200228' into 'develop' 
Update AdminFE build

See merge request pleroma/pleroma!2254
 2020-02-28 18:40:22 +00:00
Mark Felder
3d24a0917b Update AdminFE build 
- Removed Grouped Reports; API needs proper architecture/refactor
- Cannot set Tesla adapter in AdminFE as it's not safe yet
- Layout/rendering improvements
 2020-02-28 12:32:44 -06:00
Ivan Tashkinov
3759b146c4 Apply suggestion to lib/pleroma/plugs/rate_limiter/rate_limiter.ex 2020-02-28 13:33:42 +00:00
Haelwenn
e892a7eb01 Merge branch 'filtered-params' into 'develop' 
add confirm field to filtered params

See merge request pleroma/pleroma!2251
 2020-02-28 04:27:50 +00:00
Steven Fuchs
fabcd82f4a add confirm field to filtered params 2020-02-28 04:27:50 +00:00
feld
457a653f88 Merge branch 'descriptions-changes' into 'develop' 
Removing unnecessary groups from descriptions.exs

See merge request pleroma/pleroma!2247
 2020-02-27 18:11:26 +00:00
feld
f2216287a7 Merge branch 'admin-status-list' into 'develop' 
Admin API: `/api/pleroma/admin/statuses` (accepts `godmode` and `local_only`)

Closes #1550

See merge request pleroma/pleroma!2192
 2020-02-27 18:11:04 +00:00
feld
ab0aa04e4c Merge branch 'exclude-boosts-admin-api' into 'develop' 
Admin API: filter out boosts from recent statuses

Closes #1589

See merge request pleroma/pleroma!2248
 2020-02-27 18:09:19 +00:00
Ivan Tashkinov
6f2efb1c45 Runtime configurability of RateLimiter. Refactoring. Disabled default rate limits in tests. 2020-02-27 18:46:05 +03:00
eugenijm
4ab07cf0d5 Admin API: Exclude boosts from GET /api/pleroma/admin/users/:nickname/statuses and GET /api/pleroma/admin/instance/:instance/statuses 2020-02-26 22:35:57 +03:00
eugenijm
e2a6a40367 Admin API: GET /api/pleroma/admin/statuses - list all statuses (accepts godmode and local_only) 2020-02-26 20:21:38 +03:00
Alexander Strizhakov
2076c9f8c8
unnecessary groups 2020-02-26 19:50:07 +03:00
lain
fda6f35a46 Merge branch 'feat/instance-gen-improvements' into 'develop' 
small instance.gen task improvements

See merge request pleroma/pleroma!2245
 2020-02-26 08:26:16 +00:00
rinpatch
3bbfebd1c2 instance.gen task: make example instance name less confusing 
See https://git.pleroma.social/pleroma/pleroma/merge_requests/2245#note_52217
 2020-02-26 00:32:34 +03:00
rinpatch
359faa8645 instance.gen task: remind to transfer the config to the database after 
migrations
 2020-02-25 22:13:08 +03:00
rinpatch
cfa28dee32 instance.gen task: make instance name default to the domain 2020-02-25 21:59:37 +03:00
rinpatch
8b4d1a0b29 Merge branch 'fix/dialyzer-warnings' into 'develop' 
Fix Dialyzer warnings

See merge request pleroma/pleroma!2242
 2020-02-25 18:56:37 +00:00
feld
2cd253f6d5 Merge branch 'merge/admin-fe-20200225' into 'develop' 
Update AdminFE build

See merge request pleroma/pleroma!2244
 2020-02-25 17:14:54 +00:00
Mark Felder
554bc88e8a Update AdminFE build 2020-02-25 11:08:35 -06:00
feld
97dae77240 Merge branch 'token-web-push-test' into 'develop' 
Add a test to ensure OAuth tokens are tied to Push subscriptions

Closes #1551

See merge request pleroma/pleroma!2241
 2020-02-25 16:06:06 +00:00
Egor Kislitsyn
22018adae6
Fix Dialyzer warnings 2020-02-25 18:34:56 +04:00
Egor Kislitsyn
c495e6d387
Add a test to ensure OAuth tokens are tied to Push subscriptions 2020-02-25 18:04:28 +04:00
lain
87e8d792bd Merge branch 'test-fix' into 'develop' 
Compile fix in tests

See merge request pleroma/pleroma!2239
 2020-02-25 12:26:39 +00:00
Alexander Strizhakov
3eccdd15aa
compile fix 2020-02-25 15:19:52 +03:00
rinpatch
035c2c1415 Merge branch 'fix/instance-gen-custom-static' into 'develop' 
instance.gen task: fix crash when using custom static directory

Closes #1082

See merge request pleroma/pleroma!2237
 2020-02-24 20:52:10 +00:00
rinpatch
5e4fe0e8f7 instance.gen task: fix crash when using custom static directory 
Closes #1082
 2020-02-24 23:42:24 +03:00
Haelwenn
908b6ee49a Merge branch 'status-visibility-count-stats' into 'develop' 
Status count by visibility scope (`GET /api/pleroma/admin/stats` )

See merge request pleroma/pleroma!2097
 2020-02-24 19:21:29 +00:00
eugenijm
7ad5c51f23 Admin API: GET /api/pleroma/admin/stats to get status count by visibility scope 2020-02-24 21:46:37 +03:00
lain
d240ce41b5 Merge branch 'theming_your_instance' into 'develop' 
DOCS Theming your instance

See merge request pleroma/pleroma!2232
 2020-02-24 17:48:18 +00:00
Ilja
c0146f4859 DOCS Theming your instance 
I added a new file to explain
* where a custom theme can be created
* where themes can be downloaded
* where to add the theme on the server
* how to make the theme available on the instance
* how to set the theme as default on the instance
 2020-02-24 17:48:18 +00:00
lain
81f29e7c6a Merge branch 'bugfix/captcha-nil-answer_data' into 'develop' 
Bugfix: return invalid when answer_data is nil

Closes #1585

See merge request pleroma/pleroma!2236
 2020-02-24 14:54:22 +00:00
Haelwenn
1e1156b645 Merge branch '1505-threads-federation' into 'develop' 
[#1505] Threads / replies federation

Closes #1505

See merge request pleroma/pleroma!2129
 2020-02-24 07:28:35 +00:00