Age | Commit message (Collapse) | Author | |
---|---|---|---|
2020-02-20 | Merge branch 'single_emoji_reaction' into 'develop' | Haelwenn | |
Single emoji reaction Closes #1578 See merge request pleroma/pleroma!2226 | |||
2020-02-20 | Merge branch 'features/remote-follow-userpage-redirect' into 'develop' | lain | |
remote_follow_controller.ex: Redirect to the user page on success Closes #1245 See merge request pleroma/pleroma!2123 | |||
2020-02-20 | Merge remote-tracking branch 'remotes/origin/develop' into ↵ | Ivan Tashkinov | |
1505-threads-federation # Conflicts: # config/config.exs | |||
2020-02-20 | Merge branch 'tests-clear-config-tweaks' into 'develop' | lain | |
Tweaks to `clear_config` calls in tests See merge request pleroma/pleroma!2209 | |||
2020-02-19 | Pleroma API: Add endpoint to get reaction information on a single emoji | lain | |
2020-02-18 | Merge branch 'fix/status-view/expires_at' into 'develop' | lain | |
Fix `status.expires_at` type Closes #1573 See merge request pleroma/pleroma!2222 | |||
2020-02-18 | Merge remote-tracking branch 'remotes/origin/develop' into ↵ | Ivan Tashkinov | |
tests-clear-config-tweaks # Conflicts: # test/web/admin_api/admin_api_controller_test.exs | |||
2020-02-18 | Merge remote-tracking branch 'remotes/origin/develop' into ↵ | Ivan Tashkinov | |
1505-threads-federation | |||
2020-02-18 | Merge branch 'need-reboot-flag' into 'develop' | lain | |
need_reboot flag for adminFE See merge request pleroma/pleroma!2188 | |||
2020-02-18 | Add a test | Egor Kislitsyn | |
2020-02-16 | Use floki's new APIs for parsing fragments | rinpatch | |
2020-02-15 | [#1505] Restricted max thread distance for fetching replies on incoming ↵ | Ivan Tashkinov | |
federation (in addition to reply-to depth restriction). | |||
2020-02-15 | MastodonAPI.StatusView: Do not use site_name | Haelwenn (lanodan) Monnier | |
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/"> | |||
2020-02-13 | Tweaks to `clear_config` calls in tests in order to prevent side effects on ↵ | Ivan Tashkinov | |
config during test suite execution. | |||
2020-02-13 | Merge branch 'develop' into 'fix/rename-no_attachment_links-setting' | feld | |
# Conflicts: # config/description.exs | |||
2020-02-12 | Fix `status.expires_in` validation | Egor Kislitsyn | |
2020-02-11 | Fix the confusingly named and inverted logic of "no_attachment_links" | Mark Felder | |
The setting is now simply "attachment_links" and the boolean value does what you expect. A double negative is never possible and describing the functionality is no longer a philospher's worst nightmare. | |||
2020-02-12 | Restore TwitterAPI tests | Egor Kislitsyn | |
2020-02-11 | Revert "Merge branch 'feat/floki-fasthtml' into 'develop'" | feld | |
This reverts merge request !2194 | |||
2020-02-11 | Make Floki use fast_html | rinpatch | |
2020-02-11 | Merge remote-tracking branch 'origin/develop' into uguu-uwu-notices-bulge | lain | |
2020-02-10 | Merge branch 'develop' into issue/1383 | Maksim Pechnikov | |
2020-02-10 | [#1505] Improved replies-handling tests: updated Mastodon message fixture, ↵ | Ivan Tashkinov | |
used exact Pleroma federation message. | |||
2020-02-09 | [#1505] Removed wrapping of reply URIs into `first` element, added comments ↵ | Ivan Tashkinov | |
to transmogrifier tests. | |||
2020-02-09 | [#1505] Fixed `replies` serialization (included objects' ids instead of ↵ | Ivan Tashkinov | |
activities' ids). | |||
2020-02-08 | Merge remote-tracking branch 'remotes/origin/develop' into ↵ | Ivan Tashkinov | |
1505-threads-federation | |||
2020-02-08 | [#1505] Added tests, changelog entry, tweaked config settings related to ↵ | Ivan Tashkinov | |
replies output on outgoing federation. | |||
2020-02-08 | need_reboot flag | Alexander Strizhakov | |
2020-02-07 | Merge branch 'cancel-follow-request' into 'develop' | Haelwenn | |
Add support for cancellation of a follow request Closes #1522 See merge request pleroma/pleroma!2175 | |||
2020-02-07 | Questions: Add timezone to `closed` property | Lain Soykaf | |
2020-02-07 | EmojiReactions: Remove old API endpoints | Lain Soykaf | |
2020-02-07 | EmojiReactions: Add Mastodon-aligned reaction endpoints, change response | Lain Soykaf | |
2020-02-07 | Add User.get_follow_state/2 | Egor Kislitsyn | |
2020-02-06 | EmojiReactions: Rename to EmojiReacts | Lain Soykaf | |
2020-02-06 | Merge branch 'mastoapi-non-html-strings' into 'develop' | feld | |
mastodon API: do not sanitize html in non-html fields See merge request pleroma/pleroma!2167 | |||
2020-02-06 | Cancellation of a follow request for a remote user | Egor Kislitsyn | |
2020-02-06 | removing confusing error | Alexander Strizhakov | |
2020-02-05 | Merge branch 'fix/unpinnable-polls' into 'develop' | rinpatch | |
fix not being able to pin polls See merge request pleroma/pleroma!2172 | |||
2020-02-05 | removing migrate_from_db endpoint from admin api | Alexander Strizhakov | |
2020-02-05 | Merge branch 'feature/restart-pleroma-from-outside-application' into 'develop' | rinpatch | |
Restarting pleroma from outside application See merge request pleroma/pleroma!2144 | |||
2020-02-05 | Add support for cancellation of a follow request | Egor Kislitsyn | |
2020-02-05 | Merge remote-tracking branch 'remotes/origin/develop' into ↵ | Ivan Tashkinov | |
1505-threads-federation | |||
2020-02-03 | Merge branch 'develop' into issue/1383 | Maksim Pechnikov | |
2020-02-02 | fix not being able to pin polls | rinpatch | |
2020-02-02 | mastodon API: do not sanitize html in non-html fields | rinpatch | |
2020-01-30 | Merge branch 'fix/disable-rate-limiter-for-socket-localhost' into 'develop' | rinpatch | |
Disable rate limiter for socket/localhost Closes #1380 See merge request pleroma/pleroma!2064 | |||
2020-01-30 | Merge branch 'develop' into fix/disable-rate-limiter-for-socket-localhost | rinpatch | |
2020-01-30 | Emoji Reactions: Actually use the validation. | lain | |
2020-01-30 | Merge branch 'emoji-api-errors' into 'develop' | feld | |
Emoji api error if emoji dir is not writable Closes admin-fe#62 See merge request pleroma/pleroma!2161 | |||
2020-01-30 | Merge branch 'emoji-reactions-reacted' into 'develop' | rinpatch | |
Emoji reactions: Add `reacted` field See merge request pleroma/pleroma!2160 |