Mark Felder
|
0883a706dc
|
Merge branch 'develop' into activation-meta
|
2020-06-30 15:09:03 -05:00 |
|
lain
|
b9e6ad571a
|
Merge branch 'preloadfixups' into 'develop'
Some fixups for the preload.
See merge request pleroma/pleroma!2692
|
2020-06-30 10:52:55 +00:00 |
|
lain
|
8b7055e25e
|
Credo fixes
|
2020-06-30 11:55:58 +02:00 |
|
lain
|
0176b7bca2
|
Merge branch 'preload-fixups-2' into preloadfixups
|
2020-06-30 11:40:34 +02:00 |
|
lain
|
2382a2a151
|
Preload: Load the correct instance panel
|
2020-06-30 11:35:54 +02:00 |
|
lain
|
34c9446cb1
|
Merge branch 'patch-1' into 'develop'
Use correct PostgreSQL version command in bug template
See merge request pleroma/pleroma!2706
|
2020-06-30 08:42:45 +00:00 |
|
|
|
27542f19c6
|
Use correct PostgreSQL version command in bug template
|
2020-06-30 03:12:30 +00:00 |
|
rinpatch
|
7bb3618939
|
Merge branch 'fix-notification-filtering' into 'develop'
Notifications: Never return `nil` in the notification list.
See merge request pleroma/pleroma!2705
|
2020-06-29 18:06:25 +00:00 |
|
lain
|
09c5991f82
|
Apply suggestion to lib/pleroma/notification.ex
|
2020-06-29 16:04:14 +00:00 |
|
lain
|
b2b332984c
|
Merge branch 'fix/cast-and-validate' into 'develop'
Fix CastAndValidate plug
Closes #1889
See merge request pleroma/pleroma!2704
|
2020-06-29 15:59:40 +00:00 |
|
lain
|
c01f4ca07f
|
Notification: Remove TODO.
|
2020-06-29 17:52:56 +02:00 |
|
lain
|
90083a754d
|
Notifications: Never return nil in the notification list.
|
2020-06-29 17:48:18 +02:00 |
|
Egor Kislitsyn
|
3aa04b81c4
|
Test default "content-type" for CastAndValidate
|
2020-06-29 19:47:04 +04:00 |
|
feld
|
344a9b28b3
|
Merge branch 'fix/swoosh-sendmail' into 'develop'
updated swoosh
See merge request pleroma/pleroma!2703
|
2020-06-29 15:24:39 +00:00 |
|
Egor Kislitsyn
|
979f02ec94
|
Fix CastAndValidate plug
|
2020-06-29 17:33:00 +04:00 |
|
Maksim Pechnikov
|
dc60b1ee58
|
updated swoosh
|
2020-06-29 16:27:01 +03:00 |
|
lain
|
07ff2d62f4
|
Merge branch 'rich-media-parser-exclude-attachment-links' into 'develop'
excluding attachment links from RichMedia
See merge request pleroma/pleroma!2702
|
2020-06-29 12:44:58 +00:00 |
|
Alexander Strizhakov
|
6512ef6879
|
excluding attachment links from RichMedia
|
2020-06-29 15:25:57 +03:00 |
|
lain
|
651f269568
|
Merge branch 'avatar-removing' into 'develop'
UpdateCredentialsTest: Add test for removing profile images.
See merge request pleroma/pleroma!2701
|
2020-06-29 11:16:30 +00:00 |
|
lain
|
e64d08439e
|
UpdateCredentialsTest: Add test for removing profile images.
|
2020-06-29 12:40:23 +02:00 |
|
lain
|
8630a6c7f5
|
Preloaders: Use strings as keys.
|
2020-06-29 11:41:00 +02:00 |
|
lain
|
a19f8778af
|
User preloader: Put user info at correct key
|
2020-06-29 11:06:20 +02:00 |
|
lain
|
577da132da
|
Merge branch '1031-parent-visible' into 'develop'
Resolve "Add `pleroma.parent_visible` to the status view"
Closes #1031
See merge request pleroma/pleroma!2679
|
2020-06-29 08:39:51 +00:00 |
|
lain
|
e229640372
|
Merge branch 'openapi/schema-account-pleromafields' into 'develop'
ApiSpec.Schemas.Account: import description from differences_in_mastoapi_responses
See merge request pleroma/pleroma!2700
|
2020-06-29 08:32:56 +00:00 |
|
Haelwenn (lanodan) Monnier
|
9f51b03eed
|
ApiSpec.Schemas.Account: import description from differences_in_mastoapi_responses
|
2020-06-29 03:31:33 +02:00 |
|
Haelwenn
|
cf1bd386c6
|
Merge branch 'docs/mastoapi-account-fields' into 'develop'
differences_in_mastoapi_responses: Update account fields
See merge request pleroma/pleroma!2699
|
2020-06-29 00:56:02 +00:00 |
|
Haelwenn (lanodan) Monnier
|
efb5d64e50
|
differences_in_mastoapi_responses: Update account fields
|
2020-06-29 02:40:32 +02:00 |
|
lain
|
4b32bc80de
|
Merge branch 'reduce-preloading-defaults' into 'develop'
Config: Reduce default preloaders to configuration endpoints.
See merge request pleroma/pleroma!2697
|
2020-06-27 10:40:29 +00:00 |
|
lain
|
0313520cd2
|
Config: Reduce default preloaders to configuration endpoints.
Fetching the timeline is a bit heavy to do by default.
|
2020-06-27 12:18:37 +02:00 |
|
lain
|
dc31fbfe6c
|
Merge branch 'fix/fetcher-transmogrifier-error' into 'develop'
object/fetcher: Pass full Transmogrifier error
See merge request pleroma/pleroma!2696
|
2020-06-27 09:41:35 +00:00 |
|
Haelwenn (lanodan) Monnier
|
1566543bec
|
object/fetcher: Pass full Transmogrifier error
|
2020-06-26 20:10:47 +02:00 |
|
Haelwenn
|
bf1c5e255a
|
Merge branch 'block-handling' into 'develop'
Handle blocks with the pipeline
See merge request pleroma/pleroma!2685
|
2020-06-26 17:41:00 +00:00 |
|
Haelwenn
|
09478c9cf7
|
Merge branch '1258-anti-link-spam-exemption' into 'develop'
AntiSpamLinkPolicy: Exempt local users.
Closes #1258
See merge request pleroma/pleroma!2686
|
2020-06-26 16:59:46 +00:00 |
|
lain
|
a2002ebb63
|
Preloading: Fix nodeinfo url.
|
2020-06-26 14:48:23 +02:00 |
|
lain
|
4a7a34ae8c
|
Preloading: Return correct data for statusnet stuff.
|
2020-06-26 14:47:38 +02:00 |
|
lain
|
6db9f7cdb3
|
Merge branch 'fix-chats' into 'develop'
Nodeinfo: Add chat information back in.
See merge request pleroma/pleroma!2691
|
2020-06-26 11:09:37 +00:00 |
|
lain
|
7ed2296416
|
Nodeinfo: Add chat information back in.
|
2020-06-26 13:04:15 +02:00 |
|
lain
|
15a8b70318
|
User: Don't unfollow on block when the relevant setting is set.
|
2020-06-26 12:06:00 +02:00 |
|
lain
|
c3383d4fab
|
BlockValidator: Restore old behavior for incoming blocks.
|
2020-06-26 11:58:40 +02:00 |
|
Haelwenn
|
7c7a6509b9
|
Merge branch 'hotfix/preload-tests-nodeinfo' into 'develop'
nodeinfo: Fix MRF transparency
See merge request pleroma/pleroma!2689
|
2020-06-26 03:48:25 +00:00 |
|
Haelwenn (lanodan) Monnier
|
d6c958b4c2
|
nodeinfo: Fix MRF transparency
|
2020-06-26 05:33:59 +02:00 |
|
feld
|
8288419686
|
Merge branch 'preload-data' into 'develop'
Preload data into index.html
Closes #1660
See merge request pleroma/pleroma!2381
|
2020-06-25 21:35:39 +00:00 |
|
feld
|
2e39fbe02e
|
Merge branch 'mastoapi-omitted' into 'develop'
MastoAPI differences: Document not implemented features
See merge request pleroma/pleroma!2687
|
2020-06-25 21:25:02 +00:00 |
|
feld
|
bb275c4985
|
Merge branch 'update/admin-fe-20200625' into 'develop'
Update AdminFE build
See merge request pleroma/pleroma!2688
|
2020-06-25 20:09:19 +00:00 |
|
Mark Felder
|
d9e4623628
|
Update AdminFE build
|
2020-06-25 14:55:00 -05:00 |
|
Alex Gleason
|
28d4e60f66
|
MastoAPI differences: Document not implemented features
|
2020-06-25 12:32:06 -05:00 |
|
lain
|
1d0804b49f
|
Merge branch 'chore/remove-reference-to-distsn' into 'develop'
Remove reference to defunct distsn.org
See merge request pleroma/pleroma!2675
|
2020-06-25 10:42:57 +00:00 |
|
lain
|
04abee782b
|
AntiSpamLinkPolicy: Exempt local users.
|
2020-06-25 12:40:39 +02:00 |
|
lain
|
f585622f85
|
Apply suggestion to config/description.exs
|
2020-06-25 10:17:16 +00:00 |
|
lain
|
1cd1977c0f
|
Merge branch 'issue/1872-ex_aws' into 'develop'
[#1872] use Pleroma.HTTP for ExAws.S3
See merge request pleroma/pleroma!2683
|
2020-06-25 10:14:19 +00:00 |
|
