Mark Felder
|
f62c1d6266
|
Improve login error for OAuth flow
|
2019-02-13 22:33:22 +00:00 |
|
Ivan Tashkinov
|
063baca5e4
|
[#468] User UI for OAuth permissions restriction. Standardized storage format for scopes fields, updated usages.
|
2019-02-14 00:29:29 +03:00 |
|
William Pitcock
|
d54c483964
|
tests: add tests for endpoints
|
2019-02-13 19:48:24 +00:00 |
|
William Pitcock
|
9bd6ed975e
|
activitypub: user view: use route helpers instead of hardcoded URIs
|
2019-02-13 19:34:43 +00:00 |
|
William Pitcock
|
29e946ace4
|
activitypub: user view: add oauthRegistrationEndpoint to user profiles
|
2019-02-13 19:34:43 +00:00 |
|
William Pitcock
|
db8abd958d
|
activitypub: user view: fix up endpoints rendering
|
2019-02-13 19:34:43 +00:00 |
|
William Pitcock
|
dd989962e6
|
litepub schema: add oauthRegistrationEndpoint [ci skip]
|
2019-02-13 19:34:43 +00:00 |
|
William Pitcock
|
90facd3598
|
user view: add AP C2S oauth endpoints to local user profiles
|
2019-02-13 19:34:43 +00:00 |
|
|
|
bef9b9cb66
|
refactored code
|
2019-02-13 16:23:09 +01:00 |
|
|
|
adcdd21f16
|
Merge branch 'develop' into hellthread-filter-fix
|
2019-02-13 16:22:14 +01:00 |
|
rinpatch
|
99f955cd9e
|
Merge branch 'mass-follow-fixes' into 'develop'
User.follow_all: Respect blocks in both directions.
See merge request pleroma/pleroma!823
|
2019-02-13 13:04:23 +00:00 |
|
lain
|
88a4de24f9
|
User.follow_all: Respect blocks in both directions.
|
2019-02-13 13:52:27 +01:00 |
|
Maxim Filippov
|
760fec4cb8
|
Update token.ex
|
2019-02-13 12:59:56 +03:00 |
|
Maxim Filippov
|
62a45bdc11
|
Add revoke token
|
2019-02-13 12:59:56 +03:00 |
|
Maxim Filippov
|
61a4bc5095
|
Add OAuth tokens endpoint
|
2019-02-13 12:59:56 +03:00 |
|
kaniini
|
33f8f3c33a
|
Merge branch 'doc/mark-streaming-feature-for-apps-2' into 'develop'
Mark streaming feature for desktop apps in Clients.md
See merge request pleroma/pleroma!818
|
2019-02-13 07:51:14 +00:00 |
|
|
|
16b7c07115
|
Mark streaming feature for desktop apps in Clients.md
|
2019-02-13 07:51:14 +00:00 |
|
kaniini
|
4bdb2d44c2
|
Merge branch 'bugfix/mdii-uploader' into 'develop'
Bugfix for MDII Uploader
See merge request pleroma/pleroma!822
|
2019-02-13 07:32:56 +00:00 |
|
hakabahitoyo
|
b7bc666200
|
bugfix mdii uploader
|
2019-02-13 15:46:42 +09:00 |
|
|
|
1d727cd069
|
added checks for public url and follower collections
|
2019-02-13 00:01:34 +01:00 |
|
kaniini
|
0534463cef
|
Merge branch 'feature/csp_mastofe-dev' into 'develop'
Add CSP for mastofe development, remove secure-cookies in MIX_ENV=dev
See merge request pleroma/pleroma!820
|
2019-02-12 22:41:46 +00:00 |
|
Haelwenn (lanodan) Monnier
|
da4c662af3
|
Plugs.HTTPSecurityPlug: Add webpacker to connect-src
|
2019-02-12 22:12:12 +01:00 |
|
Haelwenn (lanodan) Monnier
|
00e8f0b07d
|
Plugs.HTTPSecurityPlug: Add unsafe-eval to script-src when in dev mode
This is needed to run dev mode mastofe at the same time
|
2019-02-12 22:12:11 +01:00 |
|
Haelwenn (lanodan) Monnier
|
71ce564ecc
|
config/dev.exs: Don’t put secure cookies on dev
|
2019-02-12 21:50:47 +01:00 |
|
Haelwenn
|
c71b3a1b12
|
Merge branch 'fix-csp-upgrade-insecure-requests-check' into 'develop'
Fix CSP check for 'upgrade-insecure-requests'
See merge request pleroma/pleroma!814
|
2019-02-12 02:44:23 +00:00 |
|
Haelwenn
|
e1983fca8d
|
Merge branch 'doc/mark-streaming-feature-for-apps' into 'develop'
Mark streaming feature for mobile/web apps in Clients.md
See merge request pleroma/pleroma!816
[ci skip]
|
2019-02-12 02:35:15 +00:00 |
|
|
|
84f22d1cb8
|
Mark streaming feature for mobile/web apps in Clients.md
|
2019-02-12 02:35:15 +00:00 |
|
shibayashi
|
ea1058929c
|
Use url[:scheme] instead of protocol to determine if https is enabled
|
2019-02-12 00:08:52 +01:00 |
|
kaniini
|
39548c3824
|
Merge branch 'bugfix/keyword-policy-check-summary' into 'develop'
Filter summary field in KeywordPolicy
See merge request pleroma/pleroma!812
|
2019-02-11 18:45:15 +00:00 |
|
rinpatch
|
379d04692c
|
Filter summary in keywordpolicy
|
2019-02-11 21:35:40 +03:00 |
|
rinpatch
|
39383a6b79
|
Merge branch 'feature/thread-muting' into 'develop'
Feature/thread muting
See merge request pleroma/pleroma!796
|
2019-02-11 15:02:14 +00:00 |
|
lambda
|
044616292b
|
Merge branch 'feature/rich-media-limits' into 'develop'
rich media: tighten fetching timeouts and size limits
See merge request pleroma/pleroma!809
|
2019-02-11 12:33:58 +00:00 |
|
|
|
ac72b578da
|
Merge branch 'develop' into feature/thread-muting
|
2019-02-11 12:10:49 +01:00 |
|
|
|
c01ef574c1
|
Refactor as per Rin's suggestions, add endpoint tests
|
2019-02-11 12:04:02 +01:00 |
|
lambda
|
48552b38b2
|
Merge branch 'revert-e0de0fcf' into 'develop'
Revert "Merge branch 'object-creation' into 'develop'"
See merge request pleroma/pleroma!810
|
2019-02-11 08:22:54 +00:00 |
|
lambda
|
d53e36bf1e
|
Revert "Merge branch 'object-creation' into 'develop'"
This reverts merge request !802
|
2019-02-11 08:07:39 +00:00 |
|
Egor Kislitsyn
|
305d219413
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs
# Conflicts:
# lib/pleroma/web/federator/federator.ex
# lib/pleroma/web/websub/websub.ex
|
2019-02-11 13:54:21 +07:00 |
|
Haelwenn (lanodan) Monnier
|
74579115a7
|
test: Change lenght(…) == 0 to Enum.empty?(…)
|
2019-02-11 03:44:16 +01:00 |
|
Haelwenn (lanodan) Monnier
|
8bb7e19b38
|
test: de-group alias/es
|
2019-02-11 03:44:15 +01:00 |
|
Haelwenn (lanodan) Monnier
|
89b6f255b4
|
.credo.exs: Add test directory as well
|
2019-02-10 22:56:47 +01:00 |
|
William Pitcock
|
45e57dd187
|
rich media: tighten fetching timeouts and size limits
|
2019-02-10 21:54:08 +00:00 |
|
kaniini
|
06c4935c11
|
Merge branch 'update-mastofe/glitch-soc-2019-02-10' into 'develop'
Update Mastodon Frontend to 2019-02-10 bundle
See merge request pleroma/pleroma!806
|
2019-02-10 21:28:41 +00:00 |
|
kaniini
|
5d34e5a51e
|
Merge branch 'feather_mention' into 'develop'
Add Feather to the clients list
See merge request pleroma/pleroma!804
|
2019-02-10 21:16:29 +00:00 |
|
kaniini
|
6c8d15da11
|
Merge branch 'fix/credo-issues' into 'develop'
Fix credo issues
See merge request pleroma/pleroma!786
|
2019-02-10 20:54:21 +00:00 |
|
kaniini
|
49b5f8d7c9
|
Merge branch 'update-service-files-of-openrc-and-systemd-to-new-recommended-paths' into 'develop'
Update service files of OpenRC and systemd to new recommended paths
See merge request pleroma/pleroma!798
|
2019-02-10 19:25:34 +00:00 |
|
shibayashi
|
d1752a81a8
|
Update service files of OpenRC and systemd to new recommended paths
|
2019-02-10 19:25:34 +00:00 |
|
Haelwenn (lanodan) Monnier
|
fcd8a2d0d6
|
Update Mastodon Frontend to 2019-02-10 bundle
See: https://git.pleroma.social/pleroma/mastofe/tags/bundle-2019-02-10
[ci skip]
|
2019-02-10 19:55:22 +01:00 |
|
succfemboi
|
db407e4d50
|
add feather to webclients
|
2019-02-10 16:18:04 +01:00 |
|
lambda
|
57501defb4
|
Merge branch 'adapt-nginx-acme-path-to-guide-recommendation' into 'develop'
Recommend the acme-challenge path that is used in the installation guides
See merge request pleroma/pleroma!803
|
2019-02-10 14:21:12 +00:00 |
|
lambda
|
612ace96de
|
Merge branch 'docs/pleroma-clients' into 'develop'
docs/Clients.md: Add documentation about clients supporting pleroma
See merge request pleroma/pleroma!726
|
2019-02-10 13:47:26 +00:00 |
|
