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

5606 Commits

Author SHA1 Message Date
kaniini ad249f6f5f Merge branch 'fix/syslog-tag' into 'develop' 
lowercase syslog tag

See merge request pleroma/pleroma!1344
 2019-06-27 21:30:54 +00:00
Mark Felder e64c758cea Add changelog entry for syslog tag change 2019-06-27 16:25:55 -05:00
Mark Felder f8ec3e129f In my experience syslog tags are usually lowercase 2019-06-27 13:00:22 -05:00
kaniini 0369a5db16 Merge branch 'idempotency-plug' into 'develop' 
Add IdempotencyPlug and use it in all of the api

Closes #1003

See merge request pleroma/pleroma!1339
 2019-06-27 04:20:17 +00:00
kaniini 6587e2358c Merge branch 'fix/admin-configure' into 'develop' 
don't delete config settings on admin update

See merge request pleroma/pleroma!1340
 2019-06-27 04:19:44 +00:00
Alexander Strizhakov c6705144a2 don't delete config settings on admin update 2019-06-27 04:19:44 +00:00
rinpatch cfb5be3ced Merge branch 'update-mastofe/glitch-soc-2019-06-26' into 'develop' 
Update mastofe to bundle-2019-06-26

See merge request pleroma/pleroma!1341
 2019-06-26 19:15:37 +00:00
Haelwenn (lanodan) Monnier 451931d36f
Update mastofe to bundle-2019-06-26 2019-06-26 21:06:28 +02:00
Egor Kislitsyn 889a9c3a3f Polish IdempotencyPlug 2019-06-27 01:53:58 +07:00
Egor Kislitsyn 159630b21c Fix credo warning 2019-06-26 19:19:07 +07:00
Egor Kislitsyn 0b8aeac0f3 Remove previous idempotency implementation from `post_status` 2019-06-26 18:49:14 +07:00
Egor Kislitsyn 74132e3715 Enable IdempotencyPlug for the all API 2019-06-26 18:42:49 +07:00
Egor Kislitsyn 825077a5b0 Add Idempotency plug 2019-06-26 18:36:58 +07:00
Haelwenn 145bcf3eb9 Merge branch 'fix/handle-wrong-visibility-error' into 'develop' 
Return correct response when reply to a direct message is not direct itself

Closes #1010

See merge request pleroma/pleroma!1336
 2019-06-26 10:59:28 +00:00
Sergey Suprunenko d53fb55bb7 Return correct response when reply to a direct message is not direct itself 2019-06-26 10:59:27 +00:00
kaniini 24bcc209f9 Merge branch 'refactoring/fix_render_view' into 'develop' 
Fix Controller.render/4 deprecation

See merge request pleroma/pleroma!1337
 2019-06-26 05:34:26 +00:00
kaniini 9f8e645dce Merge branch 'feature/configurable-pack-extensions' into 'develop' 
Make default pack extensions configurable and default to png and gif

See merge request pleroma/pleroma!1338
 2019-06-26 05:34:02 +00:00
rinpatch e6f036b9ad Merge branch 'issues/1016' into 'develop' 
[#1016] add clear formatted text/ removes links with private ip

See merge request pleroma/pleroma!1335
 2019-06-26 03:55:20 +00:00
Maksim Pechnikov 437fd6046d update changelog 2019-06-26 06:49:20 +03:00
rinpatch 41e4752950 Make default pack extensions configurable and default to png and gif 2019-06-26 06:48:59 +03:00
Maksim f1817fe94b Apply suggestion to CHANGELOG.md 2019-06-26 03:43:53 +00:00
Maksim Pechnikov 7d6a543eca update changelog 2019-06-26 06:39:50 +03:00
Maksim Pechnikov 5c0f646cef fix validate_page_url 2019-06-26 06:27:17 +03:00
Maksim ec01b7c934 Apply suggestion to docs/config.md 2019-06-26 03:23:26 +00:00
Roman Chvanikov a7a54068f9 Fix Controller.render/4 deprecation 2019-06-26 03:28:02 +03:00
Maksim Pechnikov 4ad15ad2a9 add ignore hosts and TLDs for rich_media 2019-06-25 22:25:37 +03:00
Maksim Pechnikov 0cb8e710fb add test 2019-06-25 18:06:08 +03:00
Maksim Pechnikov 0276cf5a02 fix validate_url for private ip 2019-06-25 17:44:24 +03:00
kaniini d80859731e Merge branch 'issues/184' into 'develop' 
[#184] small refactoring  reset password

See merge request pleroma/pleroma!1301
 2019-06-24 19:01:56 +00:00
Maksim a0c4ebb4d7 [#184] small refactoring reset password 2019-06-24 19:01:56 +00:00
kaniini 1ab8a9e4fe Merge branch 'feature/rework-user-deletion' into 'develop' 
Rework user deletion

Closes #846

See merge request pleroma/pleroma!1308
 2019-06-24 18:59:12 +00:00
Sergey Suprunenko 2c63c67512 Rework user deletion 2019-06-24 18:59:12 +00:00
kaniini 0f07bcc9e3 Merge branch 'conversation-update-on-dm-delete' into 'develop' 
Broadcast conversation update when DM is deleted

Closes #1001

See merge request pleroma/pleroma!1311
 2019-06-24 07:14:04 +00:00
Eugenij f2c03425b0 Broadcast conversation update when DM is deleted 2019-06-24 07:14:04 +00:00
rinpatch 58d567ddc5 Merge branch 'modify-config.md-for-S3' into 'develop' 
Modify config.md for s3

See merge request pleroma/pleroma!1331
 2019-06-24 05:32:03 +00:00
aries 550302c041 Apply suggestion to docs/config.md 2019-06-24 01:09:28 +00:00
feld 826d0424c1 Merge branch 'update/adminfe' into 'develop' 
Update adminFE to latest build

See merge request pleroma/pleroma!1333
 2019-06-23 22:46:21 +00:00
Mark Felder 7b9e21e8a2 Update adminFE to latest build 2019-06-23 18:36:20 -04:00
aries 7daaaf84f1 Fix markdown mistakes 2019-06-24 01:28:01 +09:00
aries 4bac13966b modify config.md for S3 2019-06-24 01:10:55 +09:00
kaniini 48174dc290 Merge branch 'bind-to-localhost' into 'develop' 
Bind to 127.0.0.1 instead of 0.0.0.0 by default

See merge request pleroma/pleroma!1329
 2019-06-23 06:53:38 +00:00
rinpatch 875100de01 Bind to 127.0.0.1 instead of 0.0.0.0 by default 2019-06-23 09:31:39 +03:00
kaniini 27b9605de0 Merge branch 'rich_media_titles_two' into 'develop' 
Rich media titles two

See merge request pleroma/pleroma!1325
 2019-06-23 05:43:11 +00:00
kaniini 8b7860f12f Merge branch 'admin-config' into 'develop' 
Admin config

See merge request pleroma/pleroma!1328
 2019-06-23 05:42:37 +00:00
Alex S b37ede5df3 log capturing 2019-06-23 08:16:28 +03:00
Alex S 982cad0268 support for config groups 2019-06-23 08:16:16 +03:00
Haelwenn 72f365df07 Merge branch 'docs/remove-tootdon' into 'develop' 
docs/clients.md: Remove tootdon

See merge request pleroma/pleroma!1326
 2019-06-22 17:44:06 +00:00
Haelwenn 066f4622d6 Merge branch 'feature/rum-config-generator' into 'develop' 
Support RUM indexes in the config generator

See merge request pleroma/pleroma!1324
 2019-06-22 17:38:04 +00:00
Haelwenn (lanodan) Monnier ab79a18b77
docs/clients.md: Remove tootdon 
Of course a proprietary client would send the messages home :D
 2019-06-22 19:34:30 +02:00
Alex S 410add1c30 support for tuples with more than 2 values 2019-06-22 17:30:53 +03:00