Anon/pleroma
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
8,739 Commits 1 Branch 0 Tags 222 MiB
797dd3f581
Commit Graph

8739 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
lain
7a60cd91ff Merge branch 'fix-streaming-reblog' of git.pleroma.social:pleroma/pleroma into fix-streaming-reblog 2020-01-29 11:52:24 +01:00
lain
e2e9299b8e Streamer Tests: code readability improvements 2020-01-29 11:50:49 +01:00
lain
b3a877d6c9 Emoji Reactions: Correctly handle deleted users 2020-01-29 11:43:36 +01:00
lain
d378550d2d Emoji Reactions: Document changes 2020-01-29 11:40:57 +01:00
lain
a802e07241 Emoji Reactions: Add reacted field to emoji reactions 2020-01-29 11:39:06 +01:00
lain
9e0c2413b4 Merge branch 'meta-tags-parser' into 'develop' 
Title parsing improvement

See merge request pleroma/pleroma!2159
 2020-01-29 10:07:26 +00:00
Alexander Strizhakov
1f4fbe9d98
title parse improvement 2020-01-29 11:13:34 +03:00
lain
f1d5c0f079 Merge branch 'frontend-refresh-c54111797ae1058e59931b2d1f12e6ab6a6f96a9' into 'develop' 
Update frontend to c54111797ae1058e59931b2d1f12e6ab6a6f96a9

See merge request pleroma/pleroma!2158
 2020-01-28 17:39:32 +00:00
Maksim Pechnikov
21a2a05407 Merge branch 'develop' into issue/1383 2020-01-28 20:39:20 +03:00
lain
f5bfb29d3b Update frontend to c54111797ae1058e59931b2d1f12e6ab6a6f96a9 2020-01-28 18:39:02 +01:00
lain
cedee2793d Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/remote-follow-userpage-redirect 2020-01-28 17:52:42 +01:00
lain
e8f22451da Merge branch 'linkify-test-expansion' into 'develop' 
Formatter: Add a test for domain / username clashes

See merge request pleroma/pleroma!2151
 2020-01-28 16:51:29 +00:00
lain
12b6fcdb8c Merge branch 'features/task-test-email' into 'develop' 
Create pleroma.email mix task

Closes #1061

See merge request pleroma/pleroma!2118
 2020-01-28 16:42:57 +00:00
lain
2c121b2623 Merge branch 'fix/1524-link_preview' into 'develop' 
Meta tags parser respects first title tag

Closes #1524

See merge request pleroma/pleroma!2157
 2020-01-28 16:38:14 +00:00
Alexander Strizhakov
7bd4c14581
meta tag parser respect first title header 2020-01-28 19:29:27 +03:00
lain
10762ea2ac Merge branch 'feature/tag_feed' into 'develop' 
[#1452] Atom feeds for hashtags

See merge request pleroma/pleroma!2040
 2020-01-28 16:14:23 +00:00
lain
d385789a45 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/tag_feed 2020-01-28 17:06:36 +01:00
Haelwenn
271935953a Merge branch 'whole-db-removal' into 'develop' 
Remove `whole_db` parameter everywhere, it's not used anymore

See merge request pleroma/pleroma!2152
 2020-01-28 15:51:45 +00:00
Haelwenn (lanodan) Monnier
4eb935be78
Create pleroma.email mix task 
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1061
 2020-01-28 16:49:38 +01:00
lain
e816edbb2f Update streamer_test.exs 2020-01-28 15:42:05 +00:00
lain
77f24525ca Streamer: Correctly handle reblog mutes 2020-01-28 16:40:44 +01:00
Egor Kislitsyn
6302b40791
Warn if HTTPSecurityPlug is disabled 2020-01-28 19:14:09 +04:00
Alexander Strizhakov
33bd8fbffe
filename and test fixes 2020-01-28 18:02:11 +03:00
feld
d9cb8acd3e Merge branch 'fix/attachments-cleanup' into 'develop' 
Fix attachments cleanup with custom base_url

See merge request pleroma/pleroma!2154
 2020-01-28 14:52:57 +00:00
lain
ffa9e3a2ce Merge branch 'fix-elixir-v1.10' into 'develop' 
Fix compatibility with Elixir v1.10

See merge request pleroma/pleroma!2153
 2020-01-28 14:30:34 +00:00
Egor Kislitsyn
2ddd1bb088
Fix compatibility with Elixir v1.10 2020-01-28 18:23:59 +04:00
Roman Chvanikov
d18a2e4e36 Add test for custom base_url when deleting an attachment 2020-01-28 17:22:24 +03:00
Roman Chvanikov
804a702f97 Fix base_url string trimming 2020-01-28 17:07:46 +03:00
Roman Chvanikov
dea968463d Add logging 2020-01-28 16:52:20 +03:00
lain
46915207b6 Remove whole_db parameter everywhere, it's not used anymore 2020-01-28 14:40:40 +01:00
lain
e3fae3380e Apply suggestion to lib/pleroma/web/feed/tag_controller.ex 2020-01-28 13:38:49 +00:00
Roman Chvanikov
7f78bd7e37 Fix __MODULE__ usage 2020-01-28 16:38:44 +03:00
Alexander Strizhakov
93b9f226e0
path fix 2020-01-28 16:32:33 +03:00
Alexander Strizhakov
da334ef934 Apply suggestion to mix.lock 2020-01-28 13:29:48 +00:00
Alexander Strizhakov
251bbd794a Apply suggestion to mix.exs 2020-01-28 13:29:44 +00:00
lain
6fab5fe7f8 Merge branch 'translation/errors-french' into 'develop' 
Translation/errors french

See merge request pleroma/pleroma!1457
 2020-01-28 13:26:28 +00:00
lain
dd5a24073f Merge branch 'docs_introduction' into 'develop' 
DOCS General update for the "Introduction to Pleroma" section

See merge request pleroma/pleroma!2101
 2020-01-28 12:57:07 +00:00
Ilja
c8964cc438 DOCS General update for the "Introduction to Pleroma" section 
* Put url's between angle brackets. docs-develop doesn't list the url's as links, I assume these will fix that (but don't know if I can check)
* Added a third space before the "sub"bulletpoints. docs-develop doesn't show them as subpoints with only two spaces. I hope three will fix it (but don't know if I can check)
* Added a newline above the bulletpoints because otherwise they are broken on docs-develop
* Remove the 😄 thingies because neither of the docs (docs.pleroma.social and docs-develop.social) show them as emojis
* Add a link to fediverse.network
* Update to add new stuff and fix things that aren't correct (any more)
 2020-01-28 12:57:06 +00:00
lain
95afcae194 Merge branch 'support/update_ecto' into 'develop' 
updated ecto and fixed warning

See merge request pleroma/pleroma!2150
 2020-01-28 12:49:22 +00:00
Alexander Strizhakov
aa3ba63513
like this 2020-01-28 15:41:45 +03:00
lain
4f004ab92e Merge branch 'fix/attachments-cleanup' into 'develop' 
Fix/attachments cleanup

See merge request pleroma/pleroma!2148
 2020-01-28 12:40:00 +00:00
lain
51283bf996 Formatter: Add a test for domain / username clashes 2020-01-28 13:38:21 +01:00
Alexander Strizhakov
91ea3ed82c
moving restarter application into pleroma repo 2020-01-28 15:19:05 +03:00
Maksim Pechnikov
02c3dd2e3d update ecto 2020-01-28 10:43:47 +03:00
Roman Chvanikov
eb4870e1cd Remove unused var 2020-01-28 03:54:54 +03:00
Roman Chvanikov
52e08ec9fd explicitly describe perform op in AttachmentsClenupWorker 2020-01-28 03:52:50 +03:00
Maksim Pechnikov
be926863a8 fix test 2020-01-27 21:20:33 +03:00
Maksim Pechnikov
bcffa662dc Merge branch 'develop' into feature/tag_feed 2020-01-27 21:13:13 +03:00
Alexander Strizhakov
7c6e5c541d
docs update 2020-01-27 19:48:20 +03:00
Haelwenn
b12f306473 Merge branch 'remove/suggestions-third-party-engine' into 'develop' 
Remove user recommendation by third party engine

See merge request pleroma/pleroma!2141
 2020-01-27 13:21:50 +00:00