42bd985e66
Add BasicAuthDecoderPlug
2018-09-05 17:30:05 +02:00
75bc68dbc1
pinned crypt dependency to specific commit
2018-09-05 02:29:19 -04:00
8b020e03a6
change cond to if else
2018-09-05 01:37:48 -04:00
1a8bc26e52
auth against sha512-crypt password hashes, upgrade to pbkdf2
2018-09-05 00:21:44 -04:00
8a4e2f48bf
installation/pleroma-apache.conf: OCSP stapling needs to be outside of the virtualhost directive
2018-09-03 21:41:21 +02:00
8143251f06
Merge branch 'feature/staff-discovery-api' into 'develop'
...
staff discovery api
See merge request pleroma/pleroma!326
2018-09-03 15:00:56 +00:00
76c67a41c1
Merge branch 'develop' into 'feature/staff-discovery-api'
...
# Conflicts:
# lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
2018-09-03 14:55:42 +00:00
d3f6814feb
tests: add test for staffAccounts presence in nodeinfo
2018-09-03 14:48:36 +00:00
9a21ff5f61
nodeinfo: add staffAccounts field to metadata
2018-09-03 14:48:31 +00:00
1c9e539b47
Merge branch 'feature/mastodon_api_2.4.x' into 'develop'
...
Add/Fix Mastodon endpoints for 2.4.3 compatibility
See merge request pleroma/pleroma!266
2018-09-03 12:33:36 +00:00
8fdddc255c
Merge branch 'report-chat-and-gopher-support' into 'develop'
...
Report chat and gopher support at /nodeinfo/2.0.json
See merge request pleroma/pleroma!327
2018-09-03 12:32:19 +00:00
b1124f1605
report chat and gopher support at /nodeinfo/2.0.json
2018-09-03 21:13:30 +09:00
b61430163b
user: add moderator_user_query()
2018-09-03 12:03:23 +00:00
cf5d1302aa
migrations: add is_moderator index for users table
2018-09-03 11:55:12 +00:00
7ca2a2ddea
Merge branch 'nil-bio-emojis' into 'develop'
...
add nil clause for Formatter.get_emoji/1 to return an empty result
Closes #274
See merge request pleroma/pleroma!315
2018-09-03 05:54:11 +00:00
072e965015
Merge branch 'patch-2' into 'develop'
...
Render notification IDs as strings, not numbers
See merge request pleroma/pleroma!325
2018-09-03 02:03:51 +00:00
35515cfa66
Update mastodon_api_controller.ex
2018-09-03 01:58:55 +00:00
26f8697400
Update mastodon_api_controller.ex
2018-09-03 01:52:02 +00:00
2b2bd0e047
Render notification IDs as strings, not numbers
2018-09-03 01:40:05 +00:00
4257f784bc
sloop around get_emoji/1 to check is_binary and have a fallthrough
...
default that returns empty
2018-09-02 20:44:37 -03:00
754deb26dd
[Pleroma.Uploaders.Local]: Add configuration for custom url path
...
One use-case being an external caching proxy
2018-09-02 19:00:16 +02:00
b7923aa304
Merge branch 'hotfix_broken_likes' into 'develop'
...
hotfix for broken like completely breaking the notifications API
See merge request pleroma/pleroma!284
2018-09-02 12:37:00 +00:00
3370fab1d0
Merge branch 'security/emoji-xss' into 'develop'
...
formatter: don't add XSS emoji
See merge request pleroma/pleroma!322
2018-09-02 00:08:56 +00:00
834515fb51
formatter: don't add XSS emoji
2018-09-02 00:04:09 +00:00
3c7280934e
Merge branch 'security/activitypub-spoofing' into 'develop'
...
security: activitypub spoofing
See merge request pleroma/pleroma!321
2018-09-01 23:48:55 +00:00
03e92977cb
transmogrifier: fix peertube/plume actor handling
2018-09-01 23:44:19 +00:00
303af9ba4c
tests: add regression tests
2018-09-01 23:33:10 +00:00
0b2c051a04
activitypub: fix possibility of spoofing by containing remote objects to the same domain as their actor
2018-09-01 23:20:02 +00:00
e4079abab8
Merge branch 'feature/disable-config-management' into 'develop'
...
config: add ability to disable Pleroma FE config management (closes #276 )
Closes #276
See merge request pleroma/pleroma!320
2018-09-01 21:47:35 +00:00
e2ce0e9e05
run `mix format`.
2018-09-01 21:12:42 +00:00
84d84e4ca4
OAuth: Support /revoke endpoint for revoking tokens
...
(for compatibility with Mastodon)
2018-09-01 23:10:48 +02:00
ad2a7972e7
OAuth: Set `created_at` in token exchange response
...
(for compatibility with Mastodon)
2018-09-01 23:10:48 +02:00
b60d232719
AccountView: `sensitive` is supposed to be a boolean, not a string
2018-09-01 23:10:48 +02:00
c921d99898
config: add ability to disable Pleroma FE config management ( closes #276 )
2018-09-01 21:05:32 +00:00
2e2f458705
Merge branch 'lanodan/code-dup_in_mastoapi_search' into 'develop'
...
Clean code duplication in MastoAPI search(v1/v2)
See merge request pleroma/pleroma!316
2018-09-01 09:12:59 +00:00
95abc0eaaa
Merge branch 'verify-credentials-default-scope' into 'develop'
...
Specify default scope in verify_credentials
See merge request pleroma/pleroma!317
2018-09-01 08:48:40 +00:00
0c2a0e3551
Specify default scope in verify_credentials
...
Certain Mastodon/Pleroma front ends call verify_credentials to get the
default scope of a new toot.
Currently, Pleroma hardcodes this value to "public".
This patch changes it to the user's default_scope value.
2018-08-31 21:04:46 -07:00
8885d16e1b
[Pleroma.Web.MastodonAPI.MastodonAPIController].search(2)?: Remove code duplication
2018-09-01 03:11:58 +02:00
a9c0f395cb
add nil clause for Formatter.get_emoji/1 to return an empty result
2018-08-31 14:29:23 -03:00
d31bbb1cfe
Merge branch 'revert-a26d5e6b' into 'develop'
...
Revert "Merge branch 'feature/rich-text' into 'develop'"
See merge request pleroma/pleroma!313
2018-08-31 09:53:00 +00:00
58539e1357
Revert "Merge branch 'feature/rich-text' into 'develop'"
...
This reverts merge request !309
2018-08-31 09:51:20 +00:00
340ab3cb90
Merge branch 'bugfix/s3-configuration' into 'develop'
...
config: fix up defaults for s3 endpoint configuration
See merge request pleroma/pleroma!312
2018-08-31 04:50:44 +00:00
de5bd6fc65
config: fix up defaults for s3 endpoint configuration
2018-08-31 04:43:15 +00:00
03ecbe0456
Merge branch 'update/pleroma-fe-20180831' into 'develop'
...
update pleroma frontend
See merge request pleroma/pleroma!311
2018-08-31 04:36:04 +00:00
2b4b4888a9
update pleroma frontend
2018-08-31 04:35:18 +00:00
d40466c291
Merge branch 'update/pleroma-fe-config-20180831' into 'develop'
...
config: chase pleroma-fe updates from MR pleroma-fe!324.
See merge request pleroma/pleroma!310
2018-08-31 04:06:18 +00:00
856b5e1ca4
config: chase pleroma-fe updates from MR pleroma-fe!324.
2018-08-31 04:01:21 +00:00
a26d5e6b2a
Merge branch 'feature/rich-text' into 'develop'
...
rich text support
See merge request pleroma/pleroma!309
2018-08-31 03:41:00 +00:00
e7871ed05e
tests: add tests for evil HTML filtering
2018-08-31 03:34:56 +00:00
6aa65b68b8
common api: add support for formatting messages outside of twitter-style plain text
2018-08-31 03:13:59 +00:00
lain