feld
|
e7837bc14e
|
Merge branch 'fix/signup-without-email' into 'develop'
Allow account registration without an email
See merge request pleroma/pleroma!2246
|
5 years ago |
lain
|
4bce13fa2f
|
MastodonController: Return 404 errors correctly.
|
5 years ago |
lain
|
6f7a8c43a2
|
Merge branch 'fix/no-email-no-fail' into 'develop'
Do not fail when user has no email
See merge request pleroma/pleroma!2249
|
5 years ago |
Mark Felder
|
05da5f5cca
|
Update Copyrights
|
5 years ago |
Haelwenn (lanodan) Monnier
|
6da6540036
|
Bump copyright years of files changed after 2020-01-07
Done via the following command:
git diff fcd5dd259a --stat --name-only | xargs sed -i '/Pleroma Authors/c# Copyright © 2017-2020 Pleroma Authors <https:\/\/pleroma.social\/>'
|
5 years ago |
Ivan Tashkinov
|
6f2efb1c45
|
Runtime configurability of RateLimiter. Refactoring. Disabled default rate limits in tests.
|
5 years ago |
Egor Kislitsyn
|
cb60a9c42f
|
Do not fail when user has no email
|
5 years ago |
lain
|
cf4ecffcea
|
Merge branch 'tests-clear-config-tweaks' into 'develop'
Tweaks to `clear_config` calls in tests
See merge request pleroma/pleroma!2209
|
5 years ago |
Ivan Tashkinov
|
226f4d5ef9
|
Merge remote-tracking branch 'remotes/origin/develop' into tests-clear-config-tweaks
# Conflicts:
# test/web/admin_api/admin_api_controller_test.exs
|
5 years ago |
Egor Kislitsyn
|
ca7ac068f0
|
Add a test
|
5 years ago |
Haelwenn (lanodan) Monnier
|
1257331291
|
MastodonAPI.StatusView: Do not use site_name
site_name allow to spoof the origin of the domain and so hacks like:
<!-- served on https://hacktivis.me/tmp/joinmastodon.org.html -->
<meta property="og:image" content="https://hacktivis.me/datalove/img/meme/pleroma/mastodon%2C%20forbidden%20amuse%20yourself.jpeg" />
<meta property="og:title" content="Mastodon: Forbidden Amuse Yourself" />
<meta property="og:site_name" content="joinmastodon.org" />
<meta http-equiv="refresh" content="0; url=http://joinmastodon.org/">
|
5 years ago |
Ivan Tashkinov
|
4f8c3462a8
|
Tweaks to `clear_config` calls in tests in order to prevent side effects on config during test suite execution.
|
5 years ago |
Egor Kislitsyn
|
19516af74e
|
Fix `status.expires_in` validation
|
5 years ago |
lain
|
24c526a0b1
|
Merge remote-tracking branch 'origin/develop' into uguu-uwu-notices-bulge
|
5 years ago |
Maksim Pechnikov
|
6813c0302c
|
Merge branch 'develop' into issue/1383
|
5 years ago |
Haelwenn
|
1262357ddb
|
Merge branch 'cancel-follow-request' into 'develop'
Add support for cancellation of a follow request
Closes #1522
See merge request pleroma/pleroma!2175
|
5 years ago |
Lain Soykaf
|
d85bcc8627
|
Questions: Add timezone to `closed` property
|
5 years ago |
Lain Soykaf
|
f875b9650a
|
EmojiReactions: Add Mastodon-aligned reaction endpoints, change response
|
5 years ago |
Lain Soykaf
|
8a79f20c21
|
EmojiReactions: Rename to EmojiReacts
|
5 years ago |
feld
|
df0b00b32d
|
Merge branch 'mastoapi-non-html-strings' into 'develop'
mastodon API: do not sanitize html in non-html fields
See merge request pleroma/pleroma!2167
|
5 years ago |
Egor Kislitsyn
|
8c71f7e11a
|
Add support for cancellation of a follow request
|
5 years ago |
Maksim Pechnikov
|
2c40c8b4a2
|
Merge branch 'develop' into issue/1383
|
5 years ago |
rinpatch
|
983a87175e
|
mastodon API: do not sanitize html in non-html fields
|
5 years ago |
rinpatch
|
c27d1d65bf
|
Merge branch 'fix/disable-rate-limiter-for-socket-localhost' into 'develop'
Disable rate limiter for socket/localhost
Closes #1380
See merge request pleroma/pleroma!2064
|
5 years ago |
rinpatch
|
5b62acf6e9
|
Merge branch 'develop' into fix/disable-rate-limiter-for-socket-localhost
|
5 years ago |
lain
|
a802e07241
|
Emoji Reactions: Add `reacted` field to emoji reactions
|
5 years ago |
Maksim Pechnikov
|
21a2a05407
|
Merge branch 'develop' into issue/1383
|
5 years ago |
Maksim Pechnikov
|
02c3dd2e3d
|
update ecto
|
5 years ago |
Hakaba Hitoyo
|
dabd535e43
|
Remove user recommendation by third party engine
|
5 years ago |
Maksim Pechnikov
|
bfc70fdf29
|
Merge branch 'develop' into issue/1383
|
5 years ago |
lain
|
347f3ed2c6
|
Emoji reactions: Change api format once more
|
5 years ago |
Maksim Pechnikov
|
5fc2fa8908
|
Merge branch 'develop' into issue/1383
|
5 years ago |
lain
|
615b72238e
|
Notifications: Add emoji reaction notifications
|
5 years ago |
Maksim Pechnikov
|
cf19bf3c7c
|
Merge branch 'develop' into issue/1383
|
5 years ago |
lain
|
dd3fc50ea4
|
Emoji reactions: Change cache and reply format
|
5 years ago |
Maksim Pechnikov
|
b8d5c09f48
|
Merge branch 'develop' into issue/1383
|
5 years ago |
rinpatch
|
04c9ca5d68
|
Merge branch 'emoji-reaction-extensions' into 'develop'
StatusView: Add `emoji_reactions`
See merge request pleroma/pleroma!2120
|
5 years ago |
Maksim Pechnikov
|
6e88a7e591
|
exclude blocked user posts from search results
|
5 years ago |
lain
|
7d8b709d29
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into emoji-reaction-extensions
|
5 years ago |
lain
|
4c5b5f14dc
|
StatusView: Add `emoji_reactions`
|
5 years ago |
lain
|
2199d63ddc
|
StatusControllerTest: Fix typo
|
5 years ago |
lain
|
510776ba31
|
CommonAPI: Don't error out on double favs/repeats
|
5 years ago |
Egor Kislitsyn
|
023b7f605b
|
Fix notification controller test
|
5 years ago |
Egor Kislitsyn
|
3849053c6a
|
Merge branch 'develop' into notifications-from-account
|
5 years ago |
Maksim Pechnikov
|
b7908844f2
|
Merge branch 'develop' into issue/1383
|
5 years ago |
Maksim Pechnikov
|
54c9db38c8
|
Merge branch 'develop' into issue/1383
|
5 years ago |
Maxim Filippov
|
e71a13ad57
|
Revert "Merge branch 'feature/status-counts-by-scope' into 'develop'"
This reverts merge request !2076
|
5 years ago |
feld
|
a54aa5af43
|
Merge branch 'feature/status-counts-by-scope' into 'develop'
Stats: return status counts by scope
See merge request pleroma/pleroma!2076
|
5 years ago |
Ivan Tashkinov
|
ead2d18826
|
Merge remote-tracking branch 'remotes/origin/develop' into oauth-scopes-tweaks-and-tests
|
5 years ago |
Ivan Tashkinov
|
455e072d27
|
[#2068] Introduced proper OAuth tokens usage to controller tests.
|
5 years ago |