Commit graph

3384 commits

Author SHA1 Message Date
lain
e1227d812c update frontend 2018-12-29 14:30:44 +01:00
kaniini
3dc5f04976 Merge branch 'carrot-bullying' into 'develop'
Add some hard limits on inserted activities.

See merge request pleroma/pleroma!595
2018-12-29 11:46:06 +00:00
spctrl
ab9cda315f Change 'name' to 'instance_name' so option is used when running non-interactive 2018-12-29 12:43:54 +01:00
kaniini
dd8f2196f6 Merge branch '483_blocks_import_export' into 'develop'
[#483] Blocked users list import & export

Closes #483

See merge request pleroma/pleroma!603
2018-12-29 11:34:51 +00:00
kaniini
7117ab43af Merge branch 'support/issue_480' into 'develop'
[#480] Salmon# fixed publish an activity to remote accounts

See merge request pleroma/pleroma!605
2018-12-29 11:32:24 +00:00
Maksim Pechnikov
523848d1fd Salmon# fixed publish an activity to remote accounts 2018-12-29 12:48:54 +03:00
Ivan Tashkinov
242cc9a658 [#483] User.get_by_nickname/1: ensured case-insensitive matching for local FQN. Added tests. 2018-12-29 12:27:12 +03:00
Ivan Tashkinov
7bd49a3222 [#483] User.get_by_nickname/1: ensured case-insensitive matching for local FQN. Added tests. 2018-12-29 12:26:23 +03:00
Ivan Tashkinov
b3574dccbb [#483] User.get_by_nickname/1: allowed retrieving user by fully-qualified local nickname
(<nick>@<our_instance_host>).
2018-12-29 12:15:46 +03:00
Ivan Tashkinov
67b4297f4d [#483] Refactored blocks and follows import, added tests. 2018-12-29 12:02:37 +03:00
kaniini
49cf5f9ce0 Merge branch '471_invalid_accounts_rendering' into 'develop'
[#471] Prevented rendering of inactive local accounts

Closes #471

See merge request pleroma/pleroma!599
2018-12-29 03:03:18 +00:00
kaniini
89fbed8821 Merge branch 'systemd-drop-sysadmin-privilege' into 'develop'
Security/Drops the sysadmin privilege from the daemon

See merge request pleroma/pleroma!604
2018-12-28 20:14:29 +00:00
shibayashi
64035201b5
Security/Drops the sysadmin privilege from the daemon 2018-12-28 21:09:48 +01:00
Ivan Tashkinov
700661b761 [#483] Blocked users list import (TwitterAPI). 2018-12-28 23:01:03 +03:00
Ivan Tashkinov
0a41786624 [#467] Refactored valid / invalid user rendering. 2018-12-28 22:47:42 +03:00
lambda
9c782e59dd Raise remote limit 2018-12-28 18:57:50 +00:00
kaniini
68f483ef4c Merge branch 'fix/no-attachment-links' into 'develop'
Treat any present value in "no_attachment_links" as true

Closes pleroma-fe#175

See merge request pleroma/pleroma!597
2018-12-28 18:33:14 +00:00
kaniini
1cd825519c Merge branch 'fix/public-timeline-auth' into 'develop'
Fix Twitter timelines for private instances

See merge request pleroma/pleroma!602
2018-12-28 18:30:36 +00:00
Ivan Tashkinov
6e9a15b181 [#483] Blocked users export for TwitterAPI. 2018-12-28 21:08:07 +03:00
Haelwenn (lanodan) Monnier
b43d630f30
Web.TwitterAPI.UserView: Add rights.admin 2018-12-28 17:38:32 +01:00
Ivan Tashkinov
0d1788ce44 [#471] Factored out User.visible_for?/2. 2018-12-28 14:35:25 +03:00
Vyr Cossont
d8cc96cb1f Fix Twitter timelines for private instances 2018-12-27 22:43:40 -08:00
Haelwenn
e1de866f95 Merge branch '396_elixir_1.7' into 'develop'
[#396] Required Elixir ~> 1.7.

Closes #396

See merge request pleroma/pleroma!600
2018-12-27 22:10:39 +00:00
kaniini
bee6acd51d Merge branch 'feature/create-tombstone-instead-of-delete' into 'develop'
Create tombstone instead of object deletion

See merge request pleroma/pleroma!593
2018-12-27 19:37:55 +00:00
kaniini
cff0292d4b Merge branch 'reserve-user-names' into 'develop'
Reserve a few user names

See merge request pleroma/pleroma!594
2018-12-27 19:35:06 +00:00
kaniini
02866a42af Merge branch 'feature/exclude_reblogs' into 'develop'
Implement exclude_reblogs and include_rts

See merge request pleroma/pleroma!598
2018-12-27 19:22:31 +00:00
Ivan Tashkinov
d8fd6a1055 [#396] Updated ex_doc version spec. Updated README to reflect Elixir version. 2018-12-27 16:32:47 +03:00
Ivan Tashkinov
58b12c09db [Fixes #396] Required Elixir ~> 1.7. 2018-12-27 16:12:33 +03:00
Ivan Tashkinov
e6aeb1d4a5 [#471] Prevented rendering of inactive local accounts. 2018-12-27 15:46:18 +03:00
Maxim Filippov
be70272ab0 Treat only true and "true" as true 2018-12-27 13:21:04 +03:00
vaartis
708a228919 Set ttl_interval to the seconds_valid time 2018-12-27 07:42:03 +00:00
Vyr Cossont
e4562105e7 Implement exclude_reblogs and include_rts 2018-12-26 21:38:00 -08:00
Maxim Filippov
838c024231 Treat any present value in "no_attachment_links" as true 2018-12-27 02:39:41 +03:00
Ekaterina Vaartis
448af3601a Up captcha timer to 60 secs again, save used captchas in cachex 2018-12-27 00:16:43 +03:00
Haelwenn
92b114499f Merge branch 'fix/ci-set-mix-env-globally' into 'develop'
[CI] Set MIX_ENV to test in `variables` section instead of specifying it before the command. Fix `mix compile` compiling in dev env.

See merge request pleroma/pleroma!596
2018-12-26 20:11:07 +00:00
Rin Toshaka
e31b4d05a8 [CI] Set MIX_ENV to test in variables section instead of specifying it before the command. Fix mix compile compiling in the dev env. 2018-12-26 18:50:52 +01:00
lain
1dd71026a1 Add 'about' to restricted list.
And correct pleromaFE config.
2018-12-26 14:51:51 +01:00
lain
8da2c45c27 Add ~ to the list of restricted names. 2018-12-26 14:16:41 +01:00
lain
551d80cc01 Expose restricted names in nodeinfo. 2018-12-26 12:46:16 +01:00
lain
5811e65e67 Add some hard limits on inserted activities. 2018-12-26 12:39:35 +01:00
Maxim Filippov
012b7ab5e6 Add test to check /object/:id does not leak the tombstone itself 2018-12-25 23:40:57 +03:00
lain
91724d160a Reserve a few user names
These are all names that are used for domain.com/:route routes or projected to be.
2018-12-25 20:10:45 +01:00
lambda
922abcda61 Merge branch 'legal-boilerplate' into 'develop'
Legal boilerplate

See merge request pleroma/pleroma!592
2018-12-25 17:53:48 +00:00
Maxim Filippov
340dd7a75e Format 2018-12-25 03:47:20 +03:00
Maxim Filippov
ca2e9ce9cc Revert unneeded changes 2018-12-25 03:44:48 +03:00
Maxim Filippov
ab2ee43634 Fix Activity test 2018-12-25 03:41:14 +03:00
Maxim Filippov
aeb89bece6 Remove unused test 2018-12-25 03:38:02 +03:00
Maxim Filippov
f75f707f6c Revert Activity tombstones, add ObjectTombstone struct 2018-12-25 03:00:06 +03:00
Maxim Filippov
2bbec33c71 Fix failing tests 2018-12-25 00:29:13 +03:00
Maxim Filippov
18a4cbb244 Capitalize "tombstone" 2018-12-24 20:09:18 +03:00