Anon/pleroma
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
3,318 Commits 1 Branch 0 Tags 222 MiB
82cf9b9751
Commit Graph

3318 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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