about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2019-09-09Use the `Icon` component instead of directly using `i` tagThibaut Girka
2019-09-09Use upstream's Icon componentThibaut Girka
Rework the codebase to avoid unnecessary differences with upstream
2019-09-09Move “export” before decoratorsThibaut Girka
As this is what upstream does. See also https://github.com/tc39/proposal-decorators/issues/69
2019-09-09glitch: fix webpack build failure in columns_area.js (#1212)Rey Tucker
Fixes #1212 by copying what works in the mainline flavor.
2019-09-06Merge pull request #1211 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2019-09-05[Glitch] Fix line breaks in hashtag autosuggestions in web UIEugen Rochko
Port 7db2c2e2ba049845bdfdbf9931ffae6ae5ccddd3 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-05[Glitch] Exclude URLs from text analysisMostafa Ahangarha
Port e974d4923fabd887416609bc6c8ca81ce81d0ff2 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-05[Glitch] Fix wrong sum of usage in hashtag component in web UIEugen Rochko
Port a6a63358c3fd81b9104aa0a51133cd065eea4a84 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-05[Glitch] Fix wrong pluralization in hashtag component in web UIEugen Rochko
Port 1a00bd9244ee8555d7401f4f0ee01ec381e96c1c to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-05[Glitch] Change hashtag component in web UI to show numbers for 2 last daysEugen Rochko
Port d19d86fe2b26fb00577d600234c32d726fb199a4 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-05[Glitch] Fix uncached media in web UI not being clickableEugen Rochko
Port 34adc8784a3f165a4bd5719a067093f703f499e9 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-05[Glitch] Integrate translation strings for the Profile Directory.mayaeh
Port 1f22b8197cb961371fa761e1fa214d4f4a2074d1 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-05[Glitch] Fix Mastodon logo style on hover on public pages' footerThibG
Port 0ea53122f2a0db726afe96cfedd8e7fe3d930e0a to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-05[Glitch] Fix height of dashboard countersThibG
Port 6493f4ffaea9ae391a9cc24e2743531fd0c3a3e8 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-05[Glitch] Fix custom emoji animation on hover in WebUI directory biosThibG
Port 34eac5a1ecab250760bec1f703ddf828670210fa to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-05[Glitch] Add "not available" label on unknown media attachmentsEugen Rochko
Port d3442894310022062debc4c6ed6b117f8bc3904b to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-05Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-09-05Fix NotificationMailer failing when receiving mention with media from remote ↵mayaeh
instance (#11765)
2019-09-05Fix line breaks in hashtag autosuggestions in web UI (#11764)Eugen Rochko
2019-09-05Fix wrong variable regression from #11753 (#11763)Eugen Rochko
2019-09-05Attempt to concurrently connect to remote IP addresses (#11757)ThibG
* Attempt to concurrently connect to remote IP addresses * Reduce code length to please CodeClimate 🤷
2019-09-05Bump addressable from 2.6.0 to 2.7.0 (#11732)dependabot-preview[bot]
Bumps [addressable](https://github.com/sporkmonger/addressable) from 2.6.0 to 2.7.0. - [Release notes](https://github.com/sporkmonger/addressable/releases) - [Changelog](https://github.com/sporkmonger/addressable/blob/master/CHANGELOG.md) - [Commits](https://github.com/sporkmonger/addressable/compare/addressable-2.6.0...addressable-2.7.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-05Bump capistrano from 3.11.0 to 3.11.1 (#11731)dependabot-preview[bot]
* Bump capistrano from 3.11.0 to 3.11.1 Bumps [capistrano](https://github.com/capistrano/capistrano) from 3.11.0 to 3.11.1. - [Release notes](https://github.com/capistrano/capistrano/releases) - [Changelog](https://github.com/capistrano/capistrano/blob/master/CHANGELOG.md) - [Commits](https://github.com/capistrano/capistrano/compare/v3.11.0...v3.11.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> * 3.11.1
2019-09-04Exclude URLs from text analysis (#11759)Mostafa Ahangarha
By the added regex, URLs, including the one without http or even www like mysite.com will be removed from the toot's body so only the real text of the toot will be analyzed for RTL detection
2019-09-04Add PERSISTENT_TIMEOUT option (#11756)Yamagishi Kazutoshi
Add environment variable to so `persistent_timeout` option of puma can be changed.
2019-09-05Bump aws-sdk-s3 from 1.46.0 to 1.48.0 (#11729)dependabot-preview[bot]
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.46.0 to 1.48.0. - [Release notes](https://github.com/aws/aws-sdk-ruby/releases) - [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-ruby/compare/v1.46.0...v1.48.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-05Bump rubocop-rails from 2.3.1 to 2.3.2 (#11728)dependabot-preview[bot]
Bumps [rubocop-rails](https://github.com/rubocop-hq/rubocop-rails) from 2.3.1 to 2.3.2. - [Release notes](https://github.com/rubocop-hq/rubocop-rails/releases) - [Changelog](https://github.com/rubocop-hq/rubocop-rails/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop-hq/rubocop-rails/compare/v2.3.1...v2.3.2) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-05Bump bootsnap from 1.4.4 to 1.4.5 (#11730)dependabot-preview[bot]
Bumps [bootsnap](https://github.com/Shopify/bootsnap) from 1.4.4 to 1.4.5. - [Release notes](https://github.com/Shopify/bootsnap/releases) - [Changelog](https://github.com/Shopify/bootsnap/blob/master/CHANGELOG.md) - [Commits](https://github.com/Shopify/bootsnap/compare/v1.4.4...v1.4.5) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-05Bump faker from 2.1.2 to 2.2.1 (#11733)dependabot-preview[bot]
Bumps [faker](https://github.com/faker-ruby/faker) from 2.1.2 to 2.2.1. - [Release notes](https://github.com/faker-ruby/faker/releases) - [Changelog](https://github.com/faker-ruby/faker/blob/master/CHANGELOG.md) - [Commits](https://github.com/faker-ruby/faker/compare/v2.1.2...v2.2.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-05Bump webmock from 3.6.2 to 3.7.1 (#11734)dependabot-preview[bot]
Bumps [webmock](https://github.com/bblimke/webmock) from 3.6.2 to 3.7.1. - [Release notes](https://github.com/bblimke/webmock/releases) - [Changelog](https://github.com/bblimke/webmock/blob/master/CHANGELOG.md) - [Commits](https://github.com/bblimke/webmock/compare/v3.6.2...v3.7.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-04Fix loading more items in account following/followersThibaut Girka
2019-09-04Fix wrong sum of usage in hashtag component in web UI (#11755)Eugen Rochko
1 + 1 = 11
2019-09-04Fix wrong pluralization in hashtag component in web UI (#11754)Eugen Rochko
2019-09-04Change account deletion page to have better explanations (#11753)Eugen Rochko
Fix deletion of unconfirmed account not freeing up the username Add prefill of logged-in user's email in the reconfirmation form
2019-09-03Fix admin interface showing superfluous reject media/reports on suspended ↵ThibG
blocks (#11749) * Fix admin interface showing superfluous reject media/reports on suspended domains * Fix reject media/reports checkboxes being visible when editing domain block of suspend severity
2019-09-03Fix ActivityPub context not being dynamically computed (#11746)ThibG
* Fix contexts not being dynamically included Fixes #11649 * Refactor Note context in serializer * Refactor Actor serializer
2019-09-03Fix error in admin UI for hashtag usage breakdown (#11743)Eugen Rochko
2019-09-03Change hashtag component in web UI to show numbers for 2 last days (#11742)Eugen Rochko
To deal with the midnight problem
2019-09-03Fix error in user warning template (#11741)Eugen Rochko
2019-09-03Fix user preference to show trends not working on public pages (#11740)Eugen Rochko
Fix #11738
2019-09-03Change OpenGraph description on sign-up page to reflect invite (#11744)Eugen Rochko
2019-09-03Fix uncached media in web UI not being clickable (#11745)Eugen Rochko
2019-09-02Add SMTP reply_to option (#11718)Hugo Gameiro
* Add SMTP_REPLY_TO in .env.production.sample * Set reply_to in SMTP options
2019-09-02Integrate translation strings for the Profile Directory. (#11722)mayaeh
Run `yarn manage:translations en`
2019-09-02Fix Mastodon logo style on hover on public pages' footer (#11735)ThibG
Fixes #11690
2019-09-02Fix height of dashboard counters (#11736)ThibG
2019-09-02Change trending hashtags to not disappear instantly after midnight (#11712)Eugen Rochko
2019-09-02Bump babel-eslint from 10.0.2 to 10.0.3 (#11723)dependabot-preview[bot]
Bumps [babel-eslint](https://github.com/babel/babel-eslint) from 10.0.2 to 10.0.3. - [Release notes](https://github.com/babel/babel-eslint/releases) - [Commits](https://github.com/babel/babel-eslint/compare/v10.0.2...v10.0.3) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-02Bump @babel/plugin-transform-runtime from 7.4.4 to 7.5.5 (#11725)dependabot-preview[bot]
Bumps [@babel/plugin-transform-runtime](https://github.com/babel/babel) from 7.4.4 to 7.5.5. - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md) - [Commits](https://github.com/babel/babel/compare/v7.4.4...v7.5.5) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-02[Glitch] Add header to trends section and change refresh rate to 15 minutesEugen Rochko
Port 4ef8d8b77c596680be13b26400bc2a09038928de to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>