135 Commits (f0a2a6c875e9294f0ea1d4c6bc90529e41a2dc37)

Author SHA1 Message Date
Ondřej Hruška 83bda6c1a8
Merge commit 'b9f59ebcc68e9da0a7158741a1a2ef3564e1321e' into merging-upstream
7 years ago
Ondřej Hruška 9330ea1f4d
Merge commit '4aea3f88a6d30f102a79c2da7fcfac96465ba1a8' into merging-upstream
7 years ago
Akihiko Odaki 0de82dd316 Do not filter statuses with unknown languages (#5045)
7 years ago
Eugen Rochko 81cec35dbf Custom emoji (#4988)
7 years ago
unarist dd6f9a1b82 Validate uri presence for remote status (#4985)
7 years ago
Akihiko Odaki 198a9a4fa4 Remove local_only scope in Status (#4977)
7 years ago
Surinna Curtis d880b3182b minor code style fixes oops
7 years ago
Surinna Curtis 0f2af2a974 Add specs for how mute! interacts with muting_notifications?
7 years ago
Eugen Rochko 9239e4ce4d Uploads for admin site settings (#4913)
7 years ago
David Yip 67ad453373 Merge tag 'v1.6.0rc4' into sync/upstream-1.6.0rc4
7 years ago
David Yip 514fc908a3 Merge tag 'v1.6.0rc3' into sync/upstream
7 years ago
David Yip b9f7bc149b Merge branch 'origin/master' into sync/upstream
7 years ago
voidSatisfaction 8185f98872 Feat add validation for report comment: characters under 1000 valid (#4833)
7 years ago
Eugen Rochko e7adbf572a Switch to static URIs, new URI format in both protocols for new statuses (#4815)
7 years ago
abcang 6ec1aa372d Validate data of Imports (#4782)
7 years ago
Eugen Rochko 9caa90025f Pinned statuses (#4675)
7 years ago
Colin Mitchell 871c0d251a Application prefs section (#2758)
7 years ago
Eugen Rochko 3534e115e5 Do not try to re-subscribe to unsubscribed accounts (#4653)
7 years ago
kibigo! 8150689b48 Merge upstream (#111)
7 years ago
Eugen Rochko 53b2b1b238 Count all URLs in text as 23 characters flat, do not count domain part of usernames (#4427)
7 years ago
Ondřej Hruška d69fa9e1f4 Merge changes from upstream with the CSS reload fix
7 years ago
Yamagishi Kazutoshi 3267e4a785 Add unfollow modal (optional) (#4246)
7 years ago
abcang 4d42a38954 Improve admin page (#4121)
7 years ago
kibigo! 09cfc079b0 Merge upstream (#81)
7 years ago
masarakki a49be27145 add validation to tag name (#4194)
7 years ago
Sorin Davidoi 0c7c188c45 Web Push Notifications (#3243)
7 years ago
unarist c2753fdfb4 Make tag search case insensitive again (#4184)
7 years ago
kibigo! 79d898ae0a Merge upstream!! #64 <3 <3
7 years ago
Damien Erambert 18d3fa953b Add a setting allowing the use of system's default font in Web UI (#4033)
7 years ago
Akihiko Odaki (@fn_aki@pawoo.net) f85dbe83c8 Remove sort in Feed (#4050)
7 years ago
Akihiko Odaki (@fn_aki@pawoo.net) 7d8e3721ae Overwrite old statuses with reblogs in PrecomputeFeedService (#3984)
7 years ago
beatrix-bitrot 49ba78d6f8 fix account spec broken by change to 500char bios
7 years ago
Sorin Davidoi 2211e8d1cd Revocable sessions (#3616)
7 years ago
Eugen Rochko 3f59238207 Add important test for full-width hashtags (#3911)
7 years ago
Akihiko Odaki (@fn_aki@pawoo.net) e27f792c24 Some minor change and spec for Account (#3813)
7 years ago
Eugen Rochko 0190aac240 Fix regression from #3842 (#3892)
7 years ago
Akihiko Odaki (@fn_aki@pawoo.net) bab5a18232 Filter direct statuses in Status.as_home_timeline (#3842)
7 years ago
Akihiko Odaki (@fn_aki@pawoo.net) 3d13f6ea0c Cover Block more (#3837)
7 years ago
Akihiko Odaki (@fn_aki@pawoo.net) 6eefccdacc Cover DomainBlock more (#3838)
7 years ago
Akihiko Odaki (@fn_aki@pawoo.net) d55f207274 Cover Export more (#3840)
7 years ago
Akihiko Odaki (@fn_aki@pawoo.net) 05e4728de7 Cover Favourite more (#3841)
7 years ago
Akihiko Odaki (@fn_aki@pawoo.net) b51945f096 Spec AccountDomainBlock (#3816)
7 years ago
Eugen Rochko dc8a6244fc Fix #2619 - When redis feed is empty, fall back to database (#3721)
7 years ago
Eugen Rochko c207b4bb33 Fix db:seed - only run some validations when the field was changed (#3592)
7 years ago
Yamagishi Kazutoshi 0a0b9a271a Improve RuboCop rules (compatibility to Code Climate) (#3636)
7 years ago
unarist 0f1b1d78b1 Use "match_array" only for order independent assertions (#3626)
7 years ago
unarist 004672aa6c Fix tag search order and not to use tsvector (#3611)
7 years ago
Matt Jankowski 6201f96b8a Introduce StatusThreadingConcern (#3490)
7 years ago
Eugen Rochko f7a30e2fae Added support for configurable reserved usernames (fix of #1382) (#3566)
7 years ago
Akihiko Odaki (@fn_aki@pawoo.net) 42844df966 Spec ScopedSettings (#3559)
7 years ago