Commit Graph

4302 Commits (55cf85376f7010b17b76a68726e2b6c3dc4de5f6)
 

Author SHA1 Message Date
William Pitcock 90facd3598 user view: add AP C2S oauth endpoints to local user profiles
6 years ago
Karen Konou bef9b9cb66 refactored code
6 years ago
Karen Konou adcdd21f16 Merge branch 'develop' into hellthread-filter-fix
6 years ago
rinpatch 99f955cd9e Merge branch 'mass-follow-fixes' into 'develop'
6 years ago
lain 88a4de24f9 User.follow_all: Respect blocks in both directions.
6 years ago
Maxim Filippov 760fec4cb8 Update token.ex
6 years ago
Maxim Filippov 62a45bdc11 Add revoke token
6 years ago
Maxim Filippov 61a4bc5095 Add OAuth tokens endpoint
6 years ago
kaniini 33f8f3c33a Merge branch 'doc/mark-streaming-feature-for-apps-2' into 'develop'
6 years ago
Hakaba Hitoyo 16b7c07115 Mark streaming feature for desktop apps in Clients.md
6 years ago
kaniini 4bdb2d44c2 Merge branch 'bugfix/mdii-uploader' into 'develop'
6 years ago
hakabahitoyo b7bc666200 bugfix mdii uploader
6 years ago
Karen Konou 1d727cd069 added checks for public url and follower collections
6 years ago
kaniini 0534463cef Merge branch 'feature/csp_mastofe-dev' into 'develop'
6 years ago
Haelwenn (lanodan) Monnier da4c662af3
Plugs.HTTPSecurityPlug: Add webpacker to connect-src
6 years ago
Haelwenn (lanodan) Monnier 00e8f0b07d
Plugs.HTTPSecurityPlug: Add unsafe-eval to script-src when in dev mode
6 years ago
Haelwenn (lanodan) Monnier 71ce564ecc
config/dev.exs: Don’t put secure cookies on dev
6 years ago
Haelwenn c71b3a1b12 Merge branch 'fix-csp-upgrade-insecure-requests-check' into 'develop'
6 years ago
Haelwenn e1983fca8d Merge branch 'doc/mark-streaming-feature-for-apps' into 'develop'
6 years ago
Hakaba Hitoyo 84f22d1cb8 Mark streaming feature for mobile/web apps in Clients.md
6 years ago
Mark Felder c984e8272a Formatting
6 years ago
Mark Felder 4956ab5ea3 Fix compile
6 years ago
Mark Felder ac7ef0999d WIP: Fix Twitter Cards
6 years ago
shibayashi ea1058929c
Use url[:scheme] instead of protocol to determine if https is enabled
6 years ago
kaniini 39548c3824 Merge branch 'bugfix/keyword-policy-check-summary' into 'develop'
6 years ago
rinpatch 379d04692c Filter summary in keywordpolicy
6 years ago
rinpatch 39383a6b79 Merge branch 'feature/thread-muting' into 'develop'
6 years ago
lambda 044616292b Merge branch 'feature/rich-media-limits' into 'develop'
6 years ago
Karen Konou ac72b578da Merge branch 'develop' into feature/thread-muting
6 years ago
Karen Konou c01ef574c1 Refactor as per Rin's suggestions, add endpoint tests
6 years ago
lambda 48552b38b2 Merge branch 'revert-e0de0fcf' into 'develop'
6 years ago
lambda d53e36bf1e Revert "Merge branch 'object-creation' into 'develop'"
6 years ago
Egor Kislitsyn 305d219413 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs
6 years ago
Haelwenn (lanodan) Monnier 74579115a7
test: Change `lenght(…) == 0` to `Enum.empty?(…)`
6 years ago
Haelwenn (lanodan) Monnier 8bb7e19b38
test: de-group alias/es
6 years ago
Haelwenn (lanodan) Monnier 89b6f255b4
.credo.exs: Add test directory as well
6 years ago
William Pitcock 45e57dd187 rich media: tighten fetching timeouts and size limits
6 years ago
kaniini 06c4935c11 Merge branch 'update-mastofe/glitch-soc-2019-02-10' into 'develop'
6 years ago
kaniini 5d34e5a51e Merge branch 'feather_mention' into 'develop'
6 years ago
kaniini 6c8d15da11 Merge branch 'fix/credo-issues' into 'develop'
6 years ago
kaniini 49b5f8d7c9 Merge branch 'update-service-files-of-openrc-and-systemd-to-new-recommended-paths' into 'develop'
6 years ago
shibayashi d1752a81a8 Update service files of OpenRC and systemd to new recommended paths
6 years ago
Haelwenn (lanodan) Monnier fcd8a2d0d6
Update Mastodon Frontend to 2019-02-10 bundle
6 years ago
succfemboi db407e4d50
add feather to webclients
6 years ago
lambda 57501defb4 Merge branch 'adapt-nginx-acme-path-to-guide-recommendation' into 'develop'
6 years ago
lambda 612ace96de Merge branch 'docs/pleroma-clients' into 'develop'
6 years ago
Haelwenn (lanodan) Monnier 94385313b5
docs/Clients.md: Add Nekonium
6 years ago
Haelwenn (lanodan) Monnier daa25f3403
docs/Clients.md: Add Twidere, Remove SubwayTooter, sort alphabetically
6 years ago
Haelwenn (lanodan) Monnier f2d5989ffa
docs/Clients.md: Add Social (GNOME)
6 years ago
Haelwenn (lanodan) Monnier 91a41ec670
docs/Clients.md: Add per-type sections
6 years ago