9304 Commits (78ff7e382103b1489e204d8fc3e02790a7d90b8d)
 

Author SHA1 Message Date
ThibG 62dd0b7f9c Fix processing poll Updates (#10333)
6 years ago
dependabot[bot] d66bbdd353 Bump puma from 3.12.0 to 3.12.1 (#10331)
6 years ago
dependabot[bot] 4f91c8510f Bump oj from 3.7.10 to 3.7.11 (#10332)
6 years ago
dependabot[bot] 88be18125e Bump capybara from 3.14.0 to 3.15.0 (#10330)
6 years ago
Eric 7169928f96 cas_options :validate_url should be :service_validate_url (#10328)
6 years ago
ThibG bde9196b70
Merge pull request #964 from ThibG/glitch-soc/merge-upstream
6 years ago
ThibG 8b5b686f08 [Glitch] Add support for custom emojis in poll options
6 years ago
Thibaut Girka cbf1d711ba Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
ThibG 80f0910e21 Add support for custom emojis in poll options (#10322)
6 years ago
ThibG 66d9452092 Do not try fetching keys of unknown accounts on a Delete from them (#10326)
6 years ago
ThibG 803c350ef5 [Glitch] Reduce padding around logo on landing page
6 years ago
Eugen Rochko 4d01d9c46f [Glitch] Add Keybase integration
6 years ago
Eugen Rochko 2a93c88015 [Glitch] Disable real-time updates on public pages to improve readability
6 years ago
Thibaut Girka 1d6152f440 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
ThibG 158c31b9df Reduce padding around logo on landing page (#10291)
6 years ago
dependabot[bot] 941b0adcae Bump aws-sdk-s3 from 1.32.0 to 1.33.0 (#10319)
6 years ago
dependabot[bot] c95e3a2e34 Bump rubocop from 0.65.0 to 0.66.0 (#10318)
6 years ago
ThibG 1217185cfa Do not distribute Delete when rejecting unapproved accounts (#10321)
6 years ago
ThibG d041b7a1e7 Do not show timeline preview or directory widgets if they are disabled (#10284)
6 years ago
Eugen Rochko 9d9b6e3543
Add missing locales (bn, ga, hi) (#10295)
6 years ago
Eugen Rochko 9c4cbdbafb
Add Keybase integration (#10297)
6 years ago
ThibG b9a998f201
Merge pull request #963 from ThibG/glitch-soc/merge-upstream
6 years ago
Eugen Rochko 42c581c458
Disable real-time updates on public pages to improve readability (#10260)
6 years ago
Eugen Rochko 841b920af5 [Glitch] Fix relationship manager on narrow screens
6 years ago
ThibG 200cd3b5a7 [Glitch] Save quick filter settings when selecting a different filter
6 years ago
Thibaut Girka 291012ec0c Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
dependabot[bot] f85b66eb8c Bump brakeman from 4.4.0 to 4.5.0 (#10309)
6 years ago
dependabot[bot] 2bdb6dac28 Bump httplog from 1.2.1 to 1.2.2 (#10311)
6 years ago
dependabot[bot] 14c6cbbf6b Bump pkg-config from 1.3.6 to 1.3.7 (#10310)
6 years ago
Eugen Rochko b8e4c85e69
Add dormant filter to relationship manager, rename other filters (#10308)
6 years ago
Eugen Rochko 7130d6e512
Fix relationship manager on narrow screens (#10293)
6 years ago
Ben Lubar c3d1594576 Reduce server load caused by anonymous viewing. (#9059)
6 years ago
ThibG a20354a20b Set and store report URIs (#10303)
6 years ago
ThibG 5e38ef87a7 Fix reblogs privacy (#10302)
6 years ago
Aditoo17 c92a1cf5c1 I18n: Fix Czech pluralization (#10301)
6 years ago
ThibG 7477db7268 Save quick filter settings when selecting a different filter (#10296)
6 years ago
mayaeh 97e5f739f7 Fix returned translations. (#10298)
6 years ago
ThibG 6e3a4bcbc7
Merge pull request #962 from ThibG/glitch-soc/merge-upstream
6 years ago
Thibaut Girka 8ea344fed4 Fix compilation after emoji-picker change
6 years ago
Nolan Lawson 49bea8c46b [Glitch] fix: update to emoji-mart 2.10.0
6 years ago
Eugen Rochko e900b03e38 [Glitch] Fix scrollbar styles on compose textarea, small bugs
6 years ago
Thibaut Girka 4aa6aba6ee Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 735b8be204
Weblate translations (2019-03-16) (#10294)
6 years ago
ThibG 6b0eda14a1 Avoid race condition when streaming deleted statuses (#10280)
6 years ago
Nolan Lawson db06b25376 fix: update to emoji-mart 2.10.0 (#10281)
6 years ago
Eugen Rochko 6a3f08661f
Fix scrollbar styles on compose textarea, small bugs (#10292)
6 years ago
ThibG 6af2300454
Merge pull request #961 from ThibG/glitch-soc/merge-upstream
6 years ago
Thibaut Girka 0fbe90e2d3 Fix settings/flavours
6 years ago
Eugen Rochko 47c8707f01 [Glitch] Add relationship manager UI
6 years ago
Thibaut Girka 8e5d72dba8 Fix relationships controller/view wrt. glitch-soc theming engine
6 years ago