lambda
4de5fef1f8
Merge branch 'feature/807-bookmark-endpoint-extension' into 'develop'
...
Feature/807 bookmark endpoint extension
Closes #807
See merge request pleroma/pleroma!1059
2019-04-26 11:59:47 +00:00
kaniini
48f68fd133
Merge branch 'feature/mastoapi-new-config' into 'develop'
...
Fix leaking private configuration parameters in Mastodon and Twitter APIs, and add new configuration parameters to Mastodon API
This patch:
- Fixes `rights` in TwitterAPI ignoring `show_role`
- Fixes exposing default scope of the user to anyone in Mastodon API
- Extends Mastodon API to be able to show and set `no_rich_text`, `default_scope`, `hide_follows`, `hide_followers`, `hide_favorites` (requested by the FE in #674 )
Sorry in advance for 500 line one commit diff, I should have split it up to separate MRs
See merge request pleroma/pleroma!1093
2019-04-26 02:41:35 +00:00
kaniini
fd45c74e6f
Merge branch 'chore/update-changelog' into 'develop'
...
update Changelog
See merge request pleroma/pleroma!1096
2019-04-25 23:35:13 +00:00
William Pitcock
99b0792751
update Changelog
2019-04-25 23:27:58 +00:00
kaniini
5b2791698c
Merge branch 'feature/mediaproxy-whitelist' into 'develop'
...
Add mediaproxy whitelist capability
Closes #837
See merge request pleroma/pleroma!1095
2019-04-25 23:23:27 +00:00
Mark Felder
24c3e2db2c
Add mediaproxy whitelist capability
2019-04-25 18:11:47 -05:00
Haelwenn
8c9227c1f1
Merge branch 'feature/auto-reject-follow-requests-blocked' into 'develop'
...
activitypub: transmogrifier: send reject follow if following does not succeed
See merge request pleroma/pleroma!1094
2019-04-25 09:47:42 +00:00
rinpatch
dfc8425659
Move settings to Source subentity
2019-04-25 10:31:14 +03:00
Alex S
a825056d4d
test fixes
2019-04-25 14:09:57 +07:00
Alex S
85953c0836
fixes for tests
2019-04-25 13:46:40 +07:00
Alex S
229ce6abbc
migration without using old field name
...
removing old field from db, after bookmarks migration
2019-04-25 13:42:10 +07:00
Alex S
3c2ae80008
unused
2019-04-25 13:42:10 +07:00
Alex S
58711a79d0
removing useless transaction
2019-04-25 13:40:12 +07:00
Alex S
6322c1e123
migration optimization
...
changelog wording
2019-04-25 13:40:12 +07:00
Alex S
17b5b78737
changelog file update
2019-04-25 13:39:24 +07:00
Alex S
1258128f4f
favourites add bookmark display
2019-04-25 13:38:24 +07:00
Alex S
324c9c8ab5
migrate user.bookmarks to separate table
2019-04-25 13:38:24 +07:00
Alex S
73d01857e3
bookmarks in separate table
2019-04-25 13:38:24 +07:00
William Pitcock
0fd0ffcd76
activitypub: transmogrifier: send reject follow if following does not succeed
2019-04-25 00:48:45 +00:00
rinpatch
4baea6e6d9
Fix leaking private configuration parameters in Mastodon and Twitter APIs, and add new configuration parameters to Mastodon API
...
This patch:
- Fixes `rights` in twitterapi ignoring `show_role`
- Fixes exposing default scope of the user to anyone in Mastodon API
- Extends Mastodon API to be able to show and set `no_rich_text`, `default_scope`, `hide_follows`, `hide_followers`, `hide_favorites` (requested by the FE in #674 )
Sorry in advance for 500 line one commit diff, I should have split it up to separate MRs
2019-04-24 20:01:42 +03:00
Sachin Joshi
963d5774af
fix the status notification with special char
2019-04-24 07:06:17 +05:45
kaniini
030a7876b4
Merge branch 'security/fix-html-class-scrubbing' into 'develop'
...
html: lock down allowed class attributes to only those related to microformats
See merge request pleroma/pleroma!1090
2019-04-23 23:07:56 +00:00
William Pitcock
f5535e5743
html: lock down allowed class attributes to only those related to microformats
2019-04-23 23:03:45 +00:00
kaniini
3789945784
Merge branch 'feature/users-favourites-timeline-endpoint' into 'develop'
...
Extend Mastodon API with public endpoint for getting Favorites timeline of any user (#789 )
Closes #789
See merge request pleroma/pleroma!1056
2019-04-23 02:47:43 +00:00
Sergey Suprunenko
9dd36e5bcb
Extend Mastodon API with public endpoint for getting Favorites timeline of any user ( #789 )
2019-04-23 02:47:43 +00:00
kaniini
10c40e13d2
Merge branch 'mastoapi/add-in-reply-to-screen-name' into 'develop'
...
Add `in_reply_to_account_acct` to MastoAPI status entity
See merge request pleroma/pleroma!1086
2019-04-23 02:43:53 +00:00
kaniini
aa9d378985
Merge branch 'fix/normalize-activities' into 'develop'
...
Normalize acitvities instead of objects inside them
See merge request pleroma/pleroma!1085
2019-04-23 02:43:26 +00:00
kaniini
7dcac0bac0
Merge branch 'develop' into 'develop'
...
Add shortcode_globs setting to documentation
See merge request pleroma/pleroma!1087
2019-04-23 02:41:21 +00:00
kaniini
414902cd9e
Merge branch 'add-healthcheck-setting-to-config' into 'develop'
...
added healthcheck setting to instance config
See merge request pleroma/pleroma!1088
2019-04-22 18:31:01 +00:00
ilja
74ef14b04e
Add :emoji settings to config.md
2019-04-22 19:42:02 +02:00
Alex S
d35246c449
added healthcheck setting to instance config
2019-04-22 17:00:06 +07:00
ilja
c876b04aeb
Add shortcode_globs setting to documentation
2019-04-22 11:17:53 +02:00
rinpatch
f4c9b79306
Add a changelog entry for `pleroma.in_reply_to_account_acct`
2019-04-22 12:02:47 +03:00
rinpatch
f60d072bbb
Add `pleroma.in_reply_to_account_acct` to MastoAPI status entity
2019-04-22 11:54:27 +03:00
rinpatch
d21d921def
Replace Object.normalize(activity.data[object] with Object.normalize(acitivty) to benefit from preloading
2019-04-22 11:27:29 +03:00
rinpatch
20deff75f1
Merge branch 'fix/emoji-task-docs' into 'develop'
...
Fix unclosed ` and put synopsis into a code block in pleroma.emoji mix task docs
See merge request pleroma/pleroma!1084
2019-04-22 08:09:08 +00:00
rinpatch
952a4ae68e
Fix unclosed ` and put synopsis into a code block in pleroma.emoji mix
...
task docs
2019-04-22 11:02:31 +03:00
kaniini
0b6d1d920e
Merge branch 'get-cached-everywhere' into 'develop'
...
Use `User.get_cached*` everywhere
See merge request pleroma/pleroma!1021
2019-04-22 07:20:43 +00:00
Egor
b9cdf6d3b9
Use `User.get_cached*` everywhere
2019-04-22 07:20:43 +00:00
kaniini
05862ded7a
Merge branch 'feature/826-healthcheck-endpoint' into 'develop'
...
Feature/826 healthcheck endpoint
Closes #826
See merge request pleroma/pleroma!1083
2019-04-22 07:19:53 +00:00
Alexander Strizhakov
88f0be9693
Feature/826 healthcheck endpoint
2019-04-22 07:19:53 +00:00
kaniini
7fcbda702e
Merge branch 'rework-emoji-management' into 'develop'
...
Remove finmoji and add a way to download emojis in packs
Closes #817 and #821
See merge request pleroma/pleroma!1073
2019-04-22 02:07:19 +00:00
Ekaterina Vaartis
3cefdc62e0
Fix emoji.txt / custom_emoji.txt / shortcode_globs handling
2019-04-21 23:07:14 +03:00
rinpatch
6c0e07b8bd
Merge branch 'docs/posting_formatted' into 'develop'
...
differences_in_mastoapi_responses.md: `content_type` parameter of post submission
See merge request pleroma/pleroma!1081
2019-04-21 19:57:52 +00:00
Ekaterina Vaartis
ba19ba8a88
Formatting
2019-04-21 22:33:54 +03:00
Ekaterina Vaartis
0d6265cfe2
Change the default manifest to pleroma's namespace
2019-04-21 22:32:34 +03:00
Ekaterina Vaartis
153f5375a6
Replace MD5 with SHA256 for emoji pack verification
2019-04-21 22:28:41 +03:00
Ekaterina Vaartis
d5c0fd35e1
Wrap the docstrings to 70 characters
2019-04-21 22:16:46 +03:00
Roman Chvanikov
4908e0eeee
Fix Credo warning
2019-04-21 23:24:33 +07:00
Roman Chvanikov
eeb093631c
Fix Credo warning
2019-04-21 23:19:36 +07:00