alyssa
/
pleroma
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
3,136 Commits 1 Branch 0 Tags 177 MiB
Commit Graph

3136 Commits

Author SHA1 Message Date
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
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
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
Maxim Filippov 0f412cf6e6 Create tombstone instead of object deletion 2018-12-24 02:25:36 +03:00
William Pitcock 3c08d229db tests: add legal boilerplate 2018-12-23 20:57:10 +00:00
William Pitcock 69ad1039ba mix tasks: add legal boilerplate 2018-12-23 20:56:42 +00:00
William Pitcock 2791ce9a1f add license boilerplate to pleroma core 2018-12-23 20:56:42 +00:00
lambda 005b4194ff Merge branch 'bugfix/trans_fix_url_videos' into 'develop' 
Fix "url" of Videos in transmogrifier

Closes #367

See merge request pleroma/pleroma!459
 2018-12-23 14:46:58 +00:00
William Pitcock a2bceaf688 tests: twitter api: add test proving that peertube videos are correctly handled 2018-12-23 14:00:54 +00:00
William Pitcock 34a4ed22c4 twitter api: add "Video" to supported activity types list 2018-12-23 14:00:54 +00:00
William Pitcock 873938d223 tests: twitter api: activity view test: enable tesla mock 2018-12-23 14:00:54 +00:00
William Pitcock 79b51a97fe twitter api: activity representer: remove peertube hack 2018-12-23 14:00:50 +00:00
William Pitcock 9f48485f64 tests: mastodon api: add test verifying that peertube videos are correctly rendered 2018-12-23 13:44:01 +00:00
William Pitcock 32dfc1d12a mastodon api: status view: remove obsolete peertube hack 2018-12-23 13:40:33 +00:00
William Pitcock 71f6d9f418 transmogrifier: significantly rework handling of peertube videos, add test 2018-12-23 13:31:08 +00:00
lambda a3e33fa177 Merge branch 'hotfix/activity-without-content' into 'develop' 
Twitter ActivityView: fix crash with activity without content

See merge request pleroma/pleroma!572
 2018-12-23 13:17:25 +00:00
Haelwenn (lanodan) Monnier 3aff8067e4 transmogrifier: When it’s a Video move "url" to "attachment" 2018-12-23 13:00:25 +00:00
kaniini 093d39b634 Merge branch 'feature/hellthread-mitigation' into 'develop' 
implement hellthread mitigation

Closes #474

See merge request pleroma/pleroma!588
 2018-12-23 11:28:43 +00:00
Karen Konou a7f07bb6e5 Implement kaniini's tweaks 2018-12-23 12:24:53 +01:00
Karen Konou c76179419d Renamed the things 2018-12-23 11:14:29 +01:00
Karen Konou c92f91ffeb Add documentation 2018-12-23 10:41:56 +01:00
Karen Konou 409ff60bf8 Fix formatting 2018-12-22 23:32:38 +01:00
Karen Konou 92362e1e22 Implement large thread filter 2018-12-22 23:18:31 +01:00
lambda 61a88a6757 Merge branch 'ci-test-fix' into 'develop' 
SetUserSessionIdPlugTest: try again to fix random ci failures

See merge request pleroma/pleroma!579
 2018-12-20 16:31:08 +00:00
kaniini 2e2030ada8 Merge branch '114_email_confirmation' into 'develop' 
[#114] Email confirmation

See merge request pleroma/pleroma!546
 2018-12-20 13:28:36 +00:00
Ivan Tashkinov 851db74f1c [#114] Fixed test. 2018-12-20 15:23:16 +03:00
Ivan Tashkinov 7cab7de9ff [#114] Allowed unconfirmed users to authenticate if :account_activation_required is disabled prior to confirmation. 
Ensured that no confirmation emails are sent if :account_activation_required is not true. Adjusted tests.
 2018-12-20 14:48:48 +03:00
Ivan Tashkinov f69cbf4755 [#114] Added :user_id component to email confirmation path to improve the security. 
Added tests for `confirm_email` action.
 2018-12-20 13:41:30 +03:00
Ivan Tashkinov 8adcd1e80f [#114] Removed flash messages rendering on redirects. 2018-12-20 13:05:42 +03:00
Ivan Tashkinov 501ce34d7f [#114] Stylistic adjustments. 2018-12-20 12:55:12 +03:00
kaniini 8de3138de0 Merge branch 'support/issue_413' into 'develop' 
[#413] fix parse mentions

See merge request pleroma/pleroma!577
 2018-12-20 09:35:01 +00:00
Maksim f1b93b5be7 [#413] fix parse mentions 2018-12-20 09:35:01 +00:00