lain
|
691742e62d
|
Revert "Merge branch 'avatar-removing' into 'develop'"
This reverts merge request !2701
|
4 years ago |
|
Angelina Filippova
|
df2d6564d5
|
Add labels, update descriptions and labels
|
4 years ago |
|
Haelwenn
|
9cf4bfcd81
|
Merge branch 'chore/rename-user-settings-column' into 'develop'
Rename user.settings column
See merge request pleroma/pleroma!2707
|
4 years ago |
|
Mark Felder
|
5a8e0208b1
|
Add fields limits to instance metadata, add tests
|
4 years ago |
|
Mark Felder
|
0883a706dc
|
Merge branch 'develop' into activation-meta
|
4 years ago |
|
Ivan Tashkinov
|
3d2989278c
|
[#1892] Excluded bot actors (applications, services) from search results.
|
4 years ago |
|
Mark Felder
|
d69af7f742
|
Rename user.settings column
This is used exclusively by MastoFE/GlitchFE now
|
4 years ago |
|
lain
|
b9e6ad571a
|
Merge branch 'preloadfixups' into 'develop'
Some fixups for the preload.
See merge request pleroma/pleroma!2692
|
4 years ago |
|
lain
|
8b7055e25e
|
Credo fixes
|
4 years ago |
|
lain
|
0176b7bca2
|
Merge branch 'preload-fixups-2' into preloadfixups
|
4 years ago |
|
lain
|
2382a2a151
|
Preload: Load the correct instance panel
|
4 years ago |
|
lain
|
34c9446cb1
|
Merge branch 'patch-1' into 'develop'
Use correct PostgreSQL version command in bug template
See merge request pleroma/pleroma!2706
|
4 years ago |
|
normandy
|
27542f19c6
|
Use correct PostgreSQL version command in bug template
|
4 years ago |
|
rinpatch
|
7bb3618939
|
Merge branch 'fix-notification-filtering' into 'develop'
Notifications: Never return `nil` in the notification list.
See merge request pleroma/pleroma!2705
|
4 years ago |
|
lain
|
09c5991f82
|
Apply suggestion to lib/pleroma/notification.ex
|
4 years ago |
|
lain
|
b2b332984c
|
Merge branch 'fix/cast-and-validate' into 'develop'
Fix CastAndValidate plug
Closes #1889
See merge request pleroma/pleroma!2704
|
4 years ago |
|
lain
|
c01f4ca07f
|
Notification: Remove TODO.
|
4 years ago |
|
lain
|
90083a754d
|
Notifications: Never return `nil` in the notification list.
|
4 years ago |
|
Egor Kislitsyn
|
3aa04b81c4
|
Test default "content-type" for CastAndValidate
|
4 years ago |
|
feld
|
344a9b28b3
|
Merge branch 'fix/swoosh-sendmail' into 'develop'
updated swoosh
See merge request pleroma/pleroma!2703
|
4 years ago |
|
Egor Kislitsyn
|
979f02ec94
|
Fix CastAndValidate plug
|
4 years ago |
|
Maksim Pechnikov
|
dc60b1ee58
|
updated swoosh
|
4 years ago |
|
Egor Kislitsyn
|
67d92ac7b7
|
Remove `/statusnet/config`
|
4 years ago |
|
lain
|
07ff2d62f4
|
Merge branch 'rich-media-parser-exclude-attachment-links' into 'develop'
excluding attachment links from RichMedia
See merge request pleroma/pleroma!2702
|
4 years ago |
|
Egor Kislitsyn
|
8693e01799
|
Fix warning
|
4 years ago |
|
Alexander Strizhakov
|
6512ef6879
|
excluding attachment links from RichMedia
|
4 years ago |
|
Egor Kislitsyn
|
4a306720e8
|
Merge branch 'develop' into remove-twitter-api
|
4 years ago |
|
lain
|
59540131c1
|
Credo fixes.
|
4 years ago |
|
lain
|
f308196b75
|
Token Response: Remove empty file.
|
4 years ago |
|
lain
|
e374872fe7
|
AccountOperation: Correctly describe create response.
|
4 years ago |
|
lain
|
bb168ed94a
|
OAuth: Extract view-type functions to a view.
|
4 years ago |
|
lain
|
651f269568
|
Merge branch 'avatar-removing' into 'develop'
UpdateCredentialsTest: Add test for removing profile images.
See merge request pleroma/pleroma!2701
|
4 years ago |
|
lain
|
e64d08439e
|
UpdateCredentialsTest: Add test for removing profile images.
|
4 years ago |
|
lain
|
8630a6c7f5
|
Preloaders: Use strings as keys.
|
4 years ago |
|
lain
|
a19f8778af
|
User preloader: Put user info at correct key
|
4 years ago |
|
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
|
4 years ago |
|
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
|
4 years ago |
|
Haelwenn (lanodan) Monnier
|
9f51b03eed
|
ApiSpec.Schemas.Account: import description from differences_in_mastoapi_responses
|
4 years ago |
|
Haelwenn
|
cf1bd386c6
|
Merge branch 'docs/mastoapi-account-fields' into 'develop'
differences_in_mastoapi_responses: Update account fields
See merge request pleroma/pleroma!2699
|
4 years ago |
|
Haelwenn (lanodan) Monnier
|
efb5d64e50
|
differences_in_mastoapi_responses: Update account fields
|
4 years ago |
|
lain
|
4b32bc80de
|
Merge branch 'reduce-preloading-defaults' into 'develop'
Config: Reduce default preloaders to configuration endpoints.
See merge request pleroma/pleroma!2697
|
4 years ago |
|
lain
|
0313520cd2
|
Config: Reduce default preloaders to configuration endpoints.
Fetching the timeline is a bit heavy to do by default.
|
4 years ago |
|
lain
|
dc31fbfe6c
|
Merge branch 'fix/fetcher-transmogrifier-error' into 'develop'
object/fetcher: Pass full Transmogrifier error
See merge request pleroma/pleroma!2696
|
4 years ago |
|
Alexander Strizhakov
|
f89390110b
|
added tab & labels for mrf policies
|
4 years ago |
|
Haelwenn (lanodan) Monnier
|
1566543bec
|
object/fetcher: Pass full Transmogrifier error
|
4 years ago |
|
Haelwenn (lanodan) Monnier
|
244655e884
|
MastoAPI: Show source field when deleting
|
4 years ago |
|
Haelwenn
|
bf1c5e255a
|
Merge branch 'block-handling' into 'develop'
Handle blocks with the pipeline
See merge request pleroma/pleroma!2685
|
4 years ago |
|
Haelwenn
|
09478c9cf7
|
Merge branch '1258-anti-link-spam-exemption' into 'develop'
AntiSpamLinkPolicy: Exempt local users.
Closes #1258
See merge request pleroma/pleroma!2686
|
4 years ago |
|
lain
|
a5bbfa21a1
|
StaticFE: Prioritize json in requests.
|
4 years ago |
|
lain
|
f378e93bf4
|
AccountController: Return scope in proper format.
|
4 years ago |
