Tykayn
8dc4088c88
style on homepage bliss
2022-03-29 11:38:56 +02:00
Tykayn
7bac99c844
fix some compose form errors
2022-03-29 10:40:41 +02:00
Tykayn
b8723f3fce
up char limit to 7777
2022-03-29 10:37:54 +02:00
Tykayn
8f91509323
up from glitch
2022-03-29 10:14:34 +02:00
Tykayn
7e3c5d1ec8
integrate glitch
2022-03-29 10:12:39 +02:00
Claire
2287eebae0
Fix description of “Allow posts with Content Warnings to trend” setting
2022-03-24 09:49:15 +01:00
Claire
6f032076ed
Merge pull request #1721 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2022-03-23 15:56:24 +01:00
Eugen Rochko
6391a869ae
[Glitch] Fix color of show more link in report dialog in web UI
...
Port 69f9dc4f4e
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-03-23 09:32:59 +01:00
Claire
276b26b614
Merge branch 'main' into glitch-soc/merge-upstream
2022-03-23 08:52:41 +01:00
Claire
749fe73ec4
Add tooltip for instance delivery warnings ( #17854 )
2022-03-22 18:41:46 +01:00
Eugen Rochko
8751c3c495
Fix crash when search fails in web UI ( #17853 )
2022-03-22 18:20:25 +01:00
Eugen Rochko
2de44d3e47
Fix regression of status colors in actions modal in web UI ( #17851 )
...
Regression in #17844
2022-03-22 18:20:08 +01:00
Claire
b475c8ab97
Fix minor issues in v3.5.0rc1 changelog ( #17852 )
2022-03-22 18:08:08 +01:00
Eugen Rochko
33e7ef4d3d
[Glitch] Fix wrong position of fade-out element in account card in web UI
...
Port d5df9d4797
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-03-22 18:00:38 +01:00
Eugen Rochko
91e6df7026
[Glitch] Add hint about missing media attachment description in web UI
...
Port 4e9855e09a
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-03-22 17:55:17 +01:00
Claire
59864ff495
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/dependabot.yml`:
Upstream modified it, but we deleted it in glitch-soc.
Keep it deleted.
2022-03-22 17:00:38 +01:00
Eugen Rochko
67d550830b
Fix locale not being set in REST API ( #17847 )
2022-03-22 12:29:04 +01:00
Eugen Rochko
410989e081
Change frequency of trends review notifications from 2 hours to 6 hours ( #17850 )
2022-03-22 11:58:25 +01:00
Eugen Rochko
d5df9d4797
Fix wrong position of fade-out element in account card in web UI ( #17846 )
2022-03-22 11:58:13 +01:00
Eugen Rochko
392b367835
Fix IDN domains not being rendered correctly in a few left-over places ( #17848 )
2022-03-22 10:07:11 +01:00
Eugen Rochko
4e9855e09a
Add hint about missing media attachment description in web UI ( #17845 )
2022-03-22 09:48:12 +01:00
Eugen Rochko
69f9dc4f4e
Fix color of show more link in report dialog in web UI ( #17844 )
2022-03-22 06:08:05 +01:00
dependabot[bot]
890fae8b54
Bump eslint-plugin-react from 7.29.3 to 7.29.4 ( #17837 )
...
Bumps [eslint-plugin-react](https://github.com/yannickcr/eslint-plugin-react ) from 7.29.3 to 7.29.4.
- [Release notes](https://github.com/yannickcr/eslint-plugin-react/releases )
- [Changelog](https://github.com/yannickcr/eslint-plugin-react/blob/master/CHANGELOG.md )
- [Commits](https://github.com/yannickcr/eslint-plugin-react/compare/v7.29.3...v7.29.4 )
---
updated-dependencies:
- dependency-name: eslint-plugin-react
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-03-22 11:30:56 +09:00
dependabot[bot]
883a7918be
Bump letter_opener from 1.7.0 to 1.8.1 ( #17838 )
...
Bumps [letter_opener](https://github.com/ryanb/letter_opener ) from 1.7.0 to 1.8.1.
- [Release notes](https://github.com/ryanb/letter_opener/releases )
- [Changelog](https://github.com/ryanb/letter_opener/blob/master/CHANGELOG.md )
- [Commits](https://github.com/ryanb/letter_opener/compare/v1.7.0...v1.8.1 )
---
updated-dependencies:
- dependency-name: letter_opener
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-03-22 11:30:45 +09:00
dependabot[bot]
737a77cef3
Bump tzinfo-data from 1.2021.5 to 1.2022.1 ( #17839 )
...
Bumps [tzinfo-data](https://github.com/tzinfo/tzinfo-data ) from 1.2021.5 to 1.2022.1.
- [Release notes](https://github.com/tzinfo/tzinfo-data/releases )
- [Commits](https://github.com/tzinfo/tzinfo-data/compare/v1.2021.5...v1.2022.1 )
---
updated-dependencies:
- dependency-name: tzinfo-data
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-03-22 11:30:32 +09:00
dependabot[bot]
5d90b90755
Bump @babel/plugin-proposal-decorators from 7.17.2 to 7.17.8 ( #17840 )
...
Bumps [@babel/plugin-proposal-decorators](https://github.com/babel/babel/tree/HEAD/packages/babel-plugin-proposal-decorators ) from 7.17.2 to 7.17.8.
- [Release notes](https://github.com/babel/babel/releases )
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md )
- [Commits](https://github.com/babel/babel/commits/v7.17.8/packages/babel-plugin-proposal-decorators )
---
updated-dependencies:
- dependency-name: "@babel/plugin-proposal-decorators"
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2022-03-22 11:30:20 +09:00
Claire
3afd59df0f
Fix tootctl email_domain_blocks add ( #17842 )
...
Fixes #17831
2022-03-21 19:10:09 +01:00
Claire
f29458da1d
Fix streaming server sometimes silently dropping subscriptions ( #17841 )
2022-03-21 19:08:29 +01:00
dependabot[bot]
7eb2e791ee
Bump @babel/core from 7.17.7 to 7.17.8 ( #17836 )
...
Bumps [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core ) from 7.17.7 to 7.17.8.
- [Release notes](https://github.com/babel/babel/releases )
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md )
- [Commits](https://github.com/babel/babel/commits/v7.17.8/packages/babel-core )
---
updated-dependencies:
- dependency-name: "@babel/core"
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-03-21 14:55:26 +09:00
dependabot[bot]
47ada1b6d1
Bump @babel/runtime from 7.17.7 to 7.17.8 ( #17835 )
...
Bumps [@babel/runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-runtime ) from 7.17.7 to 7.17.8.
- [Release notes](https://github.com/babel/babel/releases )
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md )
- [Commits](https://github.com/babel/babel/commits/v7.17.8/packages/babel-runtime )
---
updated-dependencies:
- dependency-name: "@babel/runtime"
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-03-21 14:55:12 +09:00
dependabot[bot]
a651a9678a
Bump rubocop-rails from 2.14.0 to 2.14.2 ( #17833 )
...
Bumps [rubocop-rails](https://github.com/rubocop/rubocop-rails ) from 2.14.0 to 2.14.2.
- [Release notes](https://github.com/rubocop/rubocop-rails/releases )
- [Changelog](https://github.com/rubocop/rubocop-rails/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rubocop/rubocop-rails/compare/v2.14.0...v2.14.2 )
---
updated-dependencies:
- dependency-name: rubocop-rails
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-03-21 14:54:59 +09:00
Yamagishi Kazutoshi
584d8b977b
Format JSON and YAML using Prettier ( #17823 )
...
* Format JSON and YAML using Prettier
* Add prettier to devDep
2022-03-21 04:46:11 +01:00
Gomasy
cf5435bb27
Fix being unable to search by domain ( #17832 )
2022-03-21 04:45:58 +01:00
Eugen Rochko
c0e3b20c58
New Crowdin updates ( #17817 )
...
* New translations devise.en.yml (Danish)
* New translations devise.en.yml (Danish)
* New translations devise.en.yml (Danish)
* New translations devise.en.yml (Danish)
* New translations devise.en.yml (Danish)
* New translations devise.en.yml (Danish)
* New translations en.json (Vietnamese)
* New translations en.yml (Vietnamese)
* New translations doorkeeper.en.yml (Vietnamese)
* New translations en.yml (Vietnamese)
* New translations en.json (Vietnamese)
* New translations en.yml (Vietnamese)
* New translations en.yml (Vietnamese)
* New translations en.json (Russian)
* New translations en.yml (Japanese)
* New translations en.yml (Japanese)
* New translations en.json (Japanese)
* New translations en.yml (Japanese)
* New translations en.json (Catalan)
* New translations en.json (Slovak)
* New translations en.yml (Slovak)
* New translations en.json (Catalan)
* New translations en.json (Slovak)
* New translations en.json (Catalan)
* New translations simple_form.en.yml (Slovak)
* New translations doorkeeper.en.yml (Slovak)
* New translations devise.en.yml (Catalan)
* New translations devise.en.yml (Catalan)
* New translations doorkeeper.en.yml (Catalan)
* New translations devise.en.yml (Catalan)
* New translations doorkeeper.en.yml (Catalan)
* New translations en.yml (Catalan)
* New translations en.yml (Catalan)
* New translations simple_form.en.yml (Thai)
* New translations en.yml (Thai)
* New translations en.json (Ukrainian)
* New translations devise.en.yml (Danish)
* New translations doorkeeper.en.yml (Danish)
* New translations devise.en.yml (Danish)
* New translations en.yml (Kurmanji (Kurdish))
* New translations en.yml (Kurmanji (Kurdish))
* New translations en.yml (Kurmanji (Kurdish))
* New translations en.yml (Ukrainian)
* New translations doorkeeper.en.yml (Ukrainian)
* New translations en.yml (Vietnamese)
* New translations doorkeeper.en.yml (Danish)
* New translations en.yml (Vietnamese)
* New translations doorkeeper.en.yml (Danish)
* New translations doorkeeper.en.yml (Danish)
* New translations doorkeeper.en.yml (Danish)
* New translations doorkeeper.en.yml (Danish)
* New translations doorkeeper.en.yml (Danish)
* New translations en.json (Persian)
* New translations en.json (Persian)
* New translations en.yml (Japanese)
* New translations en.yml (Vietnamese)
* New translations en.json (Vietnamese)
* New translations en.json (Japanese)
* New translations en.json (Japanese)
* New translations simple_form.en.yml (Japanese)
* New translations simple_form.en.yml (Japanese)
* New translations en.json (Russian)
* New translations en.json (Russian)
* New translations en.json (Russian)
* New translations en.yml (Thai)
* New translations en.yml (Thai)
* New translations simple_form.en.yml (Thai)
* New translations en.yml (Thai)
* Run `bundle exec i18n-tasks normalize`
* Run `yarn manage:translations`
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2022-03-20 00:23:01 +09:00
Daniel Jakots
8ee4fde19b
Bump NODE_VER to 16.14.2 ( #17825 )
...
See the announcement
https://nodejs.org/en/blog/vulnerability/mar-2022-security-releases/
2022-03-19 09:24:26 +01:00
Jeong Arm
3349cbeb3e
Fix clean_discarded_statuses ( #17822 )
2022-03-19 09:24:08 +01:00
Claire
9ff119eecd
Merge pull request #1720 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2022-03-18 19:45:05 +01:00
Claire
a22043ebff
Add missing locales to glitch-soc
2022-03-18 16:41:51 +01:00
dependabot[bot]
bf84654345
Bump rubocop from 1.25.1 to 1.26.0 ( #17789 )
...
Bumps [rubocop](https://github.com/rubocop/rubocop ) from 1.25.1 to 1.26.0.
- [Release notes](https://github.com/rubocop/rubocop/releases )
- [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rubocop/rubocop/compare/v1.25.1...v1.26.0 )
---
updated-dependencies:
- dependency-name: rubocop
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-03-18 09:51:58 +09:00
dependabot[bot]
357ca69dc0
Bump rubocop-rails from 2.13.2 to 2.14.0 ( #17790 )
...
Bumps [rubocop-rails](https://github.com/rubocop/rubocop-rails ) from 2.13.2 to 2.14.0.
- [Release notes](https://github.com/rubocop/rubocop-rails/releases )
- [Changelog](https://github.com/rubocop/rubocop-rails/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rubocop/rubocop-rails/compare/v2.13.2...v2.14.0 )
---
updated-dependencies:
- dependency-name: rubocop-rails
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-03-18 09:34:57 +09:00
Claire
4e3c68e025
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `app/helpers/accounts_helper.rb`:
Upstream fixed an issue that glitch-soc did not have, in a place with
glitch-soc changes to hide the number of followers.
Kept glitch-soc's code.
2022-03-17 19:23:39 +01:00
Claire
443d114574
Fix encoding error in OpenGraph account description ( #17821 )
...
Fixes #17816
2022-03-17 16:32:11 +01:00
Claire
a9bafe5df5
Fix some language endonyms ( #17810 )
...
Some language endonyms have been changed with #17478 . I went through them and
tried to pick the one that made the more sense.
2022-03-17 12:55:09 +01:00
Claire
1ffda4cdd4
Fix Sanskrit translation not being used when selected ( #17820 )
...
It is still a very partial translation, though, and the localeData I added is
very partial as well, but at least it now uses the strings that actually got
translated, instead of using English strings.
2022-03-17 12:54:40 +01:00
Claire
588d2b27a7
Remove old files for renamed translation ( #17818 )
...
Follow-up to #17812 in which `kmr` has been renamed to `ku`
2022-03-17 12:54:07 +01:00
Claire
b07906bdb0
Fix wrong language code for Kurdish languages ( #17812 )
2022-03-17 01:37:03 +01:00
Eugen Rochko
779efc7656
New Crowdin updates ( #17771 )
...
* New translations en.json (Cornish)
* New translations en.json (Kannada)
* New translations en.json (Scottish Gaelic)
* New translations en.json (Asturian)
* New translations en.json (Serbian (Latin))
* New translations en.json (Kurmanji (Kurdish))
* New translations en.json (Sorani (Kurdish))
* New translations en.json (Corsican)
* New translations en.json (Sardinian)
* New translations en.json (Sanskrit)
* New translations en.json (Kabyle)
* New translations en.json (Ido)
* New translations en.json (Taigi)
* New translations en.json (Silesian)
* New translations en.json (Standard Moroccan Tamazight)
* New translations simple_form.en.yml (Romanian)
* New translations simple_form.en.yml (French)
* New translations simple_form.en.yml (Albanian)
* New translations doorkeeper.en.yml (Asturian)
* New translations doorkeeper.en.yml (Scottish Gaelic)
* New translations simple_form.en.yml (Serbian (Cyrillic))
* New translations simple_form.en.yml (Swedish)
* New translations simple_form.en.yml (Galician)
* New translations simple_form.en.yml (Icelandic)
* New translations simple_form.en.yml (Chinese Traditional)
* New translations simple_form.en.yml (Ukrainian)
* New translations simple_form.en.yml (Turkish)
* New translations simple_form.en.yml (Kurmanji (Kurdish))
* New translations simple_form.en.yml (Sinhala)
* New translations simple_form.en.yml (Scottish Gaelic)
* New translations simple_form.en.yml (Asturian)
* New translations simple_form.en.yml (Occitan)
* New translations simple_form.en.yml (Serbian (Latin))
* New translations simple_form.en.yml (Sorani (Kurdish))
* New translations simple_form.en.yml (Corsican)
* New translations simple_form.en.yml (Sardinian)
* New translations simple_form.en.yml (Malayalam)
* New translations simple_form.en.yml (Kabyle)
* New translations simple_form.en.yml (Ido)
* New translations simple_form.en.yml (Standard Moroccan Tamazight)
* New translations simple_form.en.yml (Breton)
* New translations simple_form.en.yml (Welsh)
* New translations simple_form.en.yml (Tatar)
* New translations simple_form.en.yml (Croatian)
* New translations simple_form.en.yml (Portuguese, Brazilian)
* New translations simple_form.en.yml (Persian)
* New translations simple_form.en.yml (Tamil)
* New translations simple_form.en.yml (Spanish, Argentina)
* New translations simple_form.en.yml (Spanish, Mexico)
* New translations simple_form.en.yml (Bengali)
* New translations simple_form.en.yml (Norwegian Nynorsk)
* New translations simple_form.en.yml (Chinese Traditional, Hong Kong)
* New translations simple_form.en.yml (Kazakh)
* New translations simple_form.en.yml (Estonian)
* New translations simple_form.en.yml (Latvian)
* New translations simple_form.en.yml (Esperanto)
* New translations activerecord.en.yml (Icelandic)
* New translations devise.en.yml (Icelandic)
* New translations doorkeeper.en.yml (Serbian (Cyrillic))
* New translations doorkeeper.en.yml (Dutch)
* New translations doorkeeper.en.yml (Norwegian)
* New translations doorkeeper.en.yml (Polish)
* New translations doorkeeper.en.yml (Portuguese)
* New translations doorkeeper.en.yml (Russian)
* New translations doorkeeper.en.yml (Slovak)
* New translations doorkeeper.en.yml (Slovenian)
* New translations doorkeeper.en.yml (Albanian)
* New translations doorkeeper.en.yml (Swedish)
* New translations doorkeeper.en.yml (Turkish)
* New translations doorkeeper.en.yml (Chinese Traditional)
* New translations doorkeeper.en.yml (Galician)
* New translations doorkeeper.en.yml (Persian)
* New translations doorkeeper.en.yml (Georgian)
* New translations activerecord.en.yml (Welsh)
* New translations doorkeeper.en.yml (Bulgarian)
* New translations activerecord.en.yml (Scottish Gaelic)
* New translations devise.en.yml (Scottish Gaelic)
* New translations activerecord.en.yml (Asturian)
* New translations doorkeeper.en.yml (Korean)
* New translations devise.en.yml (Asturian)
* New translations doorkeeper.en.yml (Romanian)
* New translations doorkeeper.en.yml (French)
* New translations doorkeeper.en.yml (Spanish)
* New translations doorkeeper.en.yml (Arabic)
* New translations doorkeeper.en.yml (Catalan)
* New translations doorkeeper.en.yml (Japanese)
* New translations doorkeeper.en.yml (Czech)
* New translations doorkeeper.en.yml (Danish)
* New translations doorkeeper.en.yml (German)
* New translations doorkeeper.en.yml (Greek)
* New translations doorkeeper.en.yml (Finnish)
* New translations doorkeeper.en.yml (Hebrew)
* New translations doorkeeper.en.yml (Hungarian)
* New translations doorkeeper.en.yml (Armenian)
* New translations doorkeeper.en.yml (Italian)
* New translations doorkeeper.en.yml (Tamil)
* New translations doorkeeper.en.yml (Spanish, Argentina)
* New translations activerecord.en.yml (Romanian)
* New translations doorkeeper.en.yml (Sardinian)
* New translations doorkeeper.en.yml (Kabyle)
* New translations doorkeeper.en.yml (Ido)
* New translations doorkeeper.en.yml (Standard Moroccan Tamazight)
* New translations activerecord.en.yml (French)
* New translations devise.en.yml (Esperanto)
* New translations devise.en.yml (Romanian)
* New translations doorkeeper.en.yml (Sorani (Kurdish))
* New translations devise.en.yml (French)
* New translations activerecord.en.yml (Spanish)
* New translations devise.en.yml (Spanish)
* New translations activerecord.en.yml (Arabic)
* New translations devise.en.yml (Arabic)
* New translations activerecord.en.yml (Bulgarian)
* New translations devise.en.yml (Bulgarian)
* New translations doorkeeper.en.yml (Corsican)
* New translations doorkeeper.en.yml (Kurmanji (Kurdish))
* New translations doorkeeper.en.yml (Spanish, Mexico)
* New translations doorkeeper.en.yml (Marathi)
* New translations doorkeeper.en.yml (Thai)
* New translations doorkeeper.en.yml (Croatian)
* New translations doorkeeper.en.yml (Norwegian Nynorsk)
* New translations doorkeeper.en.yml (Kazakh)
* New translations doorkeeper.en.yml (Estonian)
* New translations doorkeeper.en.yml (Latvian)
* New translations doorkeeper.en.yml (Hindi)
* New translations doorkeeper.en.yml (Welsh)
* New translations doorkeeper.en.yml (Serbian (Latin))
* New translations doorkeeper.en.yml (Esperanto)
* New translations doorkeeper.en.yml (Chinese Traditional, Hong Kong)
* New translations doorkeeper.en.yml (Tatar)
* New translations doorkeeper.en.yml (Malayalam)
* New translations doorkeeper.en.yml (Breton)
* New translations doorkeeper.en.yml (Sinhala)
* New translations doorkeeper.en.yml (Occitan)
* New translations activerecord.en.yml (Czech)
* New translations devise.en.yml (Polish)
* New translations activerecord.en.yml (Dutch)
* New translations devise.en.yml (Dutch)
* New translations activerecord.en.yml (Norwegian)
* New translations devise.en.yml (Norwegian)
* New translations activerecord.en.yml (Polish)
* New translations activerecord.en.yml (Portuguese)
* New translations devise.en.yml (Portuguese)
* New translations activerecord.en.yml (Russian)
* New translations devise.en.yml (Russian)
* New translations activerecord.en.yml (Slovak)
* New translations devise.en.yml (Slovak)
* New translations activerecord.en.yml (Slovenian)
* New translations devise.en.yml (Slovenian)
* New translations activerecord.en.yml (Albanian)
* New translations devise.en.yml (Albanian)
* New translations activerecord.en.yml (Serbian (Cyrillic))
* New translations devise.en.yml (Korean)
* New translations devise.en.yml (Czech)
* New translations activerecord.en.yml (Hebrew)
* New translations activerecord.en.yml (German)
* New translations devise.en.yml (German)
* New translations activerecord.en.yml (Greek)
* New translations devise.en.yml (Greek)
* New translations activerecord.en.yml (Basque)
* New translations devise.en.yml (Basque)
* New translations activerecord.en.yml (Finnish)
* New translations devise.en.yml (Finnish)
* New translations devise.en.yml (Hebrew)
* New translations activerecord.en.yml (Korean)
* New translations activerecord.en.yml (Hungarian)
* New translations devise.en.yml (Hungarian)
* New translations activerecord.en.yml (Armenian)
* New translations devise.en.yml (Armenian)
* New translations activerecord.en.yml (Italian)
* New translations devise.en.yml (Italian)
* New translations activerecord.en.yml (Japanese)
* New translations devise.en.yml (Japanese)
* New translations activerecord.en.yml (Georgian)
* New translations devise.en.yml (Georgian)
* New translations devise.en.yml (Serbian (Cyrillic))
* New translations activerecord.en.yml (Swedish)
* New translations devise.en.yml (Norwegian Nynorsk)
* New translations activerecord.en.yml (Bengali)
* New translations devise.en.yml (Bengali)
* New translations activerecord.en.yml (Marathi)
* New translations devise.en.yml (Thai)
* New translations activerecord.en.yml (Croatian)
* New translations devise.en.yml (Croatian)
* New translations activerecord.en.yml (Norwegian Nynorsk)
* New translations activerecord.en.yml (Kazakh)
* New translations activerecord.en.yml (Spanish, Mexico)
* New translations devise.en.yml (Kazakh)
* New translations activerecord.en.yml (Estonian)
* New translations devise.en.yml (Estonian)
* New translations activerecord.en.yml (Latvian)
* New translations devise.en.yml (Latvian)
* New translations activerecord.en.yml (Hindi)
* New translations devise.en.yml (Hindi)
* New translations devise.en.yml (Spanish, Mexico)
* New translations devise.en.yml (Spanish, Argentina)
* New translations devise.en.yml (Swedish)
* New translations activerecord.en.yml (Vietnamese)
* New translations activerecord.en.yml (Turkish)
* New translations devise.en.yml (Turkish)
* New translations activerecord.en.yml (Ukrainian)
* New translations devise.en.yml (Ukrainian)
* New translations activerecord.en.yml (Chinese Simplified)
* New translations activerecord.en.yml (Chinese Traditional)
* New translations devise.en.yml (Chinese Traditional)
* New translations devise.en.yml (Urdu (Pakistan))
* New translations devise.en.yml (Vietnamese)
* New translations activerecord.en.yml (Spanish, Argentina)
* New translations activerecord.en.yml (Galician)
* New translations devise.en.yml (Galician)
* New translations activerecord.en.yml (Portuguese, Brazilian)
* New translations devise.en.yml (Portuguese, Brazilian)
* New translations activerecord.en.yml (Indonesian)
* New translations devise.en.yml (Indonesian)
* New translations activerecord.en.yml (Persian)
* New translations devise.en.yml (Persian)
* New translations activerecord.en.yml (Tamil)
* New translations devise.en.yml (Tamil)
* New translations devise.en.yml (Welsh)
* New translations activerecord.en.yml (Sorani (Kurdish))
* New translations devise.en.yml (Sorani (Kurdish))
* New translations activerecord.en.yml (Corsican)
* New translations devise.en.yml (Corsican)
* New translations activerecord.en.yml (Sardinian)
* New translations devise.en.yml (Sardinian)
* New translations activerecord.en.yml (Kabyle)
* New translations activerecord.en.yml (Kurmanji (Kurdish))
* New translations devise.en.yml (Kabyle)
* New translations devise.en.yml (Ido)
* New translations activerecord.en.yml (Standard Moroccan Tamazight)
* New translations devise.en.yml (Kurmanji (Kurdish))
* New translations devise.en.yml (Serbian (Latin))
* New translations activerecord.en.yml (Esperanto)
* New translations activerecord.en.yml (Breton)
* New translations activerecord.en.yml (Chinese Traditional, Hong Kong)
* New translations devise.en.yml (Chinese Traditional, Hong Kong)
* New translations activerecord.en.yml (Tatar)
* New translations devise.en.yml (Tatar)
* New translations activerecord.en.yml (Malayalam)
* New translations devise.en.yml (Malayalam)
* New translations devise.en.yml (Breton)
* New translations activerecord.en.yml (Serbian (Latin))
* New translations activerecord.en.yml (Sinhala)
* New translations devise.en.yml (Sinhala)
* New translations devise.en.yml (Kannada)
* New translations activerecord.en.yml (Occitan)
* New translations devise.en.yml (Occitan)
* New translations devise.en.yml (Standard Moroccan Tamazight)
* Run `bundle exec i18n-tasks normalize`
* Run `yarn manage:translations`
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2022-03-17 09:33:25 +09:00
Claire
c9b3cf8510
Fix searching already-known converted activities by URL ( #17814 )
...
Fixes #17813
2022-03-17 00:46:49 +01:00
Claire
ac300173f6
Merge pull request #1719 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2022-03-15 21:57:26 +01:00
Claire
c79a03b319
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `README.md`:
Upstream changed their README, we have a completely different one.
Kept our README.
2022-03-15 20:45:27 +01:00
Yamagishi Kazutoshi
e798c1c64c
Replace metadata-action type to match ( #17802 )
2022-03-15 20:38:29 +01:00
Claire
895212bb2f
Fix PgHero suggesting migrations ( #17807 )
...
* Fix PgHero suggesting migrations
Fixes #17768
* Keep migration suggestions in development env
2022-03-15 20:27:49 +01:00
Claire
9b139d4ef9
Fix “edited at” in public pages not being properly localized ( #17806 )
...
Fixes #17804
2022-03-15 19:07:25 +01:00
Shlee
82e1c6216e
Update config.yml ( #17799 )
2022-03-15 22:11:09 +09:00
Shlee
9fbe952789
Update config.yml ( #17800 )
2022-03-15 22:10:32 +09:00
Eugen Rochko
4bdce2c513
Bump version to 3.5.0rc1 ( #17618 )
...
* Bump version to 3.5.0rc1
* Various fixes and improvements
* Update AUTHORS.md
* Various fixes and improvements
* Update README.md
2022-03-15 08:16:45 +01:00
Eugen Rochko
703809ae98
Remove references to discourse.joinmastodon.org ( #17797 )
...
Remove broken CODEOWNERS file
Add sponsor.joinmastodon.org to FUNDING.yml
2022-03-15 08:13:22 +01:00
Eugen Rochko
a794117679
Fix individually approved/rejected statuses/links showing as pending review ( #17787 )
2022-03-15 07:51:55 +01:00
dependabot[bot]
40a4dad4c8
Bump rails from 6.1.4.6 to 6.1.5 ( #17791 )
...
Bumps [rails](https://github.com/rails/rails ) from 6.1.4.6 to 6.1.5.
- [Release notes](https://github.com/rails/rails/releases )
- [Commits](https://github.com/rails/rails/compare/v6.1.4.6...v6.1.5 )
---
updated-dependencies:
- dependency-name: rails
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-03-15 14:05:20 +09:00
dependabot[bot]
9d0f117cb5
Bump @rails/ujs from 6.1.4 to 6.1.5 ( #17776 )
...
Bumps [@rails/ujs](https://github.com/rails/rails ) from 6.1.4 to 6.1.5.
- [Release notes](https://github.com/rails/rails/releases )
- [Commits](https://github.com/rails/rails/compare/v6.1.4...v6.1.5 )
---
updated-dependencies:
- dependency-name: "@rails/ujs"
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-03-15 13:48:15 +09:00
dependabot[bot]
5d09e908d4
Bump pg from 1.3.3 to 1.3.4 ( #17772 )
...
Bumps [pg](https://github.com/ged/ruby-pg ) from 1.3.3 to 1.3.4.
- [Release notes](https://github.com/ged/ruby-pg/releases )
- [Changelog](https://github.com/ged/ruby-pg/blob/master/History.rdoc )
- [Commits](https://github.com/ged/ruby-pg/compare/v1.3.3...v1.3.4 )
---
updated-dependencies:
- dependency-name: pg
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-03-15 13:47:32 +09:00
dependabot[bot]
93ff3658b1
Bump @testing-library/react from 12.1.3 to 12.1.4 ( #17775 )
...
Bumps [@testing-library/react](https://github.com/testing-library/react-testing-library ) from 12.1.3 to 12.1.4.
- [Release notes](https://github.com/testing-library/react-testing-library/releases )
- [Changelog](https://github.com/testing-library/react-testing-library/blob/main/CHANGELOG.md )
- [Commits](https://github.com/testing-library/react-testing-library/compare/v12.1.3...v12.1.4 )
---
updated-dependencies:
- dependency-name: "@testing-library/react"
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-03-15 13:47:21 +09:00
dependabot[bot]
b06a8d11ea
Bump utf-8-validate from 5.0.8 to 5.0.9 ( #17777 )
...
Bumps [utf-8-validate](https://github.com/websockets/utf-8-validate ) from 5.0.8 to 5.0.9.
- [Release notes](https://github.com/websockets/utf-8-validate/releases )
- [Commits](https://github.com/websockets/utf-8-validate/compare/v5.0.8...v5.0.9 )
---
updated-dependencies:
- dependency-name: utf-8-validate
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-03-15 13:47:07 +09:00
dependabot[bot]
daf45a1677
Bump ox from 2.14.9 to 2.14.10 ( #17780 )
...
Bumps [ox](https://github.com/ohler55/ox ) from 2.14.9 to 2.14.10.
- [Release notes](https://github.com/ohler55/ox/releases )
- [Changelog](https://github.com/ohler55/ox/blob/develop/CHANGELOG.md )
- [Commits](https://github.com/ohler55/ox/compare/v2.14.9...v2.14.10 )
---
updated-dependencies:
- dependency-name: ox
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-03-15 13:46:58 +09:00
dependabot[bot]
c98241fd61
Bump rspec-rails from 5.1.0 to 5.1.1 ( #17781 )
...
Bumps [rspec-rails](https://github.com/rspec/rspec-rails ) from 5.1.0 to 5.1.1.
- [Release notes](https://github.com/rspec/rspec-rails/releases )
- [Changelog](https://github.com/rspec/rspec-rails/blob/main/Changelog.md )
- [Commits](https://github.com/rspec/rspec-rails/compare/v5.1.0...v5.1.1 )
---
updated-dependencies:
- dependency-name: rspec-rails
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-03-15 13:46:45 +09:00
dependabot[bot]
11a57f116c
Bump @babel/core from 7.17.5 to 7.17.7 ( #17782 )
...
Bumps [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core ) from 7.17.5 to 7.17.7.
- [Release notes](https://github.com/babel/babel/releases )
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md )
- [Commits](https://github.com/babel/babel/commits/v7.17.7/packages/babel-core )
---
updated-dependencies:
- dependency-name: "@babel/core"
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-03-15 13:46:34 +09:00
dependabot[bot]
161d23c7ee
Bump @babel/runtime from 7.17.2 to 7.17.7 ( #17783 )
...
Bumps [@babel/runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-runtime ) from 7.17.2 to 7.17.7.
- [Release notes](https://github.com/babel/babel/releases )
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md )
- [Commits](https://github.com/babel/babel/commits/v7.17.7/packages/babel-runtime )
---
updated-dependencies:
- dependency-name: "@babel/runtime"
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-03-15 13:46:21 +09:00
dependabot[bot]
224cb7fe03
Bump axios from 0.26.0 to 0.26.1 ( #17784 )
...
Bumps [axios](https://github.com/axios/axios ) from 0.26.0 to 0.26.1.
- [Release notes](https://github.com/axios/axios/releases )
- [Changelog](https://github.com/axios/axios/blob/master/CHANGELOG.md )
- [Commits](https://github.com/axios/axios/compare/v0.26.0...v0.26.1 )
---
updated-dependencies:
- dependency-name: axios
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-03-15 13:46:11 +09:00
Eugen Rochko
e6ffbfb5e7
Add `types` param to `GET /api/v1/notifications` in REST API ( #17767 )
...
* Add `types` param to `GET /api/v1/notifications` in REST API
* Improve tests
2022-03-15 04:11:29 +01:00
Eugen Rochko
eebafe24a8
Fix statuses not being referenced in strike when category is spam ( #17786 )
2022-03-15 04:11:13 +01:00
Yamagishi Kazutoshi
eb9a7e3626
Fix LetterOpennerWeb CSP ( #17770 )
2022-03-14 19:20:40 +01:00
Eugen Rochko
d182470c9d
New Crowdin updates ( #17742 )
...
* New translations en.yml (Danish)
* New translations en.yml (Danish)
* New translations en.yml (Danish)
* New translations en.yml (Danish)
* New translations en.yml (Danish)
* New translations en.json (Macedonian)
* New translations en.json (Punjabi)
* New translations en.json (Polish)
* New translations en.json (Russian)
* New translations en.json (Slovak)
* New translations en.json (Albanian)
* New translations en.json (Serbian (Cyrillic))
* New translations en.json (Swedish)
* New translations en.json (Ukrainian)
* New translations en.json (Urdu (Pakistan))
* New translations en.json (Galician)
* New translations en.json (Portuguese, Brazilian)
* New translations en.json (Tamil)
* New translations en.json (Lithuanian)
* New translations en.json (Georgian)
* New translations en.json (Slovenian)
* New translations en.json (French)
* New translations en.json (Persian)
* New translations en.json (Arabic)
* New translations en.json (Norwegian Nynorsk)
* New translations en.json (Norwegian)
* New translations en.json (Hebrew)
* New translations en.json (Greek)
* New translations en.json (Dutch)
* New translations en.json (Romanian)
* New translations en.json (Japanese)
* New translations en.json (Afrikaans)
* New translations en.json (Bulgarian)
* New translations en.json (Czech)
* New translations en.json (Basque)
* New translations en.json (Finnish)
* New translations en.json (Armenian)
* New translations en.json (Occitan)
* New translations en.json (Bengali)
* New translations en.json (Telugu)
* New translations en.json (Marathi)
* New translations en.json (Chinese Traditional, Hong Kong)
* New translations en.json (Uyghur)
* New translations en.json (Welsh)
* New translations en.json (Esperanto)
* New translations en.json (Malay)
* New translations en.json (Hindi)
* New translations en.json (Estonian)
* New translations en.json (Kazakh)
* New translations en.json (Croatian)
* New translations en.json (Sorani (Kurdish))
* New translations en.json (Silesian)
* New translations en.json (Taigi)
* New translations en.json (Ido)
* New translations en.json (Kabyle)
* New translations en.json (Sanskrit)
* New translations en.json (Sardinian)
* New translations en.json (Corsican)
* New translations en.json (Sinhala)
* New translations en.json (Serbian (Latin))
* New translations en.json (Asturian)
* New translations en.json (Scottish Gaelic)
* New translations en.json (Kannada)
* New translations en.json (Cornish)
* New translations en.json (Breton)
* New translations en.json (Malayalam)
* New translations en.json (Tatar)
* New translations en.json (Standard Moroccan Tamazight)
* New translations en.json (Vietnamese)
* New translations en.json (Spanish, Argentina)
* New translations en.yml (Japanese)
* New translations en.yml (Spanish, Argentina)
* New translations en.yml (Spanish, Argentina)
* New translations en.json (Japanese)
* New translations en.json (Japanese)
* New translations en.json (Japanese)
* New translations en.json (Japanese)
* New translations en.json (Japanese)
* New translations en.json (Japanese)
* New translations en.json (Japanese)
* New translations en.json (Chinese Traditional)
* New translations en.json (Japanese)
* New translations doorkeeper.en.yml (Japanese)
* New translations en.json (Catalan)
* New translations en.json (Greek)
* New translations en.json (German)
* New translations en.json (Icelandic)
* New translations en.json (Russian)
* New translations en.json (Swedish)
* New translations en.json (Russian)
* New translations en.yml (Indonesian)
* New translations en.json (Russian)
* New translations en.json (Indonesian)
* New translations doorkeeper.en.yml (Russian)
* New translations en.yml (Indonesian)
* New translations en.json (Russian)
* New translations en.json (Latvian)
* New translations en.json (Kurmanji (Kurdish))
* New translations en.yml (Danish)
* New translations en.yml (Danish)
* New translations en.json (Danish)
* New translations en.json (Asturian)
* New translations en.yml (Danish)
* New translations en.yml (Asturian)
* New translations en.json (Danish)
* New translations en.yml (Asturian)
* New translations simple_form.en.yml (Asturian)
* New translations en.yml (Danish)
* New translations en.json (Portuguese)
* New translations en.yml (Danish)
* New translations simple_form.en.yml (Danish)
* New translations doorkeeper.en.yml (Danish)
* New translations en.yml (Danish)
* New translations en.yml (Danish)
* New translations en.yml (Danish)
* New translations en.yml (Danish)
* New translations en.json (Italian)
* New translations en.yml (Danish)
* New translations en.yml (Danish)
* New translations en.yml (Danish)
* New translations en.yml (Danish)
* New translations en.yml (Danish)
* New translations en.yml (Danish)
* New translations en.yml (Danish)
* New translations en.yml (Danish)
* New translations en.json (Danish)
* New translations en.json (Spanish)
* New translations en.yml (Danish)
* New translations en.yml (Danish)
* New translations en.yml (Danish)
* New translations en.yml (Danish)
* New translations en.yml (Danish)
* New translations en.yml (Danish)
* New translations en.yml (Danish)
* New translations en.yml (Danish)
* New translations en.yml (Danish)
* New translations en.yml (Korean)
* New translations en.yml (Portuguese)
* New translations en.yml (Hungarian)
* New translations en.yml (Armenian)
* New translations en.yml (Georgian)
* New translations en.yml (Lithuanian)
* New translations en.yml (Macedonian)
* New translations en.yml (Dutch)
* New translations en.yml (Norwegian)
* New translations en.yml (Punjabi)
* New translations en.yml (Polish)
* New translations en.yml (Albanian)
* New translations en.yml (Basque)
* New translations en.yml (Serbian (Cyrillic))
* New translations en.yml (Turkish)
* New translations en.yml (Ukrainian)
* New translations en.yml (Chinese Traditional)
* New translations en.yml (Urdu (Pakistan))
* New translations en.yml (Icelandic)
* New translations en.yml (Portuguese, Brazilian)
* New translations en.yml (Indonesian)
* New translations en.yml (Tamil)
* New translations en.yml (Spanish, Argentina)
* New translations en.yml (Finnish)
* New translations en.yml (Greek)
* New translations en.yml (Galician)
* New translations en.yml (Slovak)
* New translations en.yml (Chinese Simplified)
* New translations en.yml (Swedish)
* New translations en.yml (Arabic)
* New translations en.yml (French)
* New translations en.yml (Spanish)
* New translations en.yml (Catalan)
* New translations en.yml (Hebrew)
* New translations en.yml (Italian)
* New translations en.yml (Japanese)
* New translations en.yml (Russian)
* New translations en.yml (Slovenian)
* New translations en.yml (German)
* New translations en.yml (Vietnamese)
* New translations en.yml (Thai)
* New translations en.yml (Scottish Gaelic)
* New translations en.yml (Occitan)
* New translations en.yml (Persian)
* New translations en.yml (Romanian)
* New translations en.yml (Afrikaans)
* New translations en.yml (Bulgarian)
* New translations en.yml (Czech)
* New translations en.yml (Danish)
* New translations en.yml (Spanish, Mexico)
* New translations en.yml (Bengali)
* New translations en.yml (Sinhala)
* New translations en.yml (Silesian)
* New translations en.yml (Taigi)
* New translations en.yml (Ido)
* New translations en.yml (Kabyle)
* New translations en.yml (Sanskrit)
* New translations en.yml (Sardinian)
* New translations en.yml (Corsican)
* New translations en.yml (Sorani (Kurdish))
* New translations en.yml (Kurmanji (Kurdish))
* New translations en.yml (Serbian (Latin))
* New translations en.yml (Kannada)
* New translations en.yml (Cornish)
* New translations en.yml (Breton)
* New translations en.yml (Marathi)
* New translations en.yml (Malayalam)
* New translations en.yml (Tatar)
* New translations en.yml (Chinese Traditional, Hong Kong)
* New translations en.yml (Uyghur)
* New translations en.yml (Esperanto)
* New translations en.yml (Welsh)
* New translations en.yml (Telugu)
* New translations en.yml (Malay)
* New translations en.yml (Hindi)
* New translations en.yml (Latvian)
* New translations en.yml (Estonian)
* New translations en.yml (Kazakh)
* New translations en.yml (Norwegian Nynorsk)
* New translations en.yml (Croatian)
* New translations en.yml (Standard Moroccan Tamazight)
* New translations en.yml (Greek)
* New translations en.yml (Chinese Traditional)
* New translations en.yml (Latvian)
* New translations en.yml (Spanish, Argentina)
* New translations en.yml (Japanese)
* New translations en.yml (French)
* New translations en.json (French)
* New translations en.yml (Icelandic)
* New translations en.yml (Slovenian)
* New translations en.json (Slovenian)
* New translations simple_form.en.yml (Slovenian)
* New translations en.yml (Catalan)
* New translations en.yml (Russian)
* New translations en.yml (Italian)
* New translations en.yml (Esperanto)
* New translations simple_form.en.yml (Esperanto)
* New translations en.yml (Spanish)
* New translations en.yml (French)
* New translations en.yml (Turkish)
* New translations en.yml (Indonesian)
* New translations en.json (Turkish)
* New translations en.yml (Indonesian)
* New translations en.yml (Hungarian)
* New translations en.json (Hungarian)
* New translations en.yml (Tatar)
* New translations en.json (Tatar)
* New translations simple_form.en.yml (Tatar)
* New translations activerecord.en.yml (Tatar)
* New translations en.yml (Tatar)
* New translations en.json (Tatar)
* Run `yarn manage:translations`
* Run `bundle exec i18n-tasks normalize`
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2022-03-15 03:01:59 +09:00
Claire
80c4db160e
Fix blank screen when trying to copy emoji with a too large file size ( #1718 )
...
Fixes #1714
2022-03-14 17:34:53 +01:00
Claire
76d6fe63c3
Merge pull request #1717 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2022-03-14 17:34:30 +01:00
Claire
a945182b56
Merge branch 'main' into glitch-soc/merge-upstream
2022-03-14 16:44:35 +01:00
Eugen Rochko
91616004fe
Fix not being able to upload GIF emojis in admin UI ( #17759 )
2022-03-14 05:45:22 +01:00
Eugen Rochko
5db1f377ea
Fix nil error when viewing suspended domain in admin UI ( #17765 )
2022-03-14 05:27:37 +01:00
Yamagishi Kazutoshi
74f406cfc9
Add DevContainer config ( #17764 )
...
* Add DevContainer config
* Add `--path vendor/bundle` to `postCreateCommand`
2022-03-13 15:03:36 +01:00
mayaeh
71e7d38421
Changed to display the "Explore" in "Getting-Started" at all resolutions ( #17762 )
2022-03-13 15:01:30 +01:00
Eugen Rochko
fa47c37f13
Fix public timelines being inaccessible on one stage of responsive layout in web UI ( #17760 )
...
Fix #17756
2022-03-13 09:48:39 +01:00
mayaeh
e38a01c41a
Change the "Explore" icon from fa-globe to fa-hashtag ( #17757 )
2022-03-13 05:15:19 +01:00
mayaeh
e52085246f
Add menu column of explore to getting-started ( #17755 )
2022-03-13 04:51:09 +01:00
Claire
988f5bf026
Merge pull request #1716 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2022-03-12 20:54:13 +01:00
Claire
8d4b5ee3ef
Merge branch 'main' into glitch-soc/merge-upstream
2022-03-12 20:20:58 +01:00
Claire
92a86b958e
Fix issues with processing toot edits ( #17748 )
...
* Fix searching for an already-known status by URL not working
* Fix Update processing from statuses prior to 20220302232632
`ordered_media_attachment_ids_changed?` would return `true` when going from
`nil` to anything (including `[]`).
* Add tests
2022-03-12 19:33:10 +01:00
Claire
8eb3146487
[Glitch] Fix edit history dropdown and modal in light theme
...
Port 64d2988d18
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-03-12 12:03:57 +01:00
Claire
bb9a6fb5c2
Merge branch 'main' into glitch-soc/merge-upstream
2022-03-12 11:51:25 +01:00
Claire
d3aa9cf774
Fix Updates being forwarded even when not processable or causing no change ( #17699 )
...
* Fix Updates being forwarded even when not processable or causing no change
* Refactor and ensure status edit is strictly newer than last known edit
2022-03-12 09:30:31 +01:00
dependabot[bot]
46ad7fea9d
Bump rack-attack from 6.5.0 to 6.6.0 ( #17405 )
...
* Bump rack-attack from 6.5.0 to 6.6.0
Bumps [rack-attack](https://github.com/rack/rack-attack ) from 6.5.0 to 6.6.0.
- [Release notes](https://github.com/rack/rack-attack/releases )
- [Changelog](https://github.com/rack/rack-attack/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rack/rack-attack/compare/v6.5.0...v6.6.0 )
---
updated-dependencies:
- dependency-name: rack-attack
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
* Fix usage of deprecated API
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
2022-03-12 09:23:53 +01:00
Eugen Rochko
ddbe906c25
Fix not updating a status when newer version is fetched manually ( #17745 )
2022-03-12 09:11:36 +01:00
Eugen Rochko
883099f3c9
Fix nil error when trying to fetch key for signature verification ( #17747 )
2022-03-12 09:02:24 +01:00
Claire
642528f455
Update fix-duplicates maintenance task ( #17731 )
...
* Update fix-duplicates task to 2022_02_10_153119
Also add support for Appeal to AccountMerging#merge_with!
* Update fix-duplicates task to 2022_03_07_094650
* Update fix-duplicates task to 2022_03_09_213005
* Update fix-duplicates task to 2022_03_07_083603
* Update fix-duplicates task to 2022_03_10_060626
* Update fix-duplicates script to 2022_03_07_083603
* Update fix-duplicates task to 2022_03_10_060706
* Update fix-duplicates task to 2022_03_10_060959
* Silence CodeClimate
2022-03-12 08:33:11 +01:00
Eugen Rochko
ee8d4dd056
Fix moderator account leak in status edit history ( #17746 )
2022-03-12 08:23:03 +01:00
Eugen Rochko
75e33fd08f
Fix null values being included in some indexes ( #17711 )
...
* Fix null values being included in some indexes
* Update lib/mastodon/migration_helpers.rb
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
* Add documentation link to corruption error message
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2022-03-12 08:12:57 +01:00
Eugen Rochko
bc320d6cec
Fix `POST /api/v1/emails/confirmations` not being available after sign-up ( #17743 )
2022-03-12 04:14:25 +01:00
Eugen Rochko
1745b71840
New Crowdin updates ( #17674 )
...
* New translations devise.en.yml (Hindi)
* New translations devise.en.yml (Spanish, Mexico)
* New translations devise.en.yml (Spanish, Argentina)
* New translations devise.en.yml (Swedish)
* New translations activerecord.en.yml (Vietnamese)
* New translations activerecord.en.yml (Turkish)
* New translations devise.en.yml (Turkish)
* New translations activerecord.en.yml (Ukrainian)
* New translations devise.en.yml (Ukrainian)
* New translations activerecord.en.yml (Chinese Simplified)
* New translations devise.en.yml (Chinese Simplified)
* New translations activerecord.en.yml (Chinese Traditional)
* New translations devise.en.yml (Chinese Traditional)
* New translations devise.en.yml (Urdu (Pakistan))
* New translations devise.en.yml (Vietnamese)
* New translations activerecord.en.yml (Spanish, Argentina)
* New translations activerecord.en.yml (Galician)
* New translations devise.en.yml (Galician)
* New translations activerecord.en.yml (Portuguese, Brazilian)
* New translations devise.en.yml (Portuguese, Brazilian)
* New translations activerecord.en.yml (Indonesian)
* New translations devise.en.yml (Indonesian)
* New translations activerecord.en.yml (Persian)
* New translations devise.en.yml (Persian)
* New translations activerecord.en.yml (Tamil)
* New translations devise.en.yml (Tamil)
* New translations devise.en.yml (Welsh)
* New translations activerecord.en.yml (Sorani (Kurdish))
* New translations devise.en.yml (Sorani (Kurdish))
* New translations activerecord.en.yml (Corsican)
* New translations devise.en.yml (Corsican)
* New translations activerecord.en.yml (Sardinian)
* New translations devise.en.yml (Sardinian)
* New translations activerecord.en.yml (Kabyle)
* New translations activerecord.en.yml (Kurmanji (Kurdish))
* New translations devise.en.yml (Kabyle)
* New translations devise.en.yml (Ido)
* New translations activerecord.en.yml (Standard Moroccan Tamazight)
* New translations devise.en.yml (Kurmanji (Kurdish))
* New translations devise.en.yml (Serbian (Latin))
* New translations activerecord.en.yml (Esperanto)
* New translations activerecord.en.yml (Breton)
* New translations activerecord.en.yml (Chinese Traditional, Hong Kong)
* New translations devise.en.yml (Chinese Traditional, Hong Kong)
* New translations activerecord.en.yml (Tatar)
* New translations devise.en.yml (Tatar)
* New translations activerecord.en.yml (Malayalam)
* New translations devise.en.yml (Malayalam)
* New translations devise.en.yml (Breton)
* New translations activerecord.en.yml (Serbian (Latin))
* New translations activerecord.en.yml (Sinhala)
* New translations devise.en.yml (Sinhala)
* New translations devise.en.yml (Kannada)
* New translations activerecord.en.yml (Occitan)
* New translations devise.en.yml (Occitan)
* New translations devise.en.yml (Standard Moroccan Tamazight)
* New translations en.yml (Catalan)
* New translations en.json (Norwegian)
* New translations en.yml (Catalan)
* New translations en.json (Norwegian Nynorsk)
* New translations en.json (Catalan)
* New translations en.json (Slovenian)
* New translations en.json (Persian)
* New translations en.json (Occitan)
* New translations en.json (Arabic)
* New translations en.json (Thai)
* New translations en.json (Hebrew)
* New translations en.json (Greek)
* New translations en.json (Dutch)
* New translations en.json (Romanian)
* New translations en.json (French)
* New translations en.json (Spanish)
* New translations en.json (Bulgarian)
* New translations en.json (Czech)
* New translations en.json (Danish)
* New translations en.json (German)
* New translations en.json (Latvian)
* New translations en.json (Indonesian)
* New translations en.json (Tamil)
* New translations en.json (Spanish, Argentina)
* New translations en.json (Spanish, Mexico)
* New translations en.json (Bengali)
* New translations en.json (Marathi)
* New translations en.json (Croatian)
* New translations en.json (Kazakh)
* New translations en.json (Estonian)
* New translations en.json (Hindi)
* New translations en.json (Icelandic)
* New translations en.json (Malay)
* New translations en.json (Welsh)
* New translations en.json (Esperanto)
* New translations en.json (Chinese Traditional, Hong Kong)
* New translations en.json (Tatar)
* New translations en.json (Malayalam)
* New translations en.json (Breton)
* New translations en.json (Sinhala)
* New translations en.json (Portuguese, Brazilian)
* New translations en.json (Galician)
* New translations en.json (Basque)
* New translations en.json (Polish)
* New translations en.json (Finnish)
* New translations en.json (Hungarian)
* New translations en.json (Armenian)
* New translations en.json (Italian)
* New translations en.json (Japanese)
* New translations en.json (Korean)
* New translations en.json (Lithuanian)
* New translations en.json (Macedonian)
* New translations en.json (Portuguese)
* New translations en.json (Vietnamese)
* New translations en.json (Russian)
* New translations en.json (Slovak)
* New translations en.json (Albanian)
* New translations en.json (Serbian (Cyrillic))
* New translations en.json (Swedish)
* New translations en.json (Turkish)
* New translations en.json (Ukrainian)
* New translations en.json (Chinese Simplified)
* New translations en.json (Chinese Traditional)
* New translations en.json (Urdu (Pakistan))
* New translations en.json (Cornish)
* New translations en.json (Scottish Gaelic)
* New translations en.json (Asturian)
* New translations en.json (Kurmanji (Kurdish))
* New translations en.json (Sorani (Kurdish))
* New translations en.json (Corsican)
* New translations en.json (Sardinian)
* New translations en.json (Sanskrit)
* New translations en.json (Kabyle)
* New translations en.json (Standard Moroccan Tamazight)
* New translations en.json (Swedish)
* New translations en.json (Catalan)
* New translations en.json (Polish)
* New translations en.yml (Korean)
* New translations en.json (Korean)
* New translations en.yml (Korean)
* New translations en.json (Turkish)
* New translations simple_form.en.yml (Korean)
* New translations doorkeeper.en.yml (Korean)
* New translations en.yml (French)
* New translations en.json (Russian)
* New translations en.yml (French)
* New translations en.yml (French)
* New translations en.yml (French)
* New translations en.yml (French)
* New translations en.json (French)
* New translations en.yml (French)
* New translations en.yml (Hungarian)
* New translations en.json (Hungarian)
* New translations en.yml (French)
* New translations en.yml (Hungarian)
* New translations en.yml (Kurmanji (Kurdish))
* New translations en.json (German)
* New translations en.json (Kurmanji (Kurdish))
* New translations en.yml (Kurmanji (Kurdish))
* New translations en.json (Kurmanji (Kurdish))
* New translations en.yml (Turkish)
* New translations en.yml (Icelandic)
* New translations en.yml (Turkish)
* New translations en.yml (Icelandic)
* New translations en.json (Icelandic)
* New translations en.yml (Spanish)
* New translations en.yml (Danish)
* New translations en.yml (Chinese Traditional)
* New translations en.json (Spanish)
* New translations en.json (Chinese Traditional)
* New translations en.yml (Spanish)
* New translations en.yml (Chinese Traditional)
* New translations en.json (Indonesian)
* New translations en.yml (Italian)
* New translations en.yml (Danish)
* New translations en.json (Italian)
* New translations en.yml (Danish)
* New translations en.json (Danish)
* New translations en.yml (Danish)
* New translations en.yml (Danish)
* New translations en.json (Slovenian)
* New translations en.yml (Portuguese)
* New translations en.yml (Portuguese)
* New translations en.yml (Portuguese)
* New translations en.yml (Portuguese)
* New translations en.yml (Latvian)
* New translations en.json (Portuguese)
* New translations simple_form.en.yml (Portuguese)
* New translations en.yml (Danish)
* New translations en.yml (Portuguese)
* New translations en.yml (Latvian)
* New translations en.json (Portuguese)
* New translations en.json (Latvian)
* New translations en.yml (Danish)
* New translations en.yml (Portuguese)
* New translations en.yml (Latvian)
* New translations en.yml (Danish)
* New translations en.json (Spanish, Argentina)
* New translations en.yml (Danish)
* New translations en.yml (Danish)
* New translations en.yml (Danish)
* New translations en.yml (Danish)
* New translations en.yml (Danish)
* New translations en.yml (Danish)
* New translations en.yml (Danish)
* New translations en.yml (Spanish, Mexico)
* New translations en.json (Spanish, Mexico)
* New translations en.yml (Russian)
* New translations en.yml (Spanish, Mexico)
* New translations en.yml (Asturian)
* New translations simple_form.en.yml (Russian)
* New translations en.yml (Russian)
* New translations en.json (Sinhala)
* New translations en.yml (Sinhala)
* New translations en.json (Greek)
* New translations doorkeeper.en.yml (Sinhala)
* New translations en.yml (Indonesian)
* New translations en.yml (Indonesian)
* New translations en.yml (Chinese Traditional)
* New translations en.yml (Chinese Traditional)
* New translations en.yml (Japanese)
* New translations en.yml (Danish)
* New translations en.yml (Danish)
* New translations en.yml (Turkish)
* New translations en.yml (Vietnamese)
* New translations en.json (Vietnamese)
* New translations en.json (Slovak)
* New translations en.json (Slovak)
* New translations doorkeeper.en.yml (Slovak)
* New translations en.yml (Slovak)
* New translations en.json (Slovak)
* New translations doorkeeper.en.yml (Slovak)
* New translations en.yml (Danish)
* New translations en.yml (Danish)
* New translations en.yml (Danish)
* New translations en.yml (Danish)
* New translations en.yml (Danish)
* New translations en.yml (Korean)
* New translations en.yml (Korean)
* New translations en.yml (Korean)
* New translations en.yml (Korean)
* New translations en.json (Korean)
* New translations en.json (Esperanto)
* New translations en.yml (Danish)
* Run `yarn manage:translations`
* Run `bundle exec i18n-tasks normalize`
* New translations en.yml (Danish)
* Fix
* Run `bundle exec i18n-tasks normalize -l da`
* New translations en.yml (Danish)
* Run `bundle exec i18n-tasks normalize -l da`
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2022-03-11 14:35:51 +09:00
Jeong Arm
18e27e0488
Enable domain purge button on suspended domains too ( #17741 )
...
Related: #17209
2022-03-11 04:58:09 +01:00
Claire
64d2988d18
Fix edit history dropdown and modal in light theme ( #17740 )
...
Fixes #17739
2022-03-10 17:59:23 +01:00
Claire
2c8bb17453
Merge pull request #1715 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2022-03-10 17:29:15 +01:00
Claire
43bce02a7a
[Glitch] Fix report dialog being illegible using mastodon-light theme
...
Port 29ee3c61a3
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-03-10 11:42:54 +01:00
Claire
f5ddfe93b3
Adapt view for glitch-soc's theming system
2022-03-10 11:30:48 +01:00
Eugen Rochko
2c5faa5594
[Glitch] Add polls and media attachments to edit comparison modal in web UI
...
Port 9f2791eb64
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-03-10 11:30:48 +01:00
Claire
8b69634ab8
Move report modal styles to flavours/glitch/styles/components/modal.scss
2022-03-10 11:16:13 +01:00
Eugen Rochko
60021f7edb
[Glitch] Fix being able to add more than 4 hashtags to hashtag column in web UI
...
Port e54fd73df2
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-03-10 10:15:36 +01:00
Eugen Rochko
887d56aa8a
[Glitch] Change design of federation pages in admin UI
...
Port front-end changes from 29ee3c61a3
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-03-10 10:14:33 +01:00
Claire
24e83246f9
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/status.rb`:
Upstream updated media and edit-related code textually close to glitch-soc
additions (local-only and content-type).
Ported upstream changes.
- `app/models/status_edit.rb`:
Upstream changes textually close to glitch-soc additions (content-type).
Ported upstream changes.
- `app/serializers/activitypub/note_serializer.rb`:
Upstream changed how media attachments are handled. Not really a conflict,
but textually close to glitch-soc additions (directMessage attribute).
Ported upstream changes.
- `app/services/remove_status_service.rb`:
Upstream changed how media attachments are handled. Not really a conflict,
but textually close to glitch-soc additions (DM timeline).
Ported upstream changes.
- `app/services/update_status_service.rb`:
Upstream fixed an issue with language selection. Not really a conflict,
but textually close to glitch-soc additions (content-type).
Ported upstream changes.
- `db/schema.rb`:
Upstream added columns to the `status_edits` table, the conflict is because
of an additional column (`content-type`) in glitch-soc.
Ported upstream changes.
- `package.json`:
Upstream dependency (express) textually adjacent to a glitch-soc-specific one
(favico.js) got updated.
Updated it as well.
2022-03-10 09:52:45 +01:00
Takeshi Umeda
d7fab238a8
Fix a type error in domain_block policies ( #17735 )
2022-03-10 04:10:20 +01:00
Claire
5ccd6cbfda
Add test for reblog race condition fix ( #17732 )
...
Follow-up to #17693
2022-03-10 00:11:49 +01:00
Claire
63c9d2bc28
Add tests for CVE-2022-24307 ( #17733 )
...
Follow-up to #17426
2022-03-10 00:11:40 +01:00
Claire
29ee3c61a3
Fix report dialog being illegible using mastodon-light theme ( #17734 )
...
Fixes #17726
2022-03-10 00:11:15 +01:00
Claire
07a178fd37
Fix existing boosts possibly referencing deleted toots ( #17730 )
...
Follow-up to #17693
2022-03-09 22:44:37 +01:00
Eugen Rochko
9f2791eb64
Add polls and media attachments to edit comparison modal in web UI ( #17727 )
2022-03-09 21:15:24 +01:00
Claire
2a56a890da
Fix rare race condition when rebloged status is deleted ( #17693 )
...
* Fix rare race condition when rebloged status is deleted
* Use INSERT INTO … SELECT
2022-03-09 20:49:14 +01:00
Eugen Rochko
b2cd34474b
Add rate limit for editing ( #17728 )
2022-03-09 20:06:51 +01:00
dependabot[bot]
803f536cdd
Bump express from 4.17.2 to 4.17.3 ( #17609 )
...
Bumps [express](https://github.com/expressjs/express ) from 4.17.2 to 4.17.3.
- [Release notes](https://github.com/expressjs/express/releases )
- [Changelog](https://github.com/expressjs/express/blob/master/History.md )
- [Commits](https://github.com/expressjs/express/compare/4.17.2...4.17.3 )
---
updated-dependencies:
- dependency-name: express
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-03-09 21:36:40 +09:00
dependabot[bot]
72311ba460
Bump blurhash from 1.1.4 to 1.1.5 ( #17610 )
...
Bumps [blurhash](https://github.com/woltapp/blurhash ) from 1.1.4 to 1.1.5.
- [Release notes](https://github.com/woltapp/blurhash/releases )
- [Commits](https://github.com/woltapp/blurhash/commits )
---
updated-dependencies:
- dependency-name: blurhash
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-03-09 21:36:02 +09:00
dependabot[bot]
59d76d03e4
Bump capistrano-rails from 1.6.1 to 1.6.2 ( #17603 )
...
Bumps [capistrano-rails](https://github.com/capistrano/rails ) from 1.6.1 to 1.6.2.
- [Release notes](https://github.com/capistrano/rails/releases )
- [Commits](https://github.com/capistrano/rails/compare/v1.6.1...v1.6.2 )
---
updated-dependencies:
- dependency-name: capistrano-rails
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-03-09 21:34:59 +09:00
dependabot[bot]
6a07745951
Bump marky from 1.2.2 to 1.2.4 ( #17606 )
...
Bumps [marky](https://github.com/nolanlawson/marky ) from 1.2.2 to 1.2.4.
- [Release notes](https://github.com/nolanlawson/marky/releases )
- [Commits](https://github.com/nolanlawson/marky/compare/v1.2.2...v1.2.4 )
---
updated-dependencies:
- dependency-name: marky
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-03-09 21:33:49 +09:00
dependabot[bot]
c7f24aa21c
Bump @testing-library/react from 12.1.2 to 12.1.3 ( #17605 )
...
Bumps [@testing-library/react](https://github.com/testing-library/react-testing-library ) from 12.1.2 to 12.1.3.
- [Release notes](https://github.com/testing-library/react-testing-library/releases )
- [Changelog](https://github.com/testing-library/react-testing-library/blob/main/CHANGELOG.md )
- [Commits](https://github.com/testing-library/react-testing-library/compare/v12.1.2...v12.1.3 )
---
updated-dependencies:
- dependency-name: "@testing-library/react"
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-03-09 21:33:19 +09:00
dependabot[bot]
4155a9ebde
Bump stackprof from 0.2.17 to 0.2.19 ( #17644 )
...
Bumps [stackprof](https://github.com/tmm1/stackprof ) from 0.2.17 to 0.2.19.
- [Release notes](https://github.com/tmm1/stackprof/releases )
- [Changelog](https://github.com/tmm1/stackprof/blob/master/CHANGELOG.md )
- [Commits](https://github.com/tmm1/stackprof/compare/v0.2.17...v0.2.19 )
---
updated-dependencies:
- dependency-name: stackprof
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-03-09 21:32:28 +09:00
dependabot[bot]
bd2cc49bc3
Bump @babel/core from 7.17.2 to 7.17.5 ( #17607 )
...
Bumps [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core ) from 7.17.2 to 7.17.5.
- [Release notes](https://github.com/babel/babel/releases )
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md )
- [Commits](https://github.com/babel/babel/commits/v7.17.5/packages/babel-core )
---
updated-dependencies:
- dependency-name: "@babel/core"
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-03-09 21:32:12 +09:00
dependabot[bot]
a057264fa4
Bump redis-namespace from 1.8.1 to 1.8.2 ( #17715 )
...
Bumps [redis-namespace](https://github.com/resque/redis-namespace ) from 1.8.1 to 1.8.2.
- [Release notes](https://github.com/resque/redis-namespace/releases )
- [Changelog](https://github.com/resque/redis-namespace/blob/master/CHANGELOG.md )
- [Commits](https://github.com/resque/redis-namespace/compare/v1.8.1...v1.8.2 )
---
updated-dependencies:
- dependency-name: redis-namespace
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-03-09 21:31:27 +09:00
dependabot[bot]
70d4b46217
Bump faker from 2.19.0 to 2.20.0 ( #17716 )
...
Bumps [faker](https://github.com/faker-ruby/faker ) from 2.19.0 to 2.20.0.
- [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.19.0...v2.20.0 )
---
updated-dependencies:
- dependency-name: faker
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-03-09 21:30:35 +09:00
dependabot[bot]
c65bdf25ea
Bump eslint-plugin-react from 7.29.2 to 7.29.3 ( #17717 )
...
Bumps [eslint-plugin-react](https://github.com/yannickcr/eslint-plugin-react ) from 7.29.2 to 7.29.3.
- [Release notes](https://github.com/yannickcr/eslint-plugin-react/releases )
- [Changelog](https://github.com/yannickcr/eslint-plugin-react/blob/master/CHANGELOG.md )
- [Commits](https://github.com/yannickcr/eslint-plugin-react/compare/v7.29.2...v7.29.3 )
---
updated-dependencies:
- dependency-name: eslint-plugin-react
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-03-09 21:17:58 +09:00
Eugen Rochko
e54fd73df2
Fix being able to add more than 4 hashtags to hashtag column in web UI ( #17729 )
2022-03-09 13:01:44 +01:00
Eugen Rochko
db04dfc8a6
Chore: Update translatable strings ( #17723 )
2022-03-09 20:45:49 +09:00
Claire
3bc0aeed50
Change text version of warning mail to mention appeals instead of mails ( #17725 )
...
Also, the instruction to reply to e-mail would probably not work in many cases
where the notifications e-mail address is not able to receive incoming emails
or the mailbox is not actively monitored.
2022-03-09 12:11:11 +01:00
chandrn7
a6ed6845c9
Allow login through OpenID Connect ( #16221 )
...
* added OpenID Connect as an SSO option
* minor fixes
* added comments, removed an option that shouldn't be set
* fixed Gemfile.lock
* added newline to end of Gemfile.lock
* removed tab from Gemfile.lock
* remove chomp
* codeclimate changes and small name change to make function's purpose clearer
* codeclimate fix
* added SSO buttons to /about page
* minor refactor
* minor style change
* removed spurious change
* removed unecessary conditional from ensure_valid_username and added support for auth.info.name in user_params_from_auth
* minor changes
2022-03-09 12:07:35 +01:00
Eugen Rochko
d17fb70131
Change how changes to media attachments are stored for edits ( #17696 )
...
* Change how changes to media attachments are stored for edits
Fix not being able to re-order media attachments
* Fix not broadcasting updates when polls/media is changed through ActivityPub
* Various fixes and improvements
* Update app/models/report.rb
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
* Add tracking of media attachment description changes
* Change poll in status edit to have a structure closer to the real one
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2022-03-09 09:06:17 +01:00
Eugen Rochko
bd53dd5210
Change design of federation pages in admin UI ( #17704 )
...
* Change design of federation pages in admin UI
* Fix query performance in instance media attachments measure
* Fix reblogs being included in instance languages dimension
2022-03-09 08:52:32 +01:00
Eugen Rochko
318d34d528
Fix data integrity of featured tags ( #17712 )
2022-03-09 08:51:12 +01:00
Eugen Rochko
c0327ff31f
Fix invalid language resulting in no fallback being set on statuses ( #17722 )
2022-03-09 08:46:05 +01:00
Claire
02133866e6
Merge pull request #1713 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2022-03-08 22:40:21 +01:00
Eugen Rochko
481f7c8c38
[Glitch] Change appearance of account cards in web UI
...
Port dba4be1038
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-03-08 20:52:49 +01:00
Josh Soref
69a4f17988
[Glitch] Spelling
...
Port front-end changes from b5329e0035
to glitch-soc
Co-authored-by: Josh Soref <jsoref@users.noreply.github.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-03-08 20:36:31 +01:00
Claire
1fbd1fa5c4
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `app/controllers/settings/preferences_controller.rb`:
Conflicts due to us having more user settings and upstream dropping
`hide_network` (to replace it with an account attribute, properly migrated).
Dropped `hide_network` like upstream.
- `app/lib/user_settings_decorator.rb`:
Conflicts due to us having more user settings and upstream dropping
`hide_network` (to replace it with an account attribute, properly migrated).
Dropped `hide_network` like upstream.
- `app/models/status.rb`:
Conflict because of slight change in how glitch-soc handles the scope to
filter out local-only posts for anonymous viewers.
Took upstream's changes and re-applied glitch-soc's change.
- `app/models/user.rb`:
Conflicts due to us having more user settings and upstream dropping
`hide_network` (to replace it with an account attribute, properly migrated).
Dropped `hide_network` like upstream.
- `app/views/directories/index.html.haml`:
Conflict because upstream redesigned that page while glitch-soc had a minor
change to support hiding the number of followers.
Ported glitch-soc's change on top of upstream's redesign.
Additional changes:
- `app/models/account_statuses_filter.rb`:
See change to `app/models/status.rb`.
2022-03-08 20:22:54 +01:00
Eugen Rochko
8f6c67bfde
Fix performance of account timelines ( #17709 )
...
* Fix performance of account timelines
* Various fixes and improvements
* Fix duplicate results being returned
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
* Fix grouping for pinned statuses scope
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2022-03-08 09:14:39 +01:00
Claire
61ae6b3535
Add more migration tests ( #17710 )
...
* Add migration tests for hide_network settings migration
* Add tests about suspended/suspended_at
* Add more tests regarding the results of migrations
* Fix migration test regarding stale conflicting remote account
* Add migration tests about AccountConversation
2022-03-07 23:40:55 +01:00
Eugen Rochko
dba4be1038
Change appearance of account cards in web UI ( #17689 )
...
* Change appearance of account cards in web UI
* Various fixes and improvements
* Various fixes and improvements
2022-03-07 11:38:52 +01:00
Eugen Rochko
292c75aa31
Fix nil error when submitting report without `rule_ids` ( #17713 )
2022-03-07 11:21:27 +01:00
Eugen Rochko
edf09ec747
Add `/api/v1/accounts/familiar_followers` to REST API ( #17700 )
...
* Add `/api/v1/accounts/familiar_followers` to REST API
* Change hide network preference to be stored consistently for local and remote accounts
* Add dummy classes to migration
* Apply suggestions from code review
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2022-03-07 09:36:47 +01:00
Rens Groothuijsen
c439e13e12
Enable importing GIF emojis in CLI ( #17706 )
2022-03-06 23:41:44 +01:00
Josh Soref
b5329e0035
Spelling ( #17705 )
...
* spelling: account
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
* spelling: affiliated
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
* spelling: appearance
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
* spelling: autosuggest
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
* spelling: cacheable
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
* spelling: component
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
* spelling: conversations
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
* spelling: domain.example
Clarify what's distinct and use RFC friendly domain space.
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
* spelling: environment
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
* spelling: exceeds
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
* spelling: functional
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
* spelling: inefficiency
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
* spelling: not
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
* spelling: notifications
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
* spelling: occurring
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
* spelling: position
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
* spelling: progress
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
* spelling: promotable
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
* spelling: reblogging
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
* spelling: repetitive
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
* spelling: resolve
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
* spelling: saturated
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
* spelling: similar
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
* spelling: strategies
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
* spelling: success
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
* spelling: targeting
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
* spelling: thumbnails
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
* spelling: unauthorized
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
* spelling: unsensitizes
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
* spelling: validations
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
* spelling: various
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
Co-authored-by: Josh Soref <jsoref@users.noreply.github.com>
2022-03-06 22:51:40 +01:00
Mashiro
87a55e2cd6
Change autocomplete type of password input box ( #17702 )
...
* Change autocomplete type of password input box
* Update _registration.html.haml
2022-03-05 05:57:50 +01:00
Claire
f03148f441
Merge pull request #1712 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2022-03-04 01:15:29 +01:00
Claire
d9c3109bb6
Merge branch 'main' into glitch-soc/merge-upstream
2022-03-04 01:07:49 +01:00
Eugen Rochko
2ea754b861
Fix duplicate notifications being possible after poll expiration ( #17697 )
2022-03-04 01:06:33 +01:00
Eugen Rochko
04c3ac896a
Fix infinite re-forwarding of update activities temporarily ( #17698 )
2022-03-04 01:00:13 +01:00
Claire
02dbc59c91
Add option to automatically delete toots after one week ( #17691 )
...
Fixes #17658
2022-03-03 16:18:58 +01:00
Claire
6d3fa7828e
Redesign /about when already logged in ( #17348 )
...
* Redesign /about when already logged in
* Fix sign up form still showing when OMNIAUTH_ONLY is set
* Fix tests
* Change wording based on suggestions
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
2022-03-03 16:14:44 +01:00
Claire
ff43e54a49
Allow editing media attachments for scheduled toots ( #17690 )
...
Fixes #17676
2022-03-03 16:13:58 +01:00
Eugen Rochko
631e495a79
Change `follow` scope to be covered by `read` and `write` scopes in REST API ( #17678 )
...
Deprecate `follow` scope
2022-03-03 16:13:40 +01:00
Eugen Rochko
085f286750
Fix returning empty `<p>` tag for blank account `note` in REST API ( #17687 )
2022-03-03 06:45:46 +01:00
Eugen Rochko
54d4ece743
Remove profile directory link from main navigation panel ( #17688 )
2022-03-03 06:45:30 +01:00
Claire
3637a0101e
Merge pull request #1710 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2022-03-02 21:47:03 +01:00
Claire
c69d94ef7e
[Glitch] Change visual separation of applications in authorized apps list
...
Port SCSS changes from c0c4b5718d
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-03-02 20:52:44 +01:00
Claire
8743b1ea40
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/admin/trends/links/index.html.haml`:
Not really a conflict, upstream change textually too close to a glitch-soc
change (removed `javascript_pack_tag` to accomodate for glitch-soc's theming
system).
Ported upstream changes.
- `app/views/admin/trends/links/preview_card_providers/index.html.haml`:
Not really a conflict, upstream change textually too close to a glitch-soc
change (removed `javascript_pack_tag` to accomodate for glitch-soc's theming
system).
Ported upstream changes.
- `app/views/admin/trends/statuses/index.html.haml`:
Not really a conflict, upstream change textually too close to a glitch-soc
change (removed `javascript_pack_tag` to accomodate for glitch-soc's theming
system).
Ported upstream changes.
- `app/views/admin/trends/tags/index.html.haml`:
Not really a conflict, upstream change textually too close to a glitch-soc
change (removed `javascript_pack_tag` to accomodate for glitch-soc's theming
system).
Ported upstream changes.
2022-03-02 20:48:27 +01:00
Claire
c0c4b5718d
Change visual separation of applications in authorized apps list ( #17686 )
2022-03-02 20:28:25 +01:00
Claire
d9e30efa5e
Merge pull request #1709 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2022-03-02 19:11:17 +01:00
Eugen Rochko
9b58fb1ea4
Add descriptions to trending features in admin UI ( #17677 )
2022-03-02 18:57:44 +01:00
Eugen Rochko
e24b14cc74
Fix leak of existence of otherwise inaccessible statuses in REST API ( #17684 )
2022-03-02 18:57:26 +01:00
Eugen Rochko
02b8d63fce
Fix report category not being saved in REST API ( #17682 )
2022-03-02 18:57:08 +01:00
Eugen Rochko
78781793d5
[Glitch] Add ability to mark statuses as sensitive from reports in admin UI
...
Port SCSS changes from 25d3dc4373
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-03-02 18:08:56 +01:00
Eugen Rochko
7f998ba94d
[Glitch] Change authorized applications page
...
Port SCSS changes from 50ea54b3ed
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-03-02 18:07:57 +01:00
Claire
425a6c90c4
Merge branch 'main' into glitch-soc/merge-upstream
2022-03-02 18:02:48 +01:00
Eugen Rochko
462a6f7d72
Fix notification about deleted statuses being too threatening ( #17679 )
2022-03-01 23:07:57 +01:00
Eugen Rochko
25d3dc4373
Add ability to mark statuses as sensitive from reports in admin UI ( #17668 )
...
* Add ability to mark statuses as sensitive from reports in admin UI
* Allow mark as sensitive action on statuses with preview cards
2022-03-01 22:20:29 +01:00
Claire
14919fe11e
Change old moderation strikes to be displayed in a separate page ( #17566 )
...
* Change old moderation strikes to be displayed in a separate page
Fixes #17552
This changes the moderation strikes displayed on `/auth/edit` to be those from
the past 3 months, and make all moderation strikes targeting the current user
available in `/disputes`.
* Add short description of what the strikes page is for
* Move link to list of strikes to “Account status” instead of navigation item
* Normalize i18n file
* Fix layout and styling of strikes link
* Revert highlights_on regexp
* Reintroduce account status summary
- this way, “Account status” is never empty
- account status is not necessarily bound to strikes, or recent strikes
2022-03-01 19:37:47 +01:00
Eugen Rochko
50ea54b3ed
Change authorized applications page ( #17656 )
...
* Change authorized applications page
* Hide revoke button for superapps and suspended accounts
* Clean up db/schema.rb
2022-03-01 16:48:58 +01:00
Eugen Rochko
233f7e6174
New Crowdin updates ( #17628 )
...
* New translations en.yml (Swedish)
* New translations en.yml (French)
* New translations en.yml (French)
* New translations en.yml (French)
* New translations en.yml (French)
* New translations en.yml (French)
* New translations en.yml (Turkish)
* New translations en.yml (Latvian)
* New translations simple_form.en.yml (Latvian)
* New translations en.yml (Turkish)
* New translations en.yml (Latvian)
* New translations simple_form.en.yml (Turkish)
* New translations en.yml (Indonesian)
* New translations en.yml (Indonesian)
* New translations en.yml (Indonesian)
* New translations en.yml (Kurmanji (Kurdish))
* New translations en.yml (Kurmanji (Kurdish))
* New translations en.yml (Portuguese)
* New translations en.yml (Kurmanji (Kurdish))
* New translations en.yml (Portuguese)
* New translations en.yml (Kurmanji (Kurdish))
* New translations en.yml (Turkish)
* New translations en.yml (Italian)
* New translations en.json (Spanish, Argentina)
* New translations en.yml (Welsh)
* New translations simple_form.en.yml (Welsh)
* New translations activerecord.en.yml (Welsh)
* New translations en.yml (Welsh)
* New translations en.json (Welsh)
* New translations activerecord.en.yml (Welsh)
* New translations en.json (Portuguese, Brazilian)
* New translations en.yml (Portuguese, Brazilian)
* New translations en.json (Portuguese, Brazilian)
* New translations en.yml (Finnish)
* New translations en.yml (Finnish)
* New translations simple_form.en.yml (Portuguese, Brazilian)
* New translations en.yml (Finnish)
* New translations en.yml (Thai)
* New translations en.yml (Thai)
* New translations en.yml (Thai)
* New translations en.yml (Kabyle)
* New translations en.json (Kabyle)
* New translations en.yml (Vietnamese)
* New translations en.yml (Vietnamese)
* New translations simple_form.en.yml (Vietnamese)
* New translations en.yml (Vietnamese)
* New translations en.yml (Indonesian)
* New translations en.yml (Chinese Simplified)
* New translations en.yml (Standard Moroccan Tamazight)
* New translations en.yml (Thai)
* New translations en.yml (Thai)
* New translations en.yml (Thai)
* New translations en.yml (Spanish, Mexico)
* New translations en.yml (Greek)
* New translations en.yml (Turkish)
* New translations en.yml (Latvian)
* New translations en.yml (Catalan)
* New translations en.yml (Portuguese)
* New translations en.yml (Italian)
* New translations en.yml (Russian)
* New translations en.json (Russian)
* New translations en.yml (Russian)
* New translations en.json (Russian)
* New translations en.yml (Russian)
* New translations en.json (Russian)
* New translations en.yml (Kurmanji (Kurdish))
* New translations en.yml (Japanese)
* New translations en.yml (Chinese Traditional)
* New translations en.yml (Italian)
* New translations en.yml (Vietnamese)
* New translations en.yml (Galician)
* New translations en.yml (Spanish)
* New translations en.yml (Thai)
* New translations en.yml (French)
* New translations en.yml (Thai)
* New translations en.yml (Indonesian)
* New translations en.yml (Danish)
* New translations en.yml (Indonesian)
* New translations simple_form.en.yml (Indonesian)
* New translations en.yml (German)
* New translations en.yml (Thai)
* New translations en.yml (Icelandic)
* New translations en.yml (Thai)
* New translations en.yml (Thai)
* New translations simple_form.en.yml (Thai)
* New translations en.yml (Thai)
* New translations en.yml (Thai)
* New translations en.yml (Hungarian)
* New translations en.json (Norwegian)
* New translations en.json (Norwegian Nynorsk)
* New translations en.json (Catalan)
* New translations en.json (Slovenian)
* New translations en.json (Persian)
* New translations en.json (Occitan)
* New translations en.json (Arabic)
* New translations en.json (Thai)
* New translations en.json (Hebrew)
* New translations en.json (Greek)
* New translations en.json (Dutch)
* New translations en.json (Romanian)
* New translations en.json (French)
* New translations en.json (Spanish)
* New translations en.json (Afrikaans)
* New translations en.json (Bulgarian)
* New translations en.json (Czech)
* New translations en.yml (Spanish, Argentina)
* New translations en.yml (Spanish, Mexico)
* New translations en.json (Danish)
* New translations en.json (German)
* New translations en.json (Latvian)
* New translations en.json (Indonesian)
* New translations en.json (Tamil)
* New translations en.json (Spanish, Argentina)
* New translations en.json (Spanish, Mexico)
* New translations en.json (Bengali)
* New translations en.json (Marathi)
* New translations en.json (Croatian)
* New translations en.json (Kazakh)
* New translations en.json (Estonian)
* New translations en.json (Hindi)
* New translations en.json (Icelandic)
* New translations en.json (Malay)
* New translations en.json (Telugu)
* New translations en.json (Welsh)
* New translations en.json (Esperanto)
* New translations en.json (Uyghur)
* New translations en.json (Chinese Traditional, Hong Kong)
* New translations en.json (Tatar)
* New translations en.json (Malayalam)
* New translations en.json (Breton)
* New translations en.json (Sinhala)
* New translations en.json (Portuguese, Brazilian)
* New translations en.json (Galician)
* New translations en.json (Basque)
* New translations en.json (Polish)
* New translations en.json (Finnish)
* New translations en.json (Hungarian)
* New translations en.json (Armenian)
* New translations en.json (Italian)
* New translations en.json (Japanese)
* New translations en.json (Georgian)
* New translations en.json (Korean)
* New translations en.json (Lithuanian)
* New translations en.json (Macedonian)
* New translations en.json (Punjabi)
* New translations en.json (Portuguese)
* New translations en.json (Vietnamese)
* New translations en.json (Russian)
* New translations en.json (Slovak)
* New translations en.json (Albanian)
* New translations en.json (Serbian (Cyrillic))
* New translations en.json (Swedish)
* New translations en.json (Turkish)
* New translations en.json (Ukrainian)
* New translations en.json (Chinese Simplified)
* New translations en.json (Chinese Traditional)
* New translations en.json (Urdu (Pakistan))
* New translations en.json (Cornish)
* New translations en.json (Kannada)
* New translations en.json (Scottish Gaelic)
* New translations en.json (Asturian)
* New translations en.json (Serbian (Latin))
* New translations en.json (Kurmanji (Kurdish))
* New translations en.json (Sorani (Kurdish))
* New translations en.json (Corsican)
* New translations en.json (Sardinian)
* New translations en.json (Sanskrit)
* New translations en.json (Ido)
* New translations en.json (Taigi)
* New translations en.json (Silesian)
* New translations en.json (Standard Moroccan Tamazight)
* New translations en.json (Catalan)
* New translations en.json (French)
* New translations en.json (Catalan)
* New translations en.json (French)
* New translations en.json (Albanian)
* New translations en.json (Catalan)
* New translations en.yml (Albanian)
* New translations en.json (French)
* New translations en.json (French)
* New translations en.yml (French)
* New translations en.json (French)
* New translations en.json (French)
* New translations en.json (Danish)
* New translations en.json (Danish)
* New translations en.json (Icelandic)
* New translations en.json (Danish)
* New translations en.json (Italian)
* New translations en.json (Italian)
* New translations en.json (Kurmanji (Kurdish))
* New translations en.json (Kurmanji (Kurdish))
* New translations en.json (Hungarian)
* New translations en.json (Ukrainian)
* New translations en.json (Kurmanji (Kurdish))
* New translations en.json (Hungarian)
* New translations en.json (Greek)
* New translations en.json (Finnish)
* New translations en.json (Russian)
* New translations en.json (Greek)
* New translations en.json (Hungarian)
* New translations en.json (Finnish)
* New translations en.json (Hungarian)
* New translations en.json (Finnish)
* New translations en.json (Chinese Traditional)
* New translations en.json (Finnish)
* New translations en.json (Chinese Traditional)
* New translations en.yml (Finnish)
* New translations en.json (Finnish)
* New translations en.json (Chinese Traditional)
* New translations en.json (German)
* New translations en.json (German)
* New translations en.json (Chinese Simplified)
* New translations en.yml (Thai)
* New translations en.json (Thai)
* New translations en.yml (Scottish Gaelic)
* New translations en.json (Thai)
* New translations en.json (Turkish)
* New translations en.json (Scottish Gaelic)
* New translations doorkeeper.en.yml (Scottish Gaelic)
* New translations activerecord.en.yml (Scottish Gaelic)
* New translations devise.en.yml (Scottish Gaelic)
* New translations simple_form.en.yml (Thai)
* New translations en.json (Spanish)
* New translations en.json (Spanish)
* New translations en.json (Latvian)
* New translations en.json (Latvian)
* New translations en.json (Latvian)
* New translations en.yml (Swedish)
* New translations en.json (Swedish)
* New translations en.json (Asturian)
* New translations en.yml (Asturian)
* New translations en.json (Asturian)
* New translations en.yml (Asturian)
* New translations en.json (Asturian)
* New translations activerecord.en.yml (Asturian)
* New translations en.json (Asturian)
* New translations doorkeeper.en.yml (Asturian)
* New translations simple_form.en.yml (Asturian)
* New translations en.json (Chinese Simplified)
* New translations en.json (Chinese Simplified)
* New translations en.yml (Chinese Simplified)
* New translations en.yml (Danish)
* New translations en.json (Turkish)
* New translations en.json (Turkish)
* New translations en.yml (French)
* New translations en.yml (French)
* New translations en.yml (French)
* Run `bundle exec i18n-tasks normalize`
* Fix
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2022-03-01 18:38:36 +09:00
Claire
0b8fe020b5
Merge pull request #1708 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2022-03-01 10:34:33 +01:00
Eugen Rochko
c0a8fb2b59
[Glitch] Fix report submit button not being disabled during submission in web UI
...
Port 0883f05753
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-03-01 10:01:06 +01:00
Claire
c5925756f1
Merge branch 'main' into glitch-soc/merge-upstream
2022-03-01 09:59:18 +01:00
dependabot[bot]
57f8c9adac
Bump redis from 4.0.3 to 4.0.4 ( #17671 )
...
Bumps [redis](https://github.com/redis/node-redis ) from 4.0.3 to 4.0.4.
- [Release notes](https://github.com/redis/node-redis/releases )
- [Changelog](https://github.com/redis/node-redis/blob/master/CHANGELOG.md )
- [Commits](https://github.com/redis/node-redis/compare/redis@4.0.3...redis@4.0.4 )
---
updated-dependencies:
- dependency-name: redis
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-03-01 17:33:26 +09:00
dependabot[bot]
f2b8474069
Bump eslint-plugin-react from 7.28.0 to 7.29.2 ( #17672 )
...
Bumps [eslint-plugin-react](https://github.com/yannickcr/eslint-plugin-react ) from 7.28.0 to 7.29.2.
- [Release notes](https://github.com/yannickcr/eslint-plugin-react/releases )
- [Changelog](https://github.com/yannickcr/eslint-plugin-react/blob/master/CHANGELOG.md )
- [Commits](https://github.com/yannickcr/eslint-plugin-react/compare/v7.28.0...v7.29.2 )
---
updated-dependencies:
- dependency-name: eslint-plugin-react
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-03-01 17:33:10 +09:00
dependabot[bot]
79a07f10ba
Bump sass from 1.49.7 to 1.49.9 ( #17670 )
...
Bumps [sass](https://github.com/sass/dart-sass ) from 1.49.7 to 1.49.9.
- [Release notes](https://github.com/sass/dart-sass/releases )
- [Changelog](https://github.com/sass/dart-sass/blob/main/CHANGELOG.md )
- [Commits](https://github.com/sass/dart-sass/compare/1.49.7...1.49.9 )
---
updated-dependencies:
- dependency-name: sass
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-03-01 17:32:51 +09:00
dependabot[bot]
399cc757cb
Bump url-parse from 1.5.7 to 1.5.10 ( #17662 )
...
Bumps [url-parse](https://github.com/unshiftio/url-parse ) from 1.5.7 to 1.5.10.
- [Release notes](https://github.com/unshiftio/url-parse/releases )
- [Commits](https://github.com/unshiftio/url-parse/compare/1.5.7...1.5.10 )
---
updated-dependencies:
- dependency-name: url-parse
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-03-01 17:32:30 +09:00
dependabot[bot]
4ba7be5fc4
Bump blurhash from 0.1.5 to 0.1.6 ( #17669 )
...
Bumps [blurhash](https://github.com/Gargron/blurhash ) from 0.1.5 to 0.1.6.
- [Release notes](https://github.com/Gargron/blurhash/releases )
- [Changelog](https://github.com/Gargron/blurhash/blob/master/CHANGELOG.md )
- [Commits](https://github.com/Gargron/blurhash/compare/v0.1.5...v0.1.6 )
---
updated-dependencies:
- dependency-name: blurhash
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-28 21:42:37 +01:00
Eugen Rochko
1392741044
Chore: Update translatable strings ( #17495 )
2022-02-28 14:14:52 +01:00
Shlee
f6a3c27e9d
Update config.yml ( #17664 )
2022-02-28 08:44:49 +01:00
Eugen Rochko
cb2e198d89
Fix not showing loading indicator when searching in web UI ( #17655 )
2022-02-27 07:37:07 +01:00
Eugen Rochko
0883f05753
Fix report submit button not being disabled during submission in web UI ( #17654 )
...
Add loading indicator for status selection step in report dialog in web UI
2022-02-27 07:37:00 +01:00
Claire
df60524b30
Merge pull request #1707 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2022-02-26 21:23:55 +01:00
Claire
0a5a703a56
[Glitch] Fix remote reports with comments revealing remote reporter
...
Port SCSS changes from 57814a98a9
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-02-26 21:17:22 +01:00
Claire
8158b04d18
Merge branch 'main' into glitch-soc/merge-upstream
2022-02-26 21:15:37 +01:00
Claire
551820cbd9
Merge pull request #1704 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2022-02-26 21:15:19 +01:00
Claire
57814a98a9
Fix remote reports with comments revealing remote reporter ( #17652 )
...
* Display username rather than display name in report comment
For consistency with report notes and appeals
* Fix remote reports with comments revealing remote reporter
* Display instance name in placeholder
* Make instance name in report comment a link to the federation admin page
* Normalize i18n file
2022-02-26 21:14:12 +01:00
Eugen Rochko
0dc57ab6ed
Fix status updates not being forwarded like deletes through ActivityPub ( #17648 )
...
Fix #17521
2022-02-26 17:51:59 +01:00
Claire
67c6f37e26
Merge branch 'main' into glitch-soc/merge-upstream
2022-02-26 17:27:17 +01:00
LinAGKar
48caeb9d65
Also compress SVG and ICO images in nginx ( #17651 )
2022-02-26 17:27:11 +01:00
Claire
6aef76b5cd
Fix error when a MX is shared across blocked domains ( #17650 )
2022-02-26 17:26:28 +01:00
Claire
3d60708508
Fix crash in EmailDomainBlockRefreshScheduler ( #17649 )
2022-02-26 16:28:28 +01:00
Claire
756f1b6615
Add option (on by default) to allow toots with content warnings to trend
2022-02-26 10:46:26 +01:00
Claire
c6df6686af
Disable notifications for trending links and trending statuses by default
2022-02-26 10:46:26 +01:00
Claire
4eed5019a2
[Glitch] Fix media modal footer's “external link” not being a link
...
Port 255748dff4
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-02-26 10:29:53 +01:00
Claire
8e04ba87b7
[Glitch] Fix reply button on media modal not giving focus to compose form
...
Port 2cd31b3177
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-02-26 09:54:48 +01:00
Eugen Rochko
2e2b8a9a40
[Glitch] Add trending statuses
...
Port SCSS changes from 27965ce5ed
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-02-26 09:50:23 +01:00
Claire
59824aadcd
Adapt view for glitch-soc's theming system
2022-02-26 09:46:13 +01:00
Claire
be493b6c0d
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/account.rb`:
Not a real conflict, just upstream getting rid of unused constants too close
to glitch-soc-specific contents.
Removed unused constants like upstream did.
- `app/models/trends.rb`:
Conflict because glitch-soc disabled email notifications for trending links.
Upstream has refactored this quite a bit and added trending posts.
Took upstream code, but disabling the extra trending stuff will come in
another commit.
- `app/views/admin/trends/links/index.html.haml`:
Conflict due to glitch-soc's theming system.
Ported upstream changes accordingly.
2022-02-26 09:29:23 +01:00
MitarashiDango
a5c24d5c4d
Fix unable to unpin follower-only posts ( #17647 )
2022-02-25 17:04:08 +01:00
dependabot[bot]
0f75490b49
Bump pg from 1.3.2 to 1.3.3 ( #17643 )
...
Bumps [pg](https://github.com/ged/ruby-pg ) from 1.3.2 to 1.3.3.
- [Release notes](https://github.com/ged/ruby-pg/releases )
- [Changelog](https://github.com/ged/ruby-pg/blob/master/History.rdoc )
- [Commits](https://github.com/ged/ruby-pg/compare/v1.3.2...v1.3.3 )
---
updated-dependencies:
- dependency-name: pg
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-25 02:15:20 +01:00
dependabot[bot]
85f6a960f9
Bump aws-sdk-s3 from 1.112.0 to 1.113.0 ( #17642 )
...
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby ) from 1.112.0 to 1.113.0.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases )
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/version-3/gems/aws-sdk-s3/CHANGELOG.md )
- [Commits](https://github.com/aws/aws-sdk-ruby/commits )
---
updated-dependencies:
- dependency-name: aws-sdk-s3
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-25 01:48:46 +01:00
dependabot[bot]
50452064b3
Bump nokogiri from 1.13.2 to 1.13.3 ( #17641 )
...
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri ) from 1.13.2 to 1.13.3.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases )
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md )
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.13.2...v1.13.3 )
---
updated-dependencies:
- dependency-name: nokogiri
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-25 01:48:08 +01:00
Claire
255748dff4
Fix media modal footer's “external link” not being a link ( #17561 )
2022-02-25 01:20:41 +01:00
dependabot[bot]
e884f7dfbd
Bump nokogiri from 1.13.1 to 1.13.2 ( #17604 )
...
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri ) from 1.13.1 to 1.13.2.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases )
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md )
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.13.1...v1.13.2 )
---
updated-dependencies:
- dependency-name: nokogiri
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-25 01:18:55 +01:00
sasanquaneuf
21e80a9792
Escape database passwords in config/database.yml ( #17627 )
...
* Add double quotes for using passwords that start with a comma
* Escape database password in yml
2022-02-25 01:16:52 +01:00
Claire
2cd31b3177
Fix reply button on media modal not giving focus to compose form ( #17626 )
...
* Avoid compose form and modal management fighting for focus
* Fix reply button on media modal footer not giving focus to compose form
2022-02-25 00:51:01 +01:00
Eugen Rochko
d4592bbfcd
Add explore page to web UI ( #17123 )
...
* Add explore page to web UI
* Fix not removing loaded statuses from trends on mute/block action
2022-02-25 00:34:33 +01:00
Eugen Rochko
27965ce5ed
Add trending statuses ( #17431 )
...
* Add trending statuses
* Fix dangling items with stale scores in localized sets
* Various fixes and improvements
- Change approve_all/reject_all to approve_accounts/reject_accounts
- Change Trends::Query methods to not mutate the original query
- Change Trends::Query#skip to offset
- Change follow recommendations to be refreshed in a transaction
* Add tests for trending statuses filtering behaviour
* Fix not applying filtering scope in controller
2022-02-25 00:34:14 +01:00
Eugen Rochko
a29a982eaa
Change e-mail domain blocks to block IPs dynamically ( #17635 )
...
* Change e-mail domain blocks to block IPs dynamically
* Update app/workers/scheduler/email_domain_block_refresh_scheduler.rb
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
* Update app/workers/scheduler/email_domain_block_refresh_scheduler.rb
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2022-02-24 17:28:23 +01:00
Sumak
91cc8d1e63
fix #17601 change `:keys` to `:attribute_names` ( #17637 )
2022-02-24 14:46:21 +01:00
Claire
e48eaf64cc
Merge pull request #1701 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2022-02-23 22:21:58 +01:00
Claire
41ef41b900
Fix publish buttons styling
2022-02-23 22:04:12 +01:00
Claire
ae3cd3b84c
[Glitch] Fix reporting from profile
...
Port b7cf11d5a9
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-02-23 21:46:46 +01:00
Claire
fc2c65d79f
Merge branch 'main' into glitch-soc/merge-upstream
2022-02-23 21:44:09 +01:00
Claire
b7cf11d5a9
Fix reporting from profile ( #17632 )
...
* Fix reporting from profile
* Clean up dead code
2022-02-23 21:37:02 +01:00
Claire
aafe91259a
Fetch relationships when opening report modal
...
Relationship with the reported account affect which actions are proposed in
the “thanks” part. Upstream fetches relationships when opening dropdown menus,
but we don't.
2022-02-23 21:12:03 +01:00
Eugen Rochko
470c0a8002
[Glitch] Change report modal to include category selection in web UI
...
Port a9a43de6d1
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-02-23 20:25:55 +01:00
Claire
9dd62c95c5
Merge branch 'main' into glitch-soc/merge-upstream
2022-02-23 20:05:04 +01:00
Claire
8c9c05d579
Merge pull request #1700 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2022-02-23 20:04:23 +01:00
Eugen Rochko
a9a43de6d1
Change report modal to include category selection in web UI ( #17565 )
...
* Change report modal to include category selection in web UI
* Various fixes and improvements
- Change thank you text to be different based on category
- Change starting headline to be different for account and status reports
- Change toggle components to have a checkmark when checked
- Fix report dialog being cut off on small screens
- Fix thank you screen offering mute or block if already muted or blocked
- Refactor toggle components in report dialog into one component
* Change wording on final screen
* Change checkboxes to be square when multiple options are possible
2022-02-23 20:03:46 +01:00
Claire
55692978ec
Merge branch 'main' into glitch-soc/merge-upstream
2022-02-23 19:43:34 +01:00
Claire
1c3e5e44e2
Fix new sign-up notification not working because of incorrect type name ( #17629 )
2022-02-23 19:30:13 +01:00
Eugen Rochko
f99943cd74
[Glitch] Add notifications for new sign-ups
...
Port 7b816eb5ae
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-02-23 19:04:09 +01:00
Claire
3d25fe0426
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/workflows/build-image.yml`:
Upstream changed the workflow a bit.
Conflict comes from us pushing to ghcr while upstream pushes to dockerhub.
Ported the upstream changes while still pushing to ghcr.
2022-02-23 18:13:12 +01:00
noiob
0db101ede2
Fix link in new hashtag notification email ( #17624 )
...
It's currently https://example.org/admin/trends/tags?pending_review=1 but should be https://example.org/admin/trends/tags?status=pending_review
2022-02-23 16:51:09 +01:00
Eugen Rochko
7b816eb5ae
Add notifications for new sign-ups ( #16953 )
2022-02-23 16:45:22 +01:00
Jeong Arm
3e12abc1fe
Calculate max_id without random vector ( #17623 )
2022-02-23 16:44:59 +01:00
Yamagishi Kazutoshi
b950807fd2
Skip Docker Hub login for pull requests ( #17625 )
...
* Skip Docker Hub login for pull requests
* Add support pr tag
2022-02-23 16:44:16 +01:00
Eugen Rochko
d21bedc492
New Crowdin updates ( #17593 )
...
* New translations en.json (Catalan)
* New translations en.json (Turkish)
* New translations en.json (Macedonian)
* New translations en.json (Punjabi)
* New translations en.json (Polish)
* New translations en.json (Portuguese)
* New translations en.json (Russian)
* New translations en.json (Slovak)
* New translations en.json (Albanian)
* New translations en.json (Serbian (Cyrillic))
* New translations en.json (Swedish)
* New translations en.json (Ukrainian)
* New translations en.json (Korean)
* New translations en.json (Chinese Simplified)
* New translations en.json (Chinese Traditional)
* New translations en.json (Urdu (Pakistan))
* New translations en.json (Vietnamese)
* New translations en.json (Galician)
* New translations en.json (Icelandic)
* New translations en.json (Portuguese, Brazilian)
* New translations en.json (Indonesian)
* New translations en.json (Tamil)
* New translations en.json (Spanish, Argentina)
* New translations en.json (Lithuanian)
* New translations en.json (Georgian)
* New translations en.json (Slovenian)
* New translations en.json (French)
* New translations en.json (Persian)
* New translations en.json (Occitan)
* New translations en.json (Arabic)
* New translations en.json (Thai)
* New translations en.json (Norwegian Nynorsk)
* New translations en.json (Norwegian)
* New translations en.json (Hebrew)
* New translations en.json (Greek)
* New translations en.json (Dutch)
* New translations en.json (Romanian)
* New translations en.json (Spanish)
* New translations en.json (Japanese)
* New translations en.json (Afrikaans)
* New translations en.json (Bulgarian)
* New translations en.json (Czech)
* New translations en.json (Danish)
* New translations en.json (German)
* New translations en.json (Basque)
* New translations en.json (Finnish)
* New translations en.json (Hungarian)
* New translations en.json (Armenian)
* New translations en.json (Italian)
* New translations en.json (Spanish, Mexico)
* New translations en.json (Bengali)
* New translations en.json (Cornish)
* New translations en.json (Silesian)
* New translations en.json (Taigi)
* New translations en.json (Ido)
* New translations en.json (Kabyle)
* New translations en.json (Sanskrit)
* New translations en.json (Sardinian)
* New translations en.json (Corsican)
* New translations en.json (Sorani (Kurdish))
* New translations en.json (Kurmanji (Kurdish))
* New translations en.json (Serbian (Latin))
* New translations en.json (Asturian)
* New translations en.json (Scottish Gaelic)
* New translations en.json (Kannada)
* New translations en.json (Sinhala)
* New translations en.json (Marathi)
* New translations en.json (Breton)
* New translations en.json (Malayalam)
* New translations en.json (Tatar)
* New translations en.json (Chinese Traditional, Hong Kong)
* New translations en.json (Uyghur)
* New translations en.json (Esperanto)
* New translations en.json (Welsh)
* New translations en.json (Telugu)
* New translations en.json (Malay)
* New translations en.json (Hindi)
* New translations en.json (Latvian)
* New translations en.json (Estonian)
* New translations en.json (Kazakh)
* New translations en.json (Croatian)
* New translations en.json (Standard Moroccan Tamazight)
* New translations en.yml (Japanese)
* New translations en.json (Japanese)
* New translations en.json (Chinese Traditional)
* New translations en.json (Danish)
* New translations en.json (Thai)
* New translations en.yml (Thai)
* New translations en.json (Korean)
* New translations en.yml (Thai)
* New translations en.yml (Thai)
* New translations en.json (Chinese Simplified)
* New translations en.yml (Thai)
* New translations devise.en.yml (Thai)
* New translations en.yml (Thai)
* New translations en.yml (Thai)
* New translations en.json (Catalan)
* New translations simple_form.en.yml (Thai)
* New translations en.json (Galician)
* New translations en.json (Greek)
* New translations en.json (Polish)
* New translations en.json (Hebrew)
* New translations en.json (Icelandic)
* New translations en.json (Kurmanji (Kurdish))
* New translations en.json (Chinese Traditional)
* New translations en.yml (Russian)
* New translations en.json (Portuguese)
* New translations en.json (Russian)
* New translations en.yml (Russian)
* New translations en.json (Swedish)
* New translations simple_form.en.yml (Russian)
* New translations en.json (Turkish)
* New translations en.json (Chinese Traditional)
* New translations en.json (Albanian)
* New translations en.json (Vietnamese)
* New translations en.json (Latvian)
* New translations en.json (Hungarian)
* New translations en.json (Spanish, Argentina)
* New translations en.json (Italian)
* New translations en.yml (Japanese)
* New translations simple_form.en.yml (Finnish)
* New translations simple_form.en.yml (Finnish)
* New translations simple_form.en.yml (Finnish)
* New translations en.yml (Finnish)
* New translations simple_form.en.yml (Finnish)
* New translations en.yml (Finnish)
* New translations en.yml (Finnish)
* New translations en.json (Finnish)
* New translations en.yml (Japanese)
* New translations en.yml (Japanese)
* New translations en.yml (Hebrew)
* New translations en.yml (Hebrew)
* New translations en.json (Spanish)
* New translations en.json (Basque)
* New translations en.yml (Basque)
* New translations en.json (Basque)
* New translations en.yml (Basque)
* New translations en.yml (Basque)
* New translations en.json (Ukrainian)
* New translations en.yml (Indonesian)
* New translations en.json (Indonesian)
* New translations en.yml (Indonesian)
* New translations en.yml (Russian)
* New translations en.yml (French)
* New translations en.yml (French)
* New translations en.yml (French)
* New translations en.yml (French)
* New translations en.json (Hungarian)
* New translations en.yml (Indonesian)
* New translations en.yml (Indonesian)
* New translations en.yml (Indonesian)
* New translations simple_form.en.yml (Indonesian)
* New translations en.yml (French)
* New translations en.yml (French)
* New translations en.yml (French)
* New translations en.yml (French)
* New translations en.yml (French)
* New translations en.yml (French)
* New translations en.yml (French)
* New translations en.yml (French)
* New translations en.yml (French)
* New translations en.yml (French)
* New translations en.yml (French)
* New translations simple_form.en.yml (French)
* New translations en.json (French)
* New translations simple_form.en.yml (French)
* New translations en.json (French)
* New translations simple_form.en.yml (Galician)
* New translations en.json (French)
* New translations en.json (Russian)
* New translations activerecord.en.yml (Latvian)
* New translations en.yml (French)
* New translations en.yml (French)
* Run `yarn manage:translations`
* Run `bundle exec i18n-tasks normalize`
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2022-02-23 22:13:09 +09:00
luzpaz
73f5e4a1d9
Fix various typos ( #17621 )
...
Found via `codespell -q 3 -S ./CHANGELOG.md,./AUTHORS.md,./config/locales,./app/javascript/mastodon/locales -L ba,keypair,medias,ro`
2022-02-22 20:14:17 +01:00
Claire
2c8615fbf8
Merge pull request #1699 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2022-02-22 19:53:36 +01:00
Eugen Rochko
5169a9f9d9
[Glitch] Fix link colors in report and strike details
...
Port SCSS changes from 51e67f3243
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-02-22 18:10:08 +01:00
Eugen Rochko
e07f2efc9f
[Glitch] Fix wrong styles on strike page
...
Port SCSS changes from 8338826963
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-02-22 18:09:39 +01:00
Claire
954e052b07
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/media_attachment.rb`:
Upstream moved hardcoded values around, while in glitch-soc they are
configurable.
Moved them like upstream, but keeping glitch-soc's ability to configure
them through env vars.
2022-02-22 18:06:29 +01:00
Claire
166f6e4b50
Fix some media attachments being converted with too high framerates ( #17619 )
...
Video files with variable framerates are converted to constant framerate videos
and the output framerate picked by ffmpeg is based on the original file's
container framerate (which can be different from the average framerate).
This means that an input video with variable framerate with about 30 frames per
second on average, but a maximum of 120 fps will be converted to a constant 120
fps file, which won't be processed by other Mastodon servers.
This commit changes it so that input files with VFR and a maximum framerate
above the framerate threshold are converted to VFR files with the maximum frame
rate enforced.
2022-02-22 17:11:22 +01:00
Eugen Rochko
51e67f3243
Fix link colors in report and strike details ( #17616 )
2022-02-22 15:27:25 +01:00
Eugen Rochko
b377022cf9
Add caching layer to metrics ( #17617 )
2022-02-22 15:27:08 +01:00
Eugen Rochko
8338826963
Fix wrong styles on strike page ( #17615 )
2022-02-22 06:20:04 +01:00
Claire
e0d94323bc
Merge pull request #1698 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2022-02-21 15:47:49 +01:00
Claire
2bd9bcf698
Merge branch 'main' into glitch-soc/merge-upstream
2022-02-21 15:46:53 +01:00
Claire
8603a07504
Fix error when trying to register ( #17600 )
2022-02-21 14:55:38 +01:00
Claire
23a548d794
Merge pull request #1695 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2022-02-19 13:54:53 +01:00
Claire
dc121b609f
Merge branch 'main' into glitch-soc/merge-upstream
2022-02-19 11:33:18 +01:00
dependabot[bot]
2e89067d21
Bump pundit from 2.1.1 to 2.2.0 ( #17543 )
...
* Bump pundit from 2.1.1 to 2.2.0
Bumps [pundit](https://github.com/varvet/pundit ) from 2.1.1 to 2.2.0.
- [Release notes](https://github.com/varvet/pundit/releases )
- [Changelog](https://github.com/varvet/pundit/blob/main/CHANGELOG.md )
- [Commits](https://github.com/varvet/pundit/compare/v2.1.1...v2.2.0 )
---
updated-dependencies:
- dependency-name: pundit
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
* `include Pundit` is deprecated
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2022-02-19 13:30:06 +09:00
dependabot[bot]
4dddb1a431
Bump url-parse from 1.5.3 to 1.5.7 ( #17584 )
...
Bumps [url-parse](https://github.com/unshiftio/url-parse ) from 1.5.3 to 1.5.7.
- [Release notes](https://github.com/unshiftio/url-parse/releases )
- [Commits](https://github.com/unshiftio/url-parse/compare/1.5.3...1.5.7 )
---
updated-dependencies:
- dependency-name: url-parse
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-19 13:23:06 +09:00
Eugen Rochko
1761d9ba5d
New Crowdin updates ( #17514 )
...
* New translations en.yml (Catalan)
* New translations simple_form.en.yml (Catalan)
* New translations en.yml (Albanian)
* New translations simple_form.en.yml (Albanian)
* New translations en.yml (Albanian)
* New translations en.yml (Ukrainian)
* New translations en.yml (Ukrainian)
* New translations en.yml (Danish)
* New translations en.yml (Danish)
* New translations en.yml (Danish)
* New translations en.yml (Chinese Traditional)
* New translations simple_form.en.yml (Chinese Traditional)
* New translations en.yml (Danish)
* New translations en.yml (Chinese Traditional)
* New translations en.yml (Danish)
* New translations en.yml (Chinese Traditional)
* New translations simple_form.en.yml (Danish)
* New translations en.yml (Chinese Traditional)
* New translations en.yml (Chinese Traditional)
* New translations en.yml (Chinese Simplified)
* New translations en.yml (Chinese Simplified)
* New translations en.yml (Chinese Simplified)
* New translations en.yml (Chinese Simplified)
* New translations simple_form.en.yml (Chinese Simplified)
* New translations en.yml (Galician)
* New translations en.yml (Vietnamese)
* New translations en.yml (Galician)
* New translations en.yml (Vietnamese)
* New translations en.yml (Galician)
* New translations en.yml (Vietnamese)
* New translations en.yml (Indonesian)
* New translations simple_form.en.yml (Galician)
* New translations en.yml (Japanese)
* New translations en.yml (Vietnamese)
* New translations en.yml (Indonesian)
* New translations simple_form.en.yml (Vietnamese)
* New translations en.yml (Hebrew)
* New translations en.yml (German)
* New translations en.json (German)
* New translations en.yml (German)
* New translations en.yml (German)
* New translations simple_form.en.yml (German)
* New translations en.yml (German)
* New translations en.yml (Polish)
* New translations en.yml (Turkish)
* New translations en.yml (Icelandic)
* New translations activerecord.en.yml (Icelandic)
* New translations devise.en.yml (Icelandic)
* New translations en.yml (Polish)
* New translations en.yml (Turkish)
* New translations en.yml (Swedish)
* New translations en.yml (Turkish)
* New translations simple_form.en.yml (Turkish)
* New translations en.yml (Swedish)
* New translations simple_form.en.yml (Swedish)
* New translations en.yml (Swedish)
* New translations en.yml (Hungarian)
* New translations en.yml (Hungarian)
* New translations en.yml (Hungarian)
* New translations en.yml (Icelandic)
* New translations en.yml (Hungarian)
* New translations en.yml (Hungarian)
* New translations simple_form.en.yml (Hungarian)
* New translations en.yml (Icelandic)
* New translations en.json (Icelandic)
* New translations simple_form.en.yml (Icelandic)
* New translations en.json (Icelandic)
* New translations en.yml (Polish)
* New translations en.json (Polish)
* New translations en.json (Icelandic)
* New translations en.json (Icelandic)
* New translations simple_form.en.yml (Icelandic)
* New translations en.yml (Icelandic)
* New translations en.json (Icelandic)
* New translations doorkeeper.en.yml (Icelandic)
* New translations simple_form.en.yml (Icelandic)
* New translations activerecord.en.yml (Icelandic)
* New translations en.yml (Albanian)
* New translations en.yml (Icelandic)
* New translations en.yml (Indonesian)
* New translations en.json (Russian)
* New translations en.yml (Albanian)
* New translations en.yml (Indonesian)
* New translations en.json (Icelandic)
* New translations en.yml (Icelandic)
* New translations en.yml (Indonesian)
* New translations en.json (Icelandic)
* New translations en.yml (Icelandic)
* New translations en.yml (Hungarian)
* New translations en.yml (Icelandic)
* New translations en.yml (Hungarian)
* New translations simple_form.en.yml (Hungarian)
* New translations simple_form.en.yml (Italian)
* New translations en.yml (Italian)
* New translations en.yml (Spanish, Argentina)
* New translations en.yml (Spanish, Argentina)
* New translations en.yml (Spanish, Argentina)
* New translations en.yml (Spanish, Argentina)
* New translations simple_form.en.yml (Spanish, Argentina)
* New translations en.json (Korean)
* New translations en.yml (Thai)
* New translations en.yml (Spanish)
* New translations en.yml (Spanish)
* New translations en.yml (Thai)
* New translations en.yml (Spanish)
* New translations en.yml (Thai)
* New translations en.yml (Kurmanji (Kurdish))
* New translations en.yml (Kurmanji (Kurdish))
* New translations en.yml (Kurmanji (Kurdish))
* New translations en.yml (Kurmanji (Kurdish))
* New translations simple_form.en.yml (Kurmanji (Kurdish))
* New translations en.yml (Spanish)
* New translations en.yml (Kurmanji (Kurdish))
* New translations simple_form.en.yml (Spanish)
* New translations simple_form.en.yml (Kurmanji (Kurdish))
* New translations en.yml (Spanish)
* New translations en.yml (Kurmanji (Kurdish))
* New translations en.yml (Kurmanji (Kurdish))
* New translations en.yml (Kurmanji (Kurdish))
* New translations en.yml (Korean)
* New translations en.yml (Korean)
* New translations en.json (Korean)
* New translations en.yml (Korean)
* New translations en.yml (Korean)
* New translations en.yml (Thai)
* New translations en.yml (Thai)
* New translations en.yml (Thai)
* New translations en.yml (Thai)
* New translations en.yml (Korean)
* New translations simple_form.en.yml (Korean)
* New translations en.yml (Korean)
* New translations en.yml (Portuguese)
* New translations en.yml (Hungarian)
* New translations en.yml (Armenian)
* New translations en.yml (Georgian)
* New translations en.yml (Dutch)
* New translations en.yml (Norwegian)
* New translations en.yml (Polish)
* New translations en.yml (Albanian)
* New translations en.yml (Basque)
* New translations en.yml (Serbian (Cyrillic))
* New translations en.yml (Turkish)
* New translations en.yml (Ukrainian)
* New translations en.yml (Chinese Traditional)
* New translations en.yml (Icelandic)
* New translations en.yml (Portuguese, Brazilian)
* New translations en.yml (Indonesian)
* New translations en.yml (Spanish, Argentina)
* New translations en.yml (Finnish)
* New translations en.yml (Greek)
* New translations en.yml (Galician)
* New translations en.yml (Slovak)
* New translations en.yml (Chinese Simplified)
* New translations en.yml (Swedish)
* New translations en.yml (Arabic)
* New translations en.yml (French)
* New translations en.yml (Spanish)
* New translations en.yml (Catalan)
* New translations en.yml (Italian)
* New translations en.yml (Japanese)
* New translations en.yml (Russian)
* New translations en.yml (Slovenian)
* New translations en.yml (German)
* New translations en.yml (Vietnamese)
* New translations en.yml (Thai)
* New translations en.yml (Scottish Gaelic)
* New translations en.yml (Occitan)
* New translations en.yml (Persian)
* New translations en.yml (Czech)
* New translations en.yml (Danish)
* New translations en.yml (Spanish, Mexico)
* New translations en.yml (Kabyle)
* New translations en.yml (Sardinian)
* New translations en.yml (Corsican)
* New translations en.yml (Sorani (Kurdish))
* New translations en.yml (Kurmanji (Kurdish))
* New translations en.yml (Serbian (Latin))
* New translations en.yml (Chinese Traditional, Hong Kong)
* New translations en.yml (Esperanto)
* New translations en.yml (Welsh)
* New translations en.yml (Malay)
* New translations en.yml (Latvian)
* New translations en.yml (Estonian)
* New translations en.yml (Kazakh)
* New translations en.yml (Norwegian Nynorsk)
* New translations en.yml (Galician)
* New translations en.yml (Hungarian)
* New translations en.yml (Galician)
* New translations en.yml (Catalan)
* New translations en.yml (Hungarian)
* New translations en.yml (Polish)
* New translations en.yml (Breton)
* New translations en.json (Breton)
* New translations en.yml (Galician)
* New translations en.yml (Icelandic)
* New translations en.yml (Spanish)
* New translations en.yml (Icelandic)
* New translations en.yml (Portuguese)
* New translations en.yml (Portuguese)
* New translations en.yml (Portuguese)
* New translations en.yml (Vietnamese)
* New translations en.yml (Portuguese)
* New translations en.yml (Ukrainian)
* New translations en.yml (Kurmanji (Kurdish))
* New translations en.yml (Portuguese)
* New translations en.yml (Kurmanji (Kurdish))
* New translations simple_form.en.yml (Portuguese)
* New translations en.yml (Ukrainian)
* New translations en.yml (Albanian)
* New translations en.yml (Ukrainian)
* New translations simple_form.en.yml (Ukrainian)
* New translations en.yml (Albanian)
* New translations en.yml (Ukrainian)
* New translations en.yml (Italian)
* New translations en.yml (French)
* New translations simple_form.en.yml (Finnish)
* New translations simple_form.en.yml (Finnish)
* New translations simple_form.en.yml (Finnish)
* New translations simple_form.en.yml (Finnish)
* New translations simple_form.en.yml (Finnish)
* New translations simple_form.en.yml (Finnish)
* New translations en.yml (Korean)
* New translations en.yml (Korean)
* New translations simple_form.en.yml (Korean)
* New translations en.yml (Chinese Traditional)
* New translations en.yml (Chinese Traditional)
* New translations en.yml (Danish)
* New translations en.yml (Danish)
* New translations en.yml (Spanish, Argentina)
* New translations en.yml (Spanish, Argentina)
* New translations en.yml (Turkish)
* New translations en.yml (Latvian)
* New translations en.yml (Latvian)
* New translations en.json (Russian)
* New translations simple_form.en.yml (Russian)
* New translations en.yml (Russian)
* New translations en.yml (Galician)
* New translations en.yml (Russian)
* New translations en.yml (Indonesian)
* New translations en.yml (Galician)
* New translations en.yml (Galician)
* New translations en.yml (Russian)
* New translations en.yml (Russian)
* New translations en.yml (Russian)
* New translations en.yml (Chinese Simplified)
* New translations en.yml (Chinese Simplified)
* New translations en.yml (Chinese Traditional)
* Ran `yarn manage:translations`
* Ran `bundle exec i18n-tasks normalize`
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2022-02-19 13:20:00 +09:00
Eugen Rochko
de448ab1b5
Change global `locale` param to `lang` to avoid conflicts ( #17592 )
2022-02-19 03:12:28 +01:00
helloworldstack
2426577a91
Fix sign in token and warning emails failed to send in some cases ( #17589 )
2022-02-18 20:43:42 +01:00
zunda
f9e7f2e409
Avoid return within block ( #17590 )
...
This prevents the error: LocalJumpError (unexpected return)
2022-02-18 20:21:21 +01:00
Jeong Arm
1de2e3f980
Throttle IPv6 signup for subnet ( #17588 )
2022-02-18 13:51:51 +01:00
Claire
c8ef003c6b
Merge pull request #1692 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2022-02-17 22:31:21 +01:00
Claire
41a8606627
[Glitch] Fix opening the emoji picker scrolling the single-column view to the top
...
Port aa86cf9557
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-02-17 11:05:47 +01:00
Claire
d70e4e3da0
[Glitch] Fix edge case where settings/admin page sidebar would be incorrectly hidden
...
Port 00b45b967e
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-02-17 11:04:13 +01:00
Claire
41d52ee4b5
Fix issue with glitch-soc's theming system
2022-02-17 10:59:01 +01:00
Eugen Rochko
5ed35a0df4
[Glitch] Add appeals
...
Port SCSS changes from 564efd0651
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-02-17 10:58:57 +01:00
Eugen Rochko
3a0eba4918
[Glitch] Fix privacy policy link not being visible on small screens
...
Port bbd3474416
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-02-17 10:58:53 +01:00
Claire
f224237862
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `db/schema.rb`:
Conflict due to glitch-soc adding the `content_type` column on status edits
and thus having a different schema version number.
Solved by taking upstream's schema version number, as it is higher than
glitch-soc's.
2022-02-17 10:58:44 +01:00
Claire
ac99f586bb
Fix issues when attempting to appeal an old strike ( #17554 )
...
* Display an error when an appeal could not be submitted
* Do not offer users to appeal old strikes
* Fix 500 error when trying to appeal a strike that is too old
* Avoid using an extra translatable string
2022-02-16 22:29:48 +01:00
Claire
aa86cf9557
Fix opening the emoji picker scrolling the single-column view to the top ( #17579 )
...
Fixes #17577
2022-02-16 21:44:47 +01:00
Claire
00b45b967e
Fix edge case where settings/admin page sidebar would be incorrectly hidden ( #17580 )
2022-02-16 21:44:19 +01:00
Claire
ec4f906618
Fix toggling sidebar on mobile in admin pages
2022-02-16 16:33:23 +01:00
Claire
1abf0f9000
Fix 0 pluralization for some localization strings ( #17576 )
...
Apparently, when the `zero` case is not defined, the translation string used
for `0` depends on the language. In French, `one` is used, causing some strings
with hardcoded “one” or `1` to misrepresent the actual data.
For instance, the dashboard would display « 1 utilisateur·rice en attente » for
both 0 and 1 pending users.
2022-02-16 14:57:57 +01:00
Claire
6ea80ba2a2
Change streaming server error messages when failing to parse client input ( #17559 )
...
Fixes #17541
- prefix JSON parsing error message by “Error parsing message from …”
- output user id if a user is logged in, IP address otherwise
- reduce log level from error to warning when a user is logged in, and to silly
otherwise
2022-02-16 14:37:26 +01:00
Claire
8f537a1168
Change relays handling to not record boosts ( #17571 )
...
* Change relays handling to not record boosts
* Update tests
2022-02-16 14:36:44 +01:00
Claire
73fce8d311
Fix performance of server-side filtering ( #17575 )
...
Fixes #17567
2022-02-16 14:28:45 +01:00
Claire
793da08995
Change dasbhoard links for “new users” and “active users” ( #17570 )
...
Make them filter for local accounts by default
2022-02-16 13:17:28 +01:00
Jeong Arm
2fd2666eea
Add test for user matching ip ( #17572 )
2022-02-16 13:14:53 +01:00
dependabot[bot]
436d1243e5
Bump axios from 0.25.0 to 0.26.0 ( #17551 )
...
Bumps [axios](https://github.com/axios/axios ) from 0.25.0 to 0.26.0.
- [Release notes](https://github.com/axios/axios/releases )
- [Changelog](https://github.com/axios/axios/blob/master/CHANGELOG.md )
- [Commits](https://github.com/axios/axios/compare/v0.25.0...v0.26.0 )
---
updated-dependencies:
- dependency-name: axios
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-16 19:20:37 +09:00
dependabot[bot]
448d62058c
Bump scenic from 1.5.5 to 1.6.0 ( #17547 )
...
Bumps [scenic](https://github.com/scenic-views/scenic ) from 1.5.5 to 1.6.0.
- [Release notes](https://github.com/scenic-views/scenic/releases )
- [Changelog](https://github.com/scenic-views/scenic/blob/main/CHANGELOG.md )
- [Commits](https://github.com/scenic-views/scenic/compare/v1.5.5...v1.6.0 )
---
updated-dependencies:
- dependency-name: scenic
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-16 19:18:09 +09:00
dependabot[bot]
073543a19c
Bump pg from 1.3.1 to 1.3.2 ( #17555 )
...
Bumps [pg](https://github.com/ged/ruby-pg ) from 1.3.1 to 1.3.2.
- [Release notes](https://github.com/ged/ruby-pg/releases )
- [Changelog](https://github.com/ged/ruby-pg/blob/master/History.rdoc )
- [Commits](https://github.com/ged/ruby-pg/compare/v1.3.1...v1.3.2 )
---
updated-dependencies:
- dependency-name: pg
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-16 13:05:10 +09:00
dependabot[bot]
5f4b9e1bce
Bump rails from 6.1.4.4 to 6.1.4.6 ( #17550 )
...
Bumps [rails](https://github.com/rails/rails ) from 6.1.4.4 to 6.1.4.6.
- [Release notes](https://github.com/rails/rails/releases )
- [Commits](https://github.com/rails/rails/compare/v6.1.4.4...v6.1.4.6 )
---
updated-dependencies:
- dependency-name: rails
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-15 14:13:48 +09:00
dependabot[bot]
db94a3d94d
Bump rqrcode from 2.1.0 to 2.1.1 ( #17542 )
...
Bumps [rqrcode](https://github.com/whomwah/rqrcode ) from 2.1.0 to 2.1.1.
- [Release notes](https://github.com/whomwah/rqrcode/releases )
- [Changelog](https://github.com/whomwah/rqrcode/blob/master/CHANGELOG.md )
- [Commits](https://github.com/whomwah/rqrcode/compare/v2.1.0...v2.1.1 )
---
updated-dependencies:
- dependency-name: rqrcode
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-15 11:07:42 +09:00
dependabot[bot]
b289644227
Bump npmlog from 6.0.0 to 6.0.1 ( #17545 )
...
Bumps [npmlog](https://github.com/npm/npmlog ) from 6.0.0 to 6.0.1.
- [Release notes](https://github.com/npm/npmlog/releases )
- [Changelog](https://github.com/npm/npmlog/blob/main/CHANGELOG.md )
- [Commits](https://github.com/npm/npmlog/compare/v6.0.0...v6.0.1 )
---
updated-dependencies:
- dependency-name: npmlog
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-15 11:07:14 +09:00
dependabot[bot]
5939aa934b
Bump @babel/plugin-proposal-decorators from 7.17.0 to 7.17.2 ( #17548 )
...
Bumps [@babel/plugin-proposal-decorators](https://github.com/babel/babel/tree/HEAD/packages/babel-plugin-proposal-decorators ) from 7.17.0 to 7.17.2.
- [Release notes](https://github.com/babel/babel/releases )
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md )
- [Commits](https://github.com/babel/babel/commits/v7.17.2/packages/babel-plugin-proposal-decorators )
---
updated-dependencies:
- dependency-name: "@babel/plugin-proposal-decorators"
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-15 11:06:25 +09:00
dependabot[bot]
fee7d5cce6
Bump babel-jest from 27.5.0 to 27.5.1 ( #17549 )
...
Bumps [babel-jest](https://github.com/facebook/jest/tree/HEAD/packages/babel-jest ) from 27.5.0 to 27.5.1.
- [Release notes](https://github.com/facebook/jest/releases )
- [Changelog](https://github.com/facebook/jest/blob/main/CHANGELOG.md )
- [Commits](https://github.com/facebook/jest/commits/v27.5.1/packages/babel-jest )
---
updated-dependencies:
- dependency-name: babel-jest
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-15 11:06:06 +09:00
dependabot[bot]
61c2e74f07
Bump @babel/runtime from 7.17.0 to 7.17.2 ( #17544 )
...
Bumps [@babel/runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-runtime ) from 7.17.0 to 7.17.2.
- [Release notes](https://github.com/babel/babel/releases )
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md )
- [Commits](https://github.com/babel/babel/commits/v7.17.2/packages/babel-runtime )
---
updated-dependencies:
- dependency-name: "@babel/runtime"
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-15 11:05:18 +09:00
dependabot[bot]
f5c6ee4d54
Bump dotenv from 10.0.0 to 16.0.0 ( #17476 )
...
Bumps [dotenv](https://github.com/motdotla/dotenv ) from 10.0.0 to 16.0.0.
- [Release notes](https://github.com/motdotla/dotenv/releases )
- [Changelog](https://github.com/motdotla/dotenv/blob/master/CHANGELOG.md )
- [Commits](https://github.com/motdotla/dotenv/compare/v10.0.0...v16.0.0 )
---
updated-dependencies:
- dependency-name: dotenv
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-14 21:49:40 +01:00
Eugen Rochko
564efd0651
Add appeals ( #17364 )
...
* Add appeals
* Add ability to reject appeals and ability to browse pending appeals in admin UI
* Add strikes to account page in settings
* Various fixes and improvements
- Add separate notification setting for appeals, separate from reports
- Fix style of links in report/strike header
- Change approving an appeal to not restore statuses (due to federation complexities)
- Change style of successfully appealed strikes on account settings page
- Change account settings page to only show unappealed or recently appealed strikes
* Change appealed_at to overruled_at
* Fix missing method error
2022-02-14 21:27:53 +01:00
Claire
5be705e1e0
Revert "Bump strong_migrations from 0.7.9 to 0.8.0 ( #17504 )" ( #17540 )
...
This reverts commit f76dd51aa5
.
2022-02-14 16:08:23 +01:00
Yamagishi Kazutoshi
298491a816
Remove protobuf dependencies ( #17539 )
2022-02-14 16:08:02 +01:00
Jeong Arm
d39df35441
Fix admin statuses page order with media ( #17538 )
2022-02-14 16:07:04 +01:00
Jeong Arm
9a015e43ef
Add `from:` query operator to search syntax ( #16526 )
...
* Add 'by:userhandle' parameter to search api
* Use search syntax for "by" prefix
* Codeclimate
* Use 'from' instead of 'by'
2022-02-14 00:17:09 +01:00
dependabot[bot]
901bbf2e5f
Bump kt-paperclip from 7.0.1 to 7.1.1 ( #17502 )
...
Bumps [kt-paperclip](https://github.com/kreeti/kt-paperclip ) from 7.0.1 to 7.1.1.
- [Release notes](https://github.com/kreeti/kt-paperclip/releases )
- [Changelog](https://github.com/kreeti/kt-paperclip/blob/master/NEWS )
- [Commits](https://github.com/kreeti/kt-paperclip/compare/v7.0.1...v7.1.1 )
---
updated-dependencies:
- dependency-name: kt-paperclip
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-13 20:21:09 +09:00
Eugen Rochko
bbd3474416
Fix privacy policy link not being visible on small screens ( #17533 )
...
Fix #17482
2022-02-13 02:52:34 +01:00
Eugen Rochko
6240466866
Fix duplicate accounts when searching by IP range in admin UI ( #17524 )
2022-02-13 01:58:26 +01:00
dependabot[bot]
f76dd51aa5
Bump strong_migrations from 0.7.9 to 0.8.0 ( #17504 )
...
Bumps [strong_migrations](https://github.com/ankane/strong_migrations ) from 0.7.9 to 0.8.0.
- [Release notes](https://github.com/ankane/strong_migrations/releases )
- [Changelog](https://github.com/ankane/strong_migrations/blob/master/CHANGELOG.md )
- [Commits](https://github.com/ankane/strong_migrations/compare/v0.7.9...v0.8.0 )
---
updated-dependencies:
- dependency-name: strong_migrations
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-13 08:05:22 +09:00
dependabot[bot]
b87c853806
Bump annotate from 3.1.1 to 3.2.0 ( #17503 )
...
Bumps [annotate](https://github.com/ctran/annotate_models ) from 3.1.1 to 3.2.0.
- [Release notes](https://github.com/ctran/annotate_models/releases )
- [Changelog](https://github.com/ctran/annotate_models/blob/develop/CHANGELOG.md )
- [Commits](https://github.com/ctran/annotate_models/compare/v3.1.1...v3.2.0 )
---
updated-dependencies:
- dependency-name: annotate
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-13 08:04:32 +09:00
dependabot[bot]
4a61bbe176
Bump rspec-rails from 5.0.2 to 5.1.0 ( #17406 )
...
Bumps [rspec-rails](https://github.com/rspec/rspec-rails ) from 5.0.2 to 5.1.0.
- [Release notes](https://github.com/rspec/rspec-rails/releases )
- [Changelog](https://github.com/rspec/rspec-rails/blob/main/Changelog.md )
- [Commits](https://github.com/rspec/rspec-rails/compare/v5.0.2...v5.1.0 )
---
updated-dependencies:
- dependency-name: rspec-rails
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-13 08:00:26 +09:00
Claire
6f78c66fe0
Merge pull request #1691 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2022-02-12 22:43:43 +01:00
Claire
f3429d7354
[Glitch] Fix controls for unchangeable properties on status edit not being disabled
...
Port 38845592c4
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-02-12 22:36:39 +01:00
Claire
c9669ee167
Merge branch 'main' into glitch-soc/merge-upstream
2022-02-12 21:36:33 +01:00
Holly
27803cd2b7
Make the settings button go to settings when opened in a new tab
2022-02-12 20:12:29 +01:00
Claire
7396a254c1
Fix empty batch statuses selection causing a 500 error ( #17532 )
...
* Fix empty batch statuses selection causing a 500 error
* Simplify current_params
2022-02-12 19:52:17 +01:00
Claire
38845592c4
Fix controls for unchangeable properties on status edit not being disabled ( #17531 )
...
Fixes #17520
2022-02-12 19:00:33 +01:00
Yamagishi Kazutoshi
ee40c2c5b0
Bump chewy from 7.2.3 to 7.2.4 ( #17529 )
2022-02-12 18:07:42 +01:00
Claire
2d3f8055ed
Fix attempts at distributing Update activities for local-only posts
2022-02-12 15:41:18 +01:00
Claire
f61137b7ff
Merge pull request #1688 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2022-02-12 14:33:01 +01:00
Eugen Rochko
f4db2e1832
[Glitch] Fix layout of the report page on smaller screens in admin UI
...
Port e848d281d5
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-02-12 13:15:07 +01:00
Eugen Rochko
958089fb21
[Glitch] Add notifications when a reblogged status has been updated
...
Port front-end changes from 8f03b7a2fb
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-02-12 13:15:07 +01:00
dependabot[bot]
d35bc9c3cc
Bump ws from 8.4.2 to 8.5.0 ( #17467 )
...
Bumps [ws](https://github.com/websockets/ws ) from 8.4.2 to 8.5.0.
- [Release notes](https://github.com/websockets/ws/releases )
- [Commits](https://github.com/websockets/ws/compare/8.4.2...8.5.0 )
---
updated-dependencies:
- dependency-name: ws
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-12 20:50:49 +09:00
dependabot[bot]
348855b6c5
Bump ox from 2.14.7 to 2.14.9 ( #17528 )
...
Bumps [ox](https://github.com/ohler55/ox ) from 2.14.7 to 2.14.9.
- [Release notes](https://github.com/ohler55/ox/releases )
- [Changelog](https://github.com/ohler55/ox/blob/develop/CHANGELOG.md )
- [Commits](https://github.com/ohler55/ox/compare/v2.14.7...v2.14.9 )
---
updated-dependencies:
- dependency-name: ox
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-12 20:50:17 +09:00
dependabot[bot]
6a99e33cbc
Bump babel-plugin-preval from 5.0.0 to 5.1.0 ( #17475 )
...
Bumps [babel-plugin-preval](https://github.com/kentcdodds/babel-plugin-preval ) from 5.0.0 to 5.1.0.
- [Release notes](https://github.com/kentcdodds/babel-plugin-preval/releases )
- [Changelog](https://github.com/kentcdodds/babel-plugin-preval/blob/main/CHANGELOG.md )
- [Commits](https://github.com/kentcdodds/babel-plugin-preval/compare/v5.0.0...v5.1.0 )
---
updated-dependencies:
- dependency-name: babel-plugin-preval
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-12 20:21:56 +09:00
Claire
d9379f5331
Merge branch 'main' into glitch-soc/merge-upstream
2022-02-12 11:12:41 +01:00
dependabot[bot]
79b167f01a
Bump follow-redirects from 1.14.7 to 1.14.8 ( #17527 )
...
Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects ) from 1.14.7 to 1.14.8.
- [Release notes](https://github.com/follow-redirects/follow-redirects/releases )
- [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.14.7...v1.14.8 )
---
updated-dependencies:
- dependency-name: follow-redirects
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-12 01:09:31 +01:00
Eugen Rochko
e848d281d5
Fix layout of the report page on smaller screens in admin UI ( #17523 )
...
Fix #17491
2022-02-12 01:08:23 +01:00
Claire
28ec7def58
Fix missing javascript in some admin pages
2022-02-12 00:10:28 +01:00
Claire
f3b9a2b590
Add support for multiple source files per pack
2022-02-12 00:10:28 +01:00
Claire
9f763b5b79
Refactor compile-time glitch-soc theme handling
2022-02-11 23:49:00 +01:00
dependabot[bot]
4a0b6e3e5e
Bump puma from 5.6.1 to 5.6.2 ( #17526 )
...
Bumps [puma](https://github.com/puma/puma ) from 5.6.1 to 5.6.2.
- [Release notes](https://github.com/puma/puma/releases )
- [Changelog](https://github.com/puma/puma/blob/master/History.md )
- [Commits](https://github.com/puma/puma/compare/v5.6.1...v5.6.2 )
---
updated-dependencies:
- dependency-name: puma
dependency-type: direct:production
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-11 23:16:52 +01:00
Jeong Arm
ee47e2028b
Enable domain purge button on suspended domains too ( #17209 )
...
* Enable domain purge button on suspended domains too
* Change unless to if
2022-02-11 22:23:19 +01:00
Claire
59b7ba451b
Merge pull request #1684 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2022-02-11 22:22:25 +01:00
Eugen Rochko
8f03b7a2fb
Add notifications when a reblogged status has been updated ( #17404 )
...
* Add notifications when a reblogged status has been updated
* Change wording to say "edit" instead of "update" and add missing controls
* Replace previous update notifications with the most up-to-date one
2022-02-11 22:20:19 +01:00
Eugen Rochko
a34e4f7e27
[Glitch] Change actions in reports to require only one click
...
Port SCSS changes from d0fcf07436
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-02-11 21:56:27 +01:00
Claire
51cad4f7fb
Merge branch 'main' into glitch-soc/merge-upstream
2022-02-11 21:53:20 +01:00
Eugen Rochko
d0fcf07436
Change actions in reports to require only one click ( #17487 )
2022-02-11 21:51:57 +01:00
Eugen Rochko
a27729ee48
Change reblogs to not count towards hashtag trends anymore ( #17501 )
2022-02-11 21:16:23 +01:00
bobbyd0g
a131f06e12
Helm chart SSO support ( #17205 )
...
* Add SAML support
* move extAuth below essential components
* Add CAS, PAM, LDAP support
* Add WEB_DOMAIN and S3_ALIAS_HOST support
* SAML defaults aligned
* Bump chart version
* SSO & WEB_DOMAIN support added
* Add OIDC support
* Correct typo
* Notice for OIDC support
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
2022-02-11 15:01:40 +01:00
Eugen Rochko
c9a52833b6
Fix deletes not being signed in authorized fetch mode ( #17484 )
...
Fix #17483
2022-02-11 14:52:45 +01:00
Claire
d4e6774a0c
Fix Undo Announce sometimes inlining the originally Announced status ( #17516 )
...
* Change tests to have more specific expectations on sent ActivityPub payloads
* Check that payload doesn't actually contain the contents of the boosted toot
* Fix Undo Announce sometimes inlining the originally Announced status
2022-02-11 14:52:07 +01:00
Eugen Rochko
6f38765fcc
New Crowdin updates ( #16858 )
...
* New translations en.yml (Russian)
[ci skip]
* New translations en.yml (Russian)
[ci skip]
* New translations en.yml (French)
[ci skip]
* New translations en.yml (Russian)
[ci skip]
* New translations en.yml (French)
[ci skip]
* New translations en.yml (Russian)
[ci skip]
* New translations en.json (French)
[ci skip]
* New translations en.yml (Russian)
[ci skip]
* New translations en.json (French)
[ci skip]
* New translations simple_form.en.yml (French)
[ci skip]
* New translations en.yml (French)
[ci skip]
* New translations en.yml (Russian)
[ci skip]
* New translations simple_form.en.yml (French)
[ci skip]
* New translations en.yml (French)
[ci skip]
* New translations en.yml (Russian)
[ci skip]
* New translations en.yml (French)
[ci skip]
* New translations en.yml (Russian)
[ci skip]
* New translations en.yml (French)
[ci skip]
* New translations devise.en.yml (French)
[ci skip]
* New translations devise.en.yml (French)
[ci skip]
* New translations activerecord.en.yml (French)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations en.yml (Russian)
[ci skip]
* New translations en.yml (French)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
* New translations en.yml (Chinese Simplified)
[ci skip]
* New translations en.yml (Russian)
[ci skip]
* New translations en.yml (Russian)
[ci skip]
* New translations en.yml (Scottish Gaelic)
[ci skip]
* New translations en.yml (Russian)
[ci skip]
* New translations en.yml (Russian)
[ci skip]
* New translations en.yml (Russian)
[ci skip]
* New translations en.yml (Russian)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations en.yml (Hebrew)
[ci skip]
* New translations en.yml (Russian)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations en.yml (French)
[ci skip]
* New translations en.yml (French)
[ci skip]
* New translations en.yml (French)
[ci skip]
* New translations en.yml (Slovak)
[ci skip]
* New translations en.yml (Italian)
[ci skip]
* New translations en.yml (French)
[ci skip]
* New translations en.yml (French)
[ci skip]
* New translations en.yml (Korean)
[ci skip]
* New translations en.json (Slovenian)
[ci skip]
* New translations en.json (Slovenian)
[ci skip]
* New translations activerecord.en.yml (Slovenian)
[ci skip]
* New translations en.yml (Slovenian)
[ci skip]
* New translations doorkeeper.en.yml (Slovenian)
[ci skip]
* New translations activerecord.en.yml (Slovenian)
[ci skip]
* New translations simple_form.en.yml (Slovenian)
[ci skip]
* New translations devise.en.yml (Slovenian)
[ci skip]
* New translations simple_form.en.yml (Slovenian)
[ci skip]
* New translations en.json (Persian)
[ci skip]
* New translations en.yml (Japanese)
[ci skip]
* New translations en.yml (Swedish)
[ci skip]
* New translations en.yml (Swedish)
[ci skip]
* New translations en.json (Slovenian)
[ci skip]
* New translations devise.en.yml (Slovenian)
[ci skip]
* New translations en.json (Slovenian)
[ci skip]
* New translations en.json (Slovenian)
[ci skip]
* New translations en.yml (Slovenian)
[ci skip]
* New translations en.json (Slovenian)
[ci skip]
* New translations doorkeeper.en.yml (Slovenian)
[ci skip]
* New translations en.yml (Slovenian)
[ci skip]
* New translations en.yml (Slovenian)
[ci skip]
* New translations simple_form.en.yml (Slovenian)
[ci skip]
* New translations devise.en.yml (Slovenian)
[ci skip]
* New translations en.yml (Swedish)
[ci skip]
* New translations en.yml (Slovenian)
[ci skip]
* New translations en.yml (Japanese)
[ci skip]
* New translations simple_form.en.yml (Catalan)
[ci skip]
* New translations en.yml (Catalan)
[ci skip]
* New translations simple_form.en.yml (Catalan)
[ci skip]
* New translations simple_form.en.yml (Catalan)
[ci skip]
* New translations en.yml (Catalan)
[ci skip]
* New translations en.json (Catalan)
[ci skip]
* New translations simple_form.en.yml (Catalan)
[ci skip]
* New translations doorkeeper.en.yml (Catalan)
[ci skip]
* New translations en.yml (Catalan)
[ci skip]
* New translations en.json (Catalan)
[ci skip]
* New translations en.yml (Arabic)
[ci skip]
* New translations en.yml (Arabic)
[ci skip]
* New translations en.yml (Arabic)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations en.yml (Slovak)
[ci skip]
* New translations en.yml (Vietnamese)
[ci skip]
* New translations en.yml (Occitan)
[ci skip]
* New translations en.json (Occitan)
[ci skip]
* New translations simple_form.en.yml (Chinese Simplified)
[ci skip]
* New translations en.json (Arabic)
[ci skip]
* New translations en.json (Arabic)
[ci skip]
* New translations en.json (Arabic)
[ci skip]
* New translations en.json (Arabic)
[ci skip]
* New translations en.json (Arabic)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations en.json (Thai)
[ci skip]
* New translations en.json (Norwegian Nynorsk)
[ci skip]
* New translations en.json (Norwegian Nynorsk)
[ci skip]
* New translations en.json (Norwegian)
[ci skip]
* New translations en.yml (French)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations en.yml (Persian)
[ci skip]
* New translations simple_form.en.yml (Thai)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations en.json (Thai)
[ci skip]
* New translations simple_form.en.yml (Thai)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
* New translations en.yml (Korean)
[ci skip]
* New translations en.yml (Portuguese)
[ci skip]
* New translations en.yml (Hungarian)
[ci skip]
* New translations en.yml (Armenian)
[ci skip]
* New translations en.yml (Georgian)
[ci skip]
* New translations en.yml (Lithuanian)
[ci skip]
* New translations en.yml (Dutch)
[ci skip]
* New translations en.yml (Norwegian)
[ci skip]
* New translations en.yml (Polish)
[ci skip]
* New translations en.yml (Albanian)
[ci skip]
* New translations en.yml (Basque)
[ci skip]
* New translations en.yml (Serbian (Cyrillic))
[ci skip]
* New translations en.yml (Turkish)
[ci skip]
* New translations en.yml (Ukrainian)
[ci skip]
* New translations en.yml (Chinese Traditional)
[ci skip]
* New translations en.yml (Icelandic)
[ci skip]
* New translations en.yml (Portuguese, Brazilian)
[ci skip]
* New translations en.yml (Indonesian)
[ci skip]
* New translations en.yml (Spanish, Argentina)
[ci skip]
* New translations en.yml (Finnish)
[ci skip]
* New translations en.yml (Greek)
[ci skip]
* New translations en.yml (Galician)
[ci skip]
* New translations en.yml (Slovak)
[ci skip]
* New translations en.yml (Chinese Simplified)
[ci skip]
* New translations en.yml (Swedish)
[ci skip]
* New translations en.yml (Arabic)
[ci skip]
* New translations en.yml (French)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
* New translations en.yml (Catalan)
[ci skip]
* New translations en.yml (Italian)
[ci skip]
* New translations en.yml (Japanese)
[ci skip]
* New translations en.yml (Russian)
[ci skip]
* New translations en.yml (Slovenian)
[ci skip]
* New translations en.yml (German)
[ci skip]
* New translations en.yml (Vietnamese)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations en.yml (Scottish Gaelic)
[ci skip]
* New translations en.yml (Occitan)
[ci skip]
* New translations en.yml (Persian)
[ci skip]
* New translations en.yml (Romanian)
[ci skip]
* New translations en.yml (Czech)
[ci skip]
* New translations en.yml (Danish)
[ci skip]
* New translations en.yml (Spanish, Mexico)
[ci skip]
* New translations en.yml (Kabyle)
[ci skip]
* New translations en.yml (Sardinian)
[ci skip]
* New translations en.yml (Corsican)
[ci skip]
* New translations en.yml (Sorani (Kurdish))
[ci skip]
* New translations en.yml (Kurmanji (Kurdish))
[ci skip]
* New translations en.yml (Asturian)
[ci skip]
* New translations en.yml (Chinese Traditional, Hong Kong)
[ci skip]
* New translations en.yml (Esperanto)
[ci skip]
* New translations en.yml (Welsh)
[ci skip]
* New translations en.yml (Latvian)
[ci skip]
* New translations en.yml (Estonian)
[ci skip]
* New translations en.yml (Kazakh)
[ci skip]
* New translations en.yml (Norwegian Nynorsk)
[ci skip]
* New translations en.yml (Kurmanji (Kurdish))
[ci skip]
* New translations en.yml (Catalan)
[ci skip]
* New translations en.yml (Chinese Traditional)
[ci skip]
* New translations en.yml (Russian)
[ci skip]
* New translations en.yml (Russian)
[ci skip]
* New translations en.yml (Galician)
[ci skip]
* New translations en.yml (Hebrew)
[ci skip]
* New translations en.json (Hebrew)
[ci skip]
* New translations en.yml (Catalan)
[ci skip]
* New translations en.yml (Greek)
[ci skip]
* New translations en.yml (Polish)
[ci skip]
* New translations en.yml (Hungarian)
[ci skip]
* New translations en.yml (Japanese)
[ci skip]
* New translations en.yml (Albanian)
[ci skip]
* New translations en.yml (Italian)
[ci skip]
* New translations en.yml (Indonesian)
[ci skip]
* New translations en.yml (Icelandic)
[ci skip]
* New translations en.yml (Swedish)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
* New translations en.yml (Turkish)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations en.yml (Danish)
[ci skip]
* New translations en.yml (Spanish, Argentina)
[ci skip]
* New translations en.yml (Ukrainian)
[ci skip]
* New translations en.yml (Latvian)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations devise.en.yml (Thai)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations devise.en.yml (Thai)
[ci skip]
* New translations en.yml (French)
[ci skip]
* New translations devise.en.yml (Thai)
[ci skip]
* New translations devise.en.yml (Thai)
[ci skip]
* New translations en.yml (Spanish, Mexico)
[ci skip]
* New translations en.yml (German)
[ci skip]
* New translations en.yml (Ukrainian)
[ci skip]
* New translations en.yml (Latvian)
[ci skip]
* New translations en.yml (Kurmanji (Kurdish))
[ci skip]
* New translations en.yml (Catalan)
[ci skip]
* New translations en.yml (Catalan)
[ci skip]
* New translations en.yml (Danish)
[ci skip]
* New translations en.yml (Vietnamese)
[ci skip]
* New translations en.yml (Chinese Traditional)
[ci skip]
* New translations en.yml (Turkish)
[ci skip]
* New translations en.yml (Russian)
[ci skip]
* New translations en.yml (Greek)
[ci skip]
* New translations en.json (Greek)
[ci skip]
* New translations en.yml (Galician)
[ci skip]
* New translations en.json (Greek)
[ci skip]
* New translations en.yml (Spanish, Argentina)
[ci skip]
* New translations en.yml (Chinese Simplified)
[ci skip]
* New translations en.yml (Kabyle)
[ci skip]
* New translations en.yml (French)
[ci skip]
* New translations en.yml (French)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
* New translations en.yml (Slovenian)
[ci skip]
* New translations simple_form.en.yml (Slovenian)
[ci skip]
* New translations en.yml (Hungarian)
[ci skip]
* New translations en.yml (Icelandic)
[ci skip]
* New translations simple_form.en.yml (Polish)
[ci skip]
* New translations en.yml (Esperanto)
[ci skip]
* New translations en.json (Dutch)
[ci skip]
* New translations en.json (Dutch)
[ci skip]
* New translations en.yml (Dutch)
[ci skip]
* New translations en.yml (Dutch)
[ci skip]
* New translations en.yml (French)
[ci skip]
* New translations en.yml (French)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* Ran `i18n-tasks normalize`
* Ran `yarn manage:translations`
* Add space
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2022-02-11 04:50:27 +01:00
dependabot[bot]
cc7ae3932c
Bump @babel/plugin-transform-runtime from 7.16.10 to 7.17.0 ( #17474 )
...
Bumps [@babel/plugin-transform-runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-plugin-transform-runtime ) from 7.16.10 to 7.17.0.
- [Release notes](https://github.com/babel/babel/releases )
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md )
- [Commits](https://github.com/babel/babel/commits/v7.17.0/packages/babel-plugin-transform-runtime )
---
updated-dependencies:
- dependency-name: "@babel/plugin-transform-runtime"
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-11 11:59:31 +09:00
dependabot[bot]
c363fbe3a3
Bump @babel/core from 7.16.12 to 7.17.2 ( #17510 )
...
Bumps [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core ) from 7.16.12 to 7.17.2.
- [Release notes](https://github.com/babel/babel/releases )
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md )
- [Commits](https://github.com/babel/babel/commits/v7.17.2/packages/babel-core )
---
updated-dependencies:
- dependency-name: "@babel/core"
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-11 11:59:26 +09:00
dependabot[bot]
ccad1a3cae
Bump jest from 27.4.7 to 27.5.1 ( #17512 )
...
Bumps [jest](https://github.com/facebook/jest ) from 27.4.7 to 27.5.1.
- [Release notes](https://github.com/facebook/jest/releases )
- [Changelog](https://github.com/facebook/jest/blob/main/CHANGELOG.md )
- [Commits](https://github.com/facebook/jest/compare/v27.4.7...v27.5.1 )
---
updated-dependencies:
- dependency-name: jest
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-11 11:59:12 +09:00
dependabot[bot]
b391277057
Bump @testing-library/jest-dom from 5.16.1 to 5.16.2 ( #17469 )
...
Bumps [@testing-library/jest-dom](https://github.com/testing-library/jest-dom ) from 5.16.1 to 5.16.2.
- [Release notes](https://github.com/testing-library/jest-dom/releases )
- [Changelog](https://github.com/testing-library/jest-dom/blob/main/CHANGELOG.md )
- [Commits](https://github.com/testing-library/jest-dom/compare/v5.16.1...v5.16.2 )
---
updated-dependencies:
- dependency-name: "@testing-library/jest-dom"
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-11 10:54:19 +09:00
dependabot[bot]
f9f40069d5
Bump sass from 1.49.0 to 1.49.7 ( #17470 )
...
Bumps [sass](https://github.com/sass/dart-sass ) from 1.49.0 to 1.49.7.
- [Release notes](https://github.com/sass/dart-sass/releases )
- [Changelog](https://github.com/sass/dart-sass/blob/main/CHANGELOG.md )
- [Commits](https://github.com/sass/dart-sass/compare/1.49.0...1.49.7 )
---
updated-dependencies:
- dependency-name: sass
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-11 10:53:51 +09:00
dependabot[bot]
67034ea1eb
Bump babel-jest from 27.4.6 to 27.5.0 ( #17477 )
...
Bumps [babel-jest](https://github.com/facebook/jest/tree/HEAD/packages/babel-jest ) from 27.4.6 to 27.5.0.
- [Release notes](https://github.com/facebook/jest/releases )
- [Changelog](https://github.com/facebook/jest/blob/main/CHANGELOG.md )
- [Commits](https://github.com/facebook/jest/commits/v27.5.0/packages/babel-jest )
---
updated-dependencies:
- dependency-name: babel-jest
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-11 10:53:06 +09:00
dependabot[bot]
ccf5bcc3dc
Bump @babel/runtime from 7.16.7 to 7.17.0 ( #17473 )
...
Bumps [@babel/runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-runtime ) from 7.16.7 to 7.17.0.
- [Release notes](https://github.com/babel/babel/releases )
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md )
- [Commits](https://github.com/babel/babel/commits/v7.17.0/packages/babel-runtime )
---
updated-dependencies:
- dependency-name: "@babel/runtime"
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-11 10:50:45 +09:00
dependabot[bot]
f23c8dee2a
Bump @babel/plugin-proposal-decorators from 7.16.7 to 7.17.0 ( #17468 )
...
Bumps [@babel/plugin-proposal-decorators](https://github.com/babel/babel/tree/HEAD/packages/babel-plugin-proposal-decorators ) from 7.16.7 to 7.17.0.
- [Release notes](https://github.com/babel/babel/releases )
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md )
- [Commits](https://github.com/babel/babel/commits/v7.17.0/packages/babel-plugin-proposal-decorators )
---
updated-dependencies:
- dependency-name: "@babel/plugin-proposal-decorators"
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-11 10:50:09 +09:00
dependabot[bot]
aed98fd4dd
Bump sidekiq-unique-jobs from 7.1.12 to 7.1.15 ( #17505 )
...
Bumps [sidekiq-unique-jobs](https://github.com/mhenrixon/sidekiq-unique-jobs ) from 7.1.12 to 7.1.15.
- [Release notes](https://github.com/mhenrixon/sidekiq-unique-jobs/releases )
- [Changelog](https://github.com/mhenrixon/sidekiq-unique-jobs/blob/main/CHANGELOG.md )
- [Commits](https://github.com/mhenrixon/sidekiq-unique-jobs/compare/v7.1.12...v7.1.15 )
---
updated-dependencies:
- dependency-name: sidekiq-unique-jobs
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-11 10:49:31 +09:00
Claire
472bc89611
Fix some flaky tests that randomly failed because of item ordering ( #17509 )
2022-02-10 22:00:10 +01:00
Claire
776e337b8d
Merge pull request #1683 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2022-02-10 21:07:48 +01:00
Claire
2af03164cb
Improve tests involving push_bulk ( #17508 )
...
sidekiq-bulk's push_bulk can either accept arguments directly or run them
through a block.
Setting expectations on the result of evaluating the blocks allows testing
more code (the block itself) and the test is moved closer to the *interface*
of the tested code than its precise implementation.
2022-02-10 19:42:45 +01:00
Eugen Rochko
642b5a621a
[Glitch] Chore: Disable menu items for editing statuses in web UI ( #17497 )
...
Port 3dc1e3cfc3
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-02-10 19:10:59 +01:00
Eugen Rochko
5e67858fbc
[Glitch] Add editing for published statuses
...
Port 63002cde03
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-02-10 19:10:20 +01:00
Claire
abd113167b
Add ability to change content-type when editing a toot
...
Content-type defaults to edited toot's content-type to avoid surprising
behaviors when using clients that do not support this feature.
2022-02-10 19:10:14 +01:00
Claire
f1a6f9062e
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `app/controllers/api/v1/statuses_controller.rb`:
Upstream moved things around in a place where glitch-soc had support for
an extra parameter (`content_type`).
Follow upstream but reintroduce `content_type`.
2022-02-10 19:09:27 +01:00
Eugen Rochko
3dc1e3cfc3
Chore: Disable menu items for editing statuses in web UI ( #17497 )
...
Feature must be unlocked in a separate release for max. compatibility
2022-02-10 15:28:53 +01:00
dependabot[bot]
009ad6f86b
Bump fabrication from 2.24.0 to 2.27.0 ( #17447 )
...
Bumps [fabrication](https://gitlab.com/fabrication-gem/fabrication ) from 2.24.0 to 2.27.0.
- [Release notes](https://gitlab.com/fabrication-gem/fabrication/tags )
- [Changelog](https://gitlab.com/fabrication-gem/fabrication/blob/master/Changelog.markdown )
- [Commits](https://gitlab.com/fabrication-gem/fabrication/compare/2.24.0...2.27.0 )
---
updated-dependencies:
- dependency-name: fabrication
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-10 15:25:42 +01:00
dependabot[bot]
988f3dbdc4
Bump rubocop from 1.25.0 to 1.25.1 ( #17446 )
...
Bumps [rubocop](https://github.com/rubocop/rubocop ) from 1.25.0 to 1.25.1.
- [Release notes](https://github.com/rubocop/rubocop/releases )
- [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rubocop/rubocop/compare/v1.25.0...v1.25.1 )
---
updated-dependencies:
- dependency-name: rubocop
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-10 15:12:33 +01:00
dependabot[bot]
4ff04e2343
Bump aws-sdk-s3 from 1.111.3 to 1.112.0 ( #17452 )
...
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby ) from 1.111.3 to 1.112.0.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases )
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/version-3/gems/aws-sdk-s3/CHANGELOG.md )
- [Commits](https://github.com/aws/aws-sdk-ruby/commits )
---
updated-dependencies:
- dependency-name: aws-sdk-s3
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-10 15:12:09 +01:00
dependabot[bot]
d53ce60560
Bump bootsnap from 1.10.2 to 1.10.3 ( #17466 )
...
Bumps [bootsnap](https://github.com/Shopify/bootsnap ) from 1.10.2 to 1.10.3.
- [Release notes](https://github.com/Shopify/bootsnap/releases )
- [Changelog](https://github.com/Shopify/bootsnap/blob/main/CHANGELOG.md )
- [Commits](https://github.com/Shopify/bootsnap/compare/v1.10.2...v1.10.3 )
---
updated-dependencies:
- dependency-name: bootsnap
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-10 15:11:41 +01:00
dependabot[bot]
fbe4192c03
Bump ox from 2.14.6 to 2.14.7 ( #17453 )
...
Bumps [ox](https://github.com/ohler55/ox ) from 2.14.6 to 2.14.7.
- [Release notes](https://github.com/ohler55/ox/releases )
- [Changelog](https://github.com/ohler55/ox/blob/develop/CHANGELOG.md )
- [Commits](https://github.com/ohler55/ox/compare/v2.14.6...v2.14.7 )
---
updated-dependencies:
- dependency-name: ox
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-10 15:11:16 +01:00
dependabot[bot]
a50c752726
Bump pg from 1.3.0 to 1.3.1 ( #17450 )
...
Bumps [pg](https://github.com/ged/ruby-pg ) from 1.3.0 to 1.3.1.
- [Release notes](https://github.com/ged/ruby-pg/releases )
- [Changelog](https://github.com/ged/ruby-pg/blob/master/History.rdoc )
- [Commits](https://github.com/ged/ruby-pg/compare/v1.3.0...v1.3.1 )
---
updated-dependencies:
- dependency-name: pg
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-10 15:10:47 +01:00
dependabot[bot]
2c1e453d0c
Bump puma from 5.5.2 to 5.6.1 ( #17411 )
...
Bumps [puma](https://github.com/puma/puma ) from 5.5.2 to 5.6.1.
- [Release notes](https://github.com/puma/puma/releases )
- [Changelog](https://github.com/puma/puma/blob/master/History.md )
- [Commits](https://github.com/puma/puma/compare/v5.5.2...v5.6.1 )
---
updated-dependencies:
- dependency-name: puma
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-10 15:09:06 +01:00
dependabot[bot]
ae59818335
Bump sidekiq from 6.4.0 to 6.4.1 ( #17480 )
...
Bumps [sidekiq](https://github.com/mperham/sidekiq ) from 6.4.0 to 6.4.1.
- [Release notes](https://github.com/mperham/sidekiq/releases )
- [Changelog](https://github.com/mperham/sidekiq/blob/main/Changes.md )
- [Commits](https://github.com/mperham/sidekiq/compare/v6.4.0...v6.4.1 )
---
updated-dependencies:
- dependency-name: sidekiq
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-10 15:07:06 +01:00
Claire
da91b18a8b
Fix NoMethodError in StatusUpdateDistributionWorker ( #17499 )
...
* Add tests
* Fix NoMethodError in StatusUpdateDistributionWorker
* Fix tests
2022-02-10 14:57:10 +01:00
Claire
63854bee6c
Fix poll votes not being properly reset on poll change ( #17498 )
...
* Fix poll votes not being properly reset on poll change
* Fix and add tests
* Fix poll update handling when the number of options changes
2022-02-10 14:26:54 +01:00
Eugen Rochko
1bfcb75105
Fix outdated iso-639 reference in update status service ( #17496 )
2022-02-10 03:09:44 +01:00
Eugen Rochko
63002cde03
Add editing for published statuses ( #17320 )
...
* Add editing for published statuses
* Fix change of multiple-choice boolean in poll not resetting votes
* Remove the ability to update existing media attachments for now
2022-02-10 00:15:30 +01:00
Eugen Rochko
20a3564ab2
Chore: Update browserslist ( #17493 )
2022-02-10 00:10:27 +01:00
Eugen Rochko
2f8159baad
Add `category` and `rule_ids` params to `POST /api/v1/reports` ( #17492 )
2022-02-10 00:10:16 +01:00
Claire
d602c92b31
Merge pull request #1681 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2022-02-09 19:48:05 +01:00
Claire
d90da7d080
Add content_type to status_edits
2022-02-09 18:02:31 +01:00
Eugen Rochko
44b06c4d96
[Glitch] Add edit history to web UI
...
Port fd3a45e348
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-02-09 17:51:35 +01:00
Claire
322e907e04
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/settings/preferences/appearance/show.html.haml`:
Upstream renamed some helper functions that were used in a part of the
settings page which glitch-soc slightly changed the layout of.
Ported the change.
2022-02-09 17:28:33 +01:00
Claire
8987ea4d6b
Merge pull request #1682 from ClearlyClaire/glitch-soc/fixes/dropdowns-modals
...
Refactor and fix dropdown/action dialog
2022-02-09 17:25:57 +01:00
Claire
0bb3d445ab
Please Codeclimate
2022-02-09 17:15:36 +01:00
Claire
e1a4590bca
Rework actions modal to bring it closer to upstream and fix modal stacking issue
2022-02-09 16:40:23 +01:00
Claire
bc2eaf3581
Remove unused noModal prop
2022-02-09 16:40:23 +01:00
Claire
f03dc97070
Some more refactoring
2022-02-09 16:40:23 +01:00
Claire
f87ce13afc
Refactor dropdown and action modal code slightly
...
Simplify it a bit and make it closer to upstream
2022-02-09 13:23:12 +01:00
Takuya Yoshida
5533fa28b6
Add support >= 1.22 ( #17490 )
2022-02-09 12:30:00 +01:00
Eugen Rochko
3aebe711fd
Change languages to be listed under standard instead of native name in admin UI ( #17485 )
2022-02-09 04:15:38 +01:00
Eugen Rochko
fd3a45e348
Add edit history to web UI ( #17390 )
...
* Add edit history to web UI
* Change history reducer to store items per status
* Fix missing loading prop
2022-02-09 01:17:07 +01:00
Eugen Rochko
2adcad04ff
Fix error in suggestions API due to typo ( #17486 )
...
Regression from #17479
2022-02-08 22:23:04 +01:00
Claire
2fd1db7c9d
Merge pull request #1680 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2022-02-08 19:43:59 +01:00
Claire
692963d43b
Merge branch 'main' into glitch-soc/merge-upstream
2022-02-08 18:23:53 +01:00
Eugen Rochko
b6d7726ecb
Remove language detection through cld3 ( #17478 )
...
* Remove language detection through cld3
* Update app/helpers/languages_helper.rb
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2022-02-08 02:41:17 +01:00
Eugen Rochko
85b86fe28c
Add global `locale` param ( #17464 )
...
- Remove the session-based locale stickyness
2022-02-08 02:34:56 +01:00
Eugen Rochko
35850f8195
Fix localization of cold-start follow recommendations ( #17479 )
2022-02-08 01:53:49 +01:00
Claire
52c1b86964
Fix Ruby 2.5 incompatibility ( #17465 )
2022-02-07 19:57:06 +01:00
Eugen Rochko
f1f6ddd536
Fix structured data parsing from links choking on bad data ( #17403 )
...
* Fix structured data parsing from links choking on bad data
- Fix og:url meta tag being prioritized over canonical link tag
- Fix structured data parsing choking on commented-out CDATA declarations
- Fix HTML entities in title, description, provider_name, author_name
- Change structured data parsing to attempt every JSON-LD script tag
* Remove unnecessary slash escapes from CDATA regex pattern
2022-02-07 18:16:31 +01:00
Claire
73a782391c
Fix replies collection incorrectly looping ( #17462 )
...
* Refactor tests
* Add tests
* Fix replies collection incorrectly looping
2022-02-07 17:06:43 +01:00
Claire
0d2cf3cd4a
Fix errors when multiple Delete are received for a given actor ( #17460 )
2022-02-07 13:14:48 +01:00
Claire
b1983623ae
Merge pull request #1679 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2022-02-06 16:23:57 +01:00
Claire
aa832d623a
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `CHANGELOG.md`:
Upstream added newlines.
Conflicts are because the CHANGELOG was independently merged from 3.4.6 on
last security update.
Took upstream's version.
- `app/helpers/context_helper.rb`:
Conflicts because of extra vocabulary in glitch-soc. The conflicts were
actually handled in last security merge.
Kept our version.
2022-02-06 15:34:42 +01:00
Claire
92658f0fb0
Fix instance actor not being dereferenceable ( #17457 )
...
* Add tests
* Fix instance actor not being dereferenceable
* Fix tests
* Fix tests for real
2022-02-06 15:31:03 +01:00
potpro
097c4903f1
Update build-image.yml ( #17454 )
2022-02-05 17:29:54 +01:00
Claire
24d1ddcc24
Merge pull request #1678 from ClearlyClaire/glitch-soc/fixes/robust-theme-fallback
...
Make theme-selection fall back to default ones if configured is not found
2022-02-05 13:24:05 +01:00
Claire
08f44d1953
Move glitch-soc-specific theming methods to ThemingConcern
2022-02-05 10:58:51 +01:00
Claire
5f48ec9e42
Make theme-selection fall back to default ones if configured is not found
2022-02-05 10:29:27 +01:00
Eugen Rochko
e03e7ac290
Fix error on account relationships page in admin UI ( #17444 )
2022-02-05 05:06:34 +01:00
dependabot[bot]
6a649e9131
Bump brakeman from 5.2.0 to 5.2.1 ( #17410 )
...
Bumps [brakeman](https://github.com/presidentbeef/brakeman ) from 5.2.0 to 5.2.1.
- [Release notes](https://github.com/presidentbeef/brakeman/releases )
- [Changelog](https://github.com/presidentbeef/brakeman/blob/main/CHANGES.md )
- [Commits](https://github.com/presidentbeef/brakeman/compare/v5.2.0...v5.2.1 )
---
updated-dependencies:
- dependency-name: brakeman
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-05 13:03:12 +09:00
dependabot[bot]
bfe5ad5fee
Bump redis from 4.0.2 to 4.0.3 ( #17412 )
...
Bumps [redis](https://github.com/redis/node-redis ) from 4.0.2 to 4.0.3.
- [Release notes](https://github.com/redis/node-redis/releases )
- [Changelog](https://github.com/redis/node-redis/blob/master/CHANGELOG.md )
- [Commits](https://github.com/redis/node-redis/compare/redis@4.0.2...redis@4.0.3 )
---
updated-dependencies:
- dependency-name: redis
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-05 13:03:06 +09:00
dependabot[bot]
e001e116da
Bump sidekiq-scheduler from 3.1.0 to 3.1.1 ( #17407 )
...
Bumps [sidekiq-scheduler](https://github.com/moove-it/sidekiq-scheduler ) from 3.1.0 to 3.1.1.
- [Release notes](https://github.com/moove-it/sidekiq-scheduler/releases )
- [Commits](https://github.com/moove-it/sidekiq-scheduler/compare/v3.1.0...v3.1.1 )
---
updated-dependencies:
- dependency-name: sidekiq-scheduler
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-05 13:02:57 +09:00
dependabot[bot]
e0263c7369
Bump http-link-header from 1.0.3 to 1.0.4 ( #17414 )
...
Bumps [http-link-header](https://github.com/jhermsmeier/node-http-link-header ) from 1.0.3 to 1.0.4.
- [Release notes](https://github.com/jhermsmeier/node-http-link-header/releases )
- [Changelog](https://github.com/jhermsmeier/node-http-link-header/blob/master/CHANGELOG.md )
- [Commits](https://github.com/jhermsmeier/node-http-link-header/compare/v1.0.3...v1.0.4 )
---
updated-dependencies:
- dependency-name: http-link-header
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-05 13:02:42 +09:00
Tykayn
91527021b7
install yarn deps
2022-02-04 11:01:37 +01:00
Tykayn
df6b81d678
Merge remote-tracking branch 'glitch-soc/main'
2022-02-04 11:01:25 +01:00
Tykayn
adb5be766e
Merge branch 'master' of https://framagit.org/tykayn/mastodon
2022-02-04 10:52:11 +01:00
Tykayn
43c0067865
hop
2022-02-04 10:52:07 +01:00
Alexandra Catalina
50ab3f3dcb
Update tootsuite/mastodon Docker tag to v3.4.6 ( #17436 )
...
Co-authored-by: Renovate Bot <bot@renovateapp.com>
2022-02-03 21:29:20 +01:00
Eugen Rochko
3413f1c44b
Forward-port version bump to 3.4.6 ( #17434 )
2022-02-03 14:21:38 +01:00
Claire
73b730e649
Merge pull request #1676 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2022-02-03 14:09:19 +01:00
Claire
c8b1e72a4f
Fix compacted JSON-LD possibly causing compatibility issues on forwarding ( #17428 )
2022-02-03 14:09:04 +01:00
Claire
948235592a
Fix response_to_recipient? CTE ( #17427 )
2022-02-03 14:07:43 +01:00
Claire
d1ecc323e7
Compact JSON-LD signed incoming activities ( #17426 )
...
Co-authored-by: Puck Meerburg <puck@puck.moe>
2022-02-03 14:07:29 +01:00
Claire
2beb0a7af5
Bump version to 3.4.6
2022-02-03 12:12:27 +01:00
Claire
a3e0dacf5c
Fix response_to_recipient? CTE
2022-02-02 19:55:57 +01:00
Claire
7b969436a0
Fix compacted JSON-LD possibly causing compatibility issues on forwarding
2022-02-02 19:55:57 +01:00
Puck Meerburg
63da32468c
Compact JSON-LD signed incoming activities
2022-02-02 16:13:11 +01:00
Claire
20a4b8081f
Merge pull request #1675 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2022-02-01 21:41:58 +01:00
Claire
098f2bc1e1
Merge branch 'main' into glitch-soc/merge-upstream
2022-02-01 20:59:28 +01:00
Alexandra Catalina
d0d15bf49c
Update tootsuite/mastodon Docker tag to v3.4.5 ( #17417 )
...
Co-authored-by: Renovate Bot <bot@renovateapp.com>
2022-02-01 20:57:50 +01:00
Claire
987d88ea56
Fix requiring an extra restart after recent post-deployment migrations ( #17422 )
...
Follow-up to #16409
2022-02-01 20:57:39 +01:00
Rohan Sharma
4d6d4b43c6
Fixed prototype pollution bug and only allow trusted origin ( #17420 )
2022-02-01 17:34:48 +01:00
Claire
54581d43e7
Bump version to 3.4.5 ( #17402 )
2022-01-31 21:27:40 +01:00
Claire
d6f3261c6c
Merge pull request #1674 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2022-01-31 10:51:11 +01:00
Claire
2fcf652fff
Merge branch 'main' into glitch-soc/merge-upstream
2022-01-31 10:42:17 +01:00
Daniel Jakots
aa45404578
Bump NODE_VER to 16.13.2, to solve security issues ( #17399 )
...
Fixes CVE-2021-44532, CVE-2021-44533, and CVE-2022-21824.
See: https://nodejs.org/en/blog/vulnerability/jan-2022-security-releases/
2022-01-31 00:32:03 +01:00
Claire
a0e06c3c3e
Add more advanced migration tests ( #17393 )
...
- populate the database with some data when testing migrations
- try both one-step and two-step migrations (`SKIP_POST_DEPLOYMENT_MIGRATIONS`)
2022-01-30 23:50:08 +01:00
Claire
c6b291afc3
Change index corruption warning to be a little less scary ( #17395 )
2022-01-30 23:49:52 +01:00
Claire
b54e263712
Merge pull request #1673 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2022-01-30 22:51:32 +01:00
Claire
a99adeaad3
Fix edge case in migration helpers that caused crash because of PostgreSQL quirks ( #17398 )
2022-01-30 22:34:54 +01:00
Claire
7679ddcd5e
Merge branch 'main' into glitch-soc/merge-upstream
2022-01-30 22:33:30 +01:00
Claire
ac583fce21
Fix some old migration scripts ( #17394 )
...
* Fix some old migration scripts
* Fix edge case in two-step migration from older releases
2022-01-30 21:38:54 +01:00
Claire
f5639e1cbe
Change public profile pages to be disabled for unconfirmed users ( #17385 )
...
Fixes #17382
Note that unconfirmed and unapproved accounts can still be searched for
and their (empty) account retrieved using the REST API.
2022-01-28 14:24:37 +01:00
Claire
2ba6267f16
Merge pull request #1668 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2022-01-28 09:38:44 +01:00
Claire
94a39f6b68
Fix Sidekiq warning when pushing DMs to direct timeline
2022-01-28 09:07:56 +01:00
Claire
b2915613fb
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `Gemfile.lock`:
Upstream-updated lib textually too close to glitch-soc-only dep.
Updated like upstream.
2022-01-28 08:58:32 +01:00
Claire
e38fc319dc
Refactor and improve tests ( #17386 )
...
* Change account and user fabricators to simplify and improve tests
- `Fabricate(:account)` implicitly fabricates an associated `user` if
no `domain` attribute is given (an account with `domain: nil` is
considered a local account, but no user record was created), unless
`user: nil` is passed
- `Fabricate(:account, user: Fabricate(:user))` should still be possible
but is discouraged.
* Fix and refactor tests
- avoid passing unneeded attributes to `Fabricate(:user)` or
`Fabricate(:account)`
- avoid embedding `Fabricate(:user)` into a `Fabricate(:account)` or the other
way around
- prefer `Fabricate(:user, account_attributes: …)` to
`Fabricate(:user, account: Fabricate(:account, …)`
- also, some tests were using remote accounts with local user records, which is
not representative of production code.
2022-01-28 00:46:42 +01:00
Claire
03d59340da
Fix Sidekiq warnings about JSON serialization ( #17381 )
...
* Fix Sidekiq warnings about JSON serialization
This occurs on every symbol argument we pass, and every symbol key in hashes,
because Sidekiq expects strings instead.
See https://github.com/mperham/sidekiq/pull/5071
We do not need to change how workers parse their arguments because this has
not changed and we were already converting to symbols adequately or using
`with_indifferent_access`.
* Set Sidekiq to raise on unsafe arguments in test mode
In order to more easily catch issues that would produce warnings in production
code.
2022-01-28 00:43:56 +01:00
Claire
14c69a535b
Fix some old database migrations ( #17379 )
2022-01-27 18:13:41 +01:00
dependabot[bot]
4942a7ce86
Bump pg from 1.2.3 to 1.3.0 ( #17349 )
...
Bumps [pg](https://github.com/ged/ruby-pg ) from 1.2.3 to 1.3.0.
- [Release notes](https://github.com/ged/ruby-pg/releases )
- [Changelog](https://github.com/ged/ruby-pg/blob/master/History.rdoc )
- [Commits](https://github.com/ged/ruby-pg/compare/v1.2.3...v1.3.0 )
---
updated-dependencies:
- dependency-name: pg
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-01-27 20:26:40 +09:00
dependabot[bot]
497b8eedda
Bump axios from 0.24.0 to 0.25.0 ( #17354 )
...
Bumps [axios](https://github.com/axios/axios ) from 0.24.0 to 0.25.0.
- [Release notes](https://github.com/axios/axios/releases )
- [Changelog](https://github.com/axios/axios/blob/master/CHANGELOG.md )
- [Commits](https://github.com/axios/axios/compare/v0.24.0...v0.25.0 )
---
updated-dependencies:
- dependency-name: axios
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-01-27 20:26:18 +09:00
dependabot[bot]
df78d83e95
Bump rdf-normalize from 0.4.0 to 0.5.0 ( #17226 )
...
Bumps [rdf-normalize](https://github.com/ruby-rdf/rdf-normalize ) from 0.4.0 to 0.5.0.
- [Release notes](https://github.com/ruby-rdf/rdf-normalize/releases )
- [Commits](https://github.com/ruby-rdf/rdf-normalize/compare/0.4.0...0.5.0 )
---
updated-dependencies:
- dependency-name: rdf-normalize
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-01-27 20:25:18 +09:00
Claire
ad6ddb9bdd
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `config/environments/production.rb`:
Upstream changed a header but we had different default headers.
Applied the same change, and also dropped HSTS headers redundant with
Rails'.
2022-01-26 22:32:21 +01:00
Claire
166cc5b89d
Fix local distribution of edited statuses ( #17380 )
...
Because `FanOutOnWriteService#update?` was broken, edits were considered as new
toots and a regular `update` payload was sent.
2022-01-26 20:53:50 +01:00
Su Yang
10188c7db7
Add healthcheck for sidekiq ( #17365 )
2022-01-26 18:08:49 +01:00
Eugen Rochko
6505b39e5d
Fix poll updates being saved as status edits ( #17373 )
...
Fix #17344
2022-01-26 18:05:39 +01:00
Claire
5893019937
Merge pull request #1667 from ClearlyClaire/glitch-soc/fixes/hcaptcha-text
...
Improve explanations around the hCaptcha feature
2022-01-26 14:24:10 +01:00
Claire
b768a4dea9
Add link to /about/more to the CAPTCHA verification page
2022-01-26 14:09:11 +01:00
Claire
7c2204314a
Add some explanation text on the CAPTCHA confirmation page
2022-01-26 13:24:51 +01:00
Claire
f997a5463b
Add mention of accessibility issues to hCaptcha option in admin page
2022-01-26 11:39:47 +01:00
Claire
129bc42979
Merge pull request #1665 from ClearlyClaire/glitch-soc/features/hcaptcha
...
Add optional hCaptcha support
2022-01-26 00:13:24 +01:00
Claire
b7cf3941b3
Change CAPTCHA handling to be only on email verification
...
This simplifies the implementation considerably, and while not providing
ideal UX, it's the most flexible approach.
2022-01-25 23:56:57 +01:00
Claire
0fb907441c
Add ability to set hCaptcha either on registration form or on e-mail validation
...
Upshot of CAPTCHA on e-mail validation is it does not need to break the in-band
registration API.
2022-01-25 23:09:48 +01:00
Claire
a9269f8786
Disable `registrations` flag in /api/v1/instance when CAPTCHA is enabled
...
This is to avoid apps trying and failing at using the registrations API,
which does not let us require a CAPTCHA and cannot be clearly signaled as
unavailable.
2022-01-25 13:58:24 +01:00
dependabot[bot]
bebf9bf33f
Bump sass from 1.48.0 to 1.49.0 ( #17352 )
...
Bumps [sass](https://github.com/sass/dart-sass ) from 1.48.0 to 1.49.0.
- [Release notes](https://github.com/sass/dart-sass/releases )
- [Changelog](https://github.com/sass/dart-sass/blob/main/CHANGELOG.md )
- [Commits](https://github.com/sass/dart-sass/compare/1.48.0...1.49.0 )
---
updated-dependencies:
- dependency-name: sass
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-01-25 21:25:26 +09:00
dependabot[bot]
f0d73d82f8
Bump json-ld-preloaded from 3.1.6 to 3.2.0 ( #17353 )
...
Bumps [json-ld-preloaded](https://github.com/ruby-rdf/json-ld-preloaded ) from 3.1.6 to 3.2.0.
- [Release notes](https://github.com/ruby-rdf/json-ld-preloaded/releases )
- [Commits](https://github.com/ruby-rdf/json-ld-preloaded/compare/3.1.6...3.2.0 )
---
updated-dependencies:
- dependency-name: json-ld-preloaded
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-01-25 21:23:42 +09:00
dependabot[bot]
7b2c733dfc
Bump fabrication from 2.23.1 to 2.24.0 ( #17356 )
...
Bumps [fabrication](https://github.com/paulelliott/fabrication ) from 2.23.1 to 2.24.0.
- [Release notes](https://github.com/paulelliott/fabrication/releases )
- [Changelog](https://github.com/paulelliott/fabrication/blob/master/Changelog.markdown )
- [Commits](https://github.com/paulelliott/fabrication/commits )
---
updated-dependencies:
- dependency-name: fabrication
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-01-25 21:22:51 +09:00
dependabot[bot]
cea00f593e
Bump sidekiq from 6.3.1 to 6.4.0 ( #17350 )
...
Bumps [sidekiq](https://github.com/mperham/sidekiq ) from 6.3.1 to 6.4.0.
- [Release notes](https://github.com/mperham/sidekiq/releases )
- [Changelog](https://github.com/mperham/sidekiq/blob/main/Changes.md )
- [Commits](https://github.com/mperham/sidekiq/compare/v6.3.1...v6.4.0 )
---
updated-dependencies:
- dependency-name: sidekiq
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-01-25 21:22:10 +09:00
dependabot[bot]
69cb20bca4
Bump @babel/plugin-transform-runtime from 7.16.8 to 7.16.10 ( #17361 )
...
Bumps [@babel/plugin-transform-runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-plugin-transform-runtime ) from 7.16.8 to 7.16.10.
- [Release notes](https://github.com/babel/babel/releases )
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md )
- [Commits](https://github.com/babel/babel/commits/v7.16.10/packages/babel-plugin-transform-runtime )
---
updated-dependencies:
- dependency-name: "@babel/plugin-transform-runtime"
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-01-25 20:52:40 +09:00
dependabot[bot]
daf2d8952d
Bump cld3 from 3.4.3 to 3.4.4 ( #17357 )
...
Bumps [cld3](https://github.com/akihikodaki/cld3-ruby ) from 3.4.3 to 3.4.4.
- [Release notes](https://github.com/akihikodaki/cld3-ruby/releases )
- [Commits](https://github.com/akihikodaki/cld3-ruby/compare/v3.4.3...v3.4.4 )
---
updated-dependencies:
- dependency-name: cld3
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-01-25 20:48:05 +09:00
dependabot[bot]
2dfb67f0c9
Bump aws-sdk-s3 from 1.111.1 to 1.111.3 ( #17368 )
...
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby ) from 1.111.1 to 1.111.3.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases )
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/version-3/gems/aws-sdk-s3/CHANGELOG.md )
- [Commits](https://github.com/aws/aws-sdk-ruby/commits )
---
updated-dependencies:
- dependency-name: aws-sdk-s3
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-01-25 20:46:52 +09:00
dependabot[bot]
029d89bfea
Bump bootsnap from 1.10.1 to 1.10.2 ( #17367 )
...
Bumps [bootsnap](https://github.com/Shopify/bootsnap ) from 1.10.1 to 1.10.2.
- [Release notes](https://github.com/Shopify/bootsnap/releases )
- [Changelog](https://github.com/Shopify/bootsnap/blob/main/CHANGELOG.md )
- [Commits](https://github.com/Shopify/bootsnap/compare/v1.10.1...v1.10.2 )
---
updated-dependencies:
- dependency-name: bootsnap
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-01-25 20:45:45 +09:00
dependabot[bot]
ee7fafe1c8
Bump node-fetch from 2.6.1 to 2.6.7 ( #17366 )
...
Bumps [node-fetch](https://github.com/node-fetch/node-fetch ) from 2.6.1 to 2.6.7.
- [Release notes](https://github.com/node-fetch/node-fetch/releases )
- [Commits](https://github.com/node-fetch/node-fetch/compare/v2.6.1...v2.6.7 )
---
updated-dependencies:
- dependency-name: node-fetch
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-01-25 20:44:01 +09:00
dependabot[bot]
2033ca6b31
Bump nanoid from 3.1.23 to 3.2.0 ( #17342 )
...
Bumps [nanoid](https://github.com/ai/nanoid ) from 3.1.23 to 3.2.0.
- [Release notes](https://github.com/ai/nanoid/releases )
- [Changelog](https://github.com/ai/nanoid/blob/main/CHANGELOG.md )
- [Commits](https://github.com/ai/nanoid/compare/3.1.23...3.2.0 )
---
updated-dependencies:
- dependency-name: nanoid
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-01-25 20:41:22 +09:00
dependabot[bot]
4b5629cc3d
Bump @babel/preset-env from 7.16.8 to 7.16.11 ( #17358 )
...
Bumps [@babel/preset-env](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-env ) from 7.16.8 to 7.16.11.
- [Release notes](https://github.com/babel/babel/releases )
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md )
- [Commits](https://github.com/babel/babel/commits/v7.16.11/packages/babel-preset-env )
---
updated-dependencies:
- dependency-name: "@babel/preset-env"
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-01-25 20:39:43 +09:00
dependabot[bot]
0d82c0359d
Bump rubocop from 1.24.1 to 1.25.0 ( #17322 )
...
Bumps [rubocop](https://github.com/rubocop/rubocop ) from 1.24.1 to 1.25.0.
- [Release notes](https://github.com/rubocop/rubocop/releases )
- [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rubocop/rubocop/compare/v1.24.1...v1.25.0 )
---
updated-dependencies:
- dependency-name: rubocop
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-01-25 20:39:08 +09:00
dependabot[bot]
d528db801f
Bump @babel/core from 7.16.7 to 7.16.12 ( #17360 )
...
Bumps [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core ) from 7.16.7 to 7.16.12.
- [Release notes](https://github.com/babel/babel/releases )
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md )
- [Commits](https://github.com/babel/babel/commits/v7.16.12/packages/babel-core )
---
updated-dependencies:
- dependency-name: "@babel/core"
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-01-25 20:34:55 +09:00
dependabot[bot]
808e7cd906
Bump rails from 6.1.4.1 to 6.1.4.4 ( #17159 )
...
* Bump rails from 6.1.4.1 to 6.1.4.4
Bumps [rails](https://github.com/rails/rails ) from 6.1.4.1 to 6.1.4.4.
- [Release notes](https://github.com/rails/rails/releases )
- [Commits](https://github.com/rails/rails/compare/v6.1.4.1...v6.1.4.4 )
---
updated-dependencies:
- dependency-name: rails
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
* Revert marcel to 1.0.1
Avoid some regression that need to be investigated
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2022-01-25 20:34:37 +09:00
Claire
bf351d72af
Disable captcha if registrations are disabled for various reasons
2022-01-24 22:12:57 +01:00
Claire
6a2f248fe4
Renew Rails session ID on successful registration
2022-01-24 22:01:05 +01:00
Claire
3f6a36168f
Fix tests
2022-01-24 21:36:22 +01:00
Claire
04050fbd46
Please CodeClimate
2022-01-24 21:29:50 +01:00
Claire
1b493c9fee
Add optional hCaptcha support
...
Fixes #1649
This requires setting `HCAPTCHA_SECRET_KEY` and `HCAPTCHA_SITE_KEY`, then
enabling the admin setting at
`/admin/settings/edit#form_admin_settings_captcha_enabled`
Subsequently, a hCaptcha widget will be displayed on `/about` and
`/auth/sign_up` unless:
- the user is already signed-up already
- the user has used an invite link
- the user has already solved the captcha (and registration failed for another
reason)
The Content-Security-Policy headers are altered automatically to allow the
third-party hCaptcha scripts on `/about` and `/auth/sign_up` following the same
rules as above.
2022-01-24 21:22:13 +01:00
Wonderfall
244726e2e8
disable legacy XSS filtering ( #17289 )
...
Browsers are phasing out X-XSS-Protection, but Safari and IE still support it.
2022-01-24 13:14:26 +01:00
Claire
dd63923c0a
Fix link_to_login argument handling when a block is passed ( #17345 )
2022-01-24 03:29:03 +01:00
Claire
e58e0eb9aa
Merge pull request #1663 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2022-01-23 19:17:31 +01:00
Claire
9483d0c6b2
[Glitch] Change `percent` to `rate` in retention metrics API
...
Port a63495230a
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-01-23 18:24:40 +01:00
Claire
4dd4fc2e5e
[Glitch] Fix text being incorrectly pre-selected in composer textarea on /share
...
Port 3a103cd317
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-01-23 18:24:34 +01:00
Claire
61ef81c548
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `spec/models/status_spec.rb`:
Upstream added tests too close to glitch-soc-specific tests.
Kept both tests.
2022-01-23 18:24:01 +01:00
Claire
0a120d86d2
Fix error-prone SQL queries ( #15828 )
...
* Fix error-prone SQL queries in Account search
While this code seems to not present an actual vulnerability, one could
easily be introduced by mistake due to how the query is built.
This PR parameterises the `to_tsquery` input to make the query more robust.
* Harden code for Status#tagged_with_all and Status#tagged_with_none
Those two scopes aren't used in a way that could be vulnerable to an SQL
injection, but keeping them unchanged might be a hazard.
* Remove unneeded spaces surrounding tsquery term
* Please CodeClimate
* Move advanced_search_for SQL template to its own function
This avoids one level of indentation while making clearer that the SQL template
isn't build from all the dynamic parameters of advanced_search_for.
* Add tests covering tagged_with, tagged_with_all and tagged_with_none
* Rewrite tagged_with_none to avoid multiple joins and make it more robust
* Remove obsolete brakeman warnings
* Revert "Remove unneeded spaces surrounding tsquery term"
The two queries are not strictly equivalent.
This reverts commit 86f16c537e06c6ba4a8b250f25dcce9f049023ff.
2022-01-23 18:10:10 +01:00
Claire
a63495230a
Change `percent` to `rate` in retention metrics API ( #16910 )
2022-01-23 16:01:25 +01:00
Claire
bddd9ba36d
Add OMNIAUTH_ONLY environment variable to enforce externa log-in ( #17288 )
...
* Remove support for OAUTH_REDIRECT_AT_SIGN_IN
Fixes #15959
Introduced in #6540 , OAUTH_REDIRECT_AT_SIGN_IN allowed skipping the log-in form
to instead redirect to the external OmniAuth login provider.
However, it did not prevent the log-in form on /about introduced by #10232 from
appearing, and completely broke with the introduction of #15228 .
As I restoring that previous log-in flow without introducing a security
vulnerability may require extensive care and knowledge of how OmniAuth works,
this commit removes support for OAUTH_REDIRECT_AT_SIGN_IN instead for the time
being.
* Add OMNIAUTH_ONLY environment variable to enforce external log-in only
* Disable user registration when OMNIAUTH_ONLY is set to true
* Replace log-in links When OMNIAUTH_ONLY is set with exactly one OmniAuth provider
2022-01-23 15:52:58 +01:00
Claire
cfa583fa71
Remove support for OAUTH_REDIRECT_AT_SIGN_IN ( #17287 )
...
Fixes #15959
Introduced in #6540 , OAUTH_REDIRECT_AT_SIGN_IN allowed skipping the log-in form
to instead redirect to the external OmniAuth login provider.
However, it did not prevent the log-in form on /about introduced by #10232 from
appearing, and completely broke with the introduction of #15228 .
As I restoring that previous log-in flow without introducing a security
vulnerability may require extensive care and knowledge of how OmniAuth works,
this commit removes support for OAUTH_REDIRECT_AT_SIGN_IN instead for the time
being.
2022-01-23 15:50:41 +01:00
Claire
8a07ecd377
Remove leftover database columns from Devise::Models::Rememberable ( #17191 )
...
* Remove leftover database columns from Devise::Models::Rememberable
* Update fix-duplication maintenance script
* Improve errors/warnings in the fix-duplicates maintenance script
2022-01-23 15:46:30 +01:00
Claire
96f0b33c8b
Remove old duplicate index ( #17245 )
...
Some Mastodon versions (v1.1 and v1.2) had a duplicate index in `db/schema.rb`
without any migration script creating it. #2224 (included in v1.3) removed the
duplicate index from the file but did not provide a migration script to remove
it.
This means that any instance that was installed from v1.1 or v1.2's source code
has a duplicate index and a corresponding warning in PgHero. Instances set up
using an earlier or later Mastodon version do not have this issue.
This PR removes the duplicate index if it is present.
2022-01-23 13:53:58 +01:00
Claire
3a103cd317
Fix text being incorrectly pre-selected in composer textarea on /share ( #17339 )
...
Fixes #17295
2022-01-20 20:56:21 +01:00
Claire
1e8c885e5a
Change mastodon:webpush:generate_vapid_key task to not require functional env ( #17338 )
...
Fixes #17297
2022-01-20 14:51:23 +01:00
Claire
6eea3f8f9c
Add post edited notice in admin and public UIs ( #17335 )
...
* Add edited toot flag on public pages
* Add toot edit flag to admin pages
2022-01-20 13:37:31 +01:00
Claire
4d0383d75a
Add content-type to status source in glitch-soc
2022-01-20 00:03:44 +01:00
Eugen Rochko
d4654dc892
[Glitch] Add support for editing for published statuses
...
Port front-end changes from 1060666c58
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-01-20 00:03:41 +01:00
Claire
1af4618a06
Merge branch 'main' into glitch-soc/merge-upstream
2022-01-19 23:52:53 +01:00
Claire
fe89554a54
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `app/lib/activitypub/activity/create.rb`:
Upstream refactored how `Create` activities are handled and how values are
extracted from `Create`d objects. This conflicted with how glitch-soc
supported the `directMessage` flag to explicitly distinguish between
limited and direct messages.
Ported glitch-soc's changes to latest upstream changes.
- `app/services/fan_out_on_write_service.rb`:
Upstream largely refactored that file and changed some of the logic.
This conflicted with glitch-soc's handling of the direct timeline and
the options to allow replies and boosts in public feeds.
Ported those glitch-soc changes on top of latest upstream changes.
- `app/services/process_mentions_service.rb`:
Upstream refactored to move mention-related ActivityPub deliveries to
`ActivityPub::DeliveryWorker`, while glitch-soc contained an extra check
to not send local-only toots to remote mentioned users.
Took upstream's version, as the check is not needed anymore, since it is
performed at the `ActivityPub::DeliveryWorker` call site already.
- `app/workers/feed_insert_worker.rb`:
Upstream added support for `update` toot events, while glitch-soc had
support for an extra timeline support, `direct`.
Ported upstream changes and extended them to the `direct` timeline.
Additional changes:
- `app/lib/activitypub/parser/status_parser.rb`:
Added code to handle the `directMessage` flag and take it into account
to compute visibility.
- `app/lib/feed_manager.rb`:
Extended upstream's support of `update` toot events to glitch-soc's
`direct` timeline.
2022-01-19 23:52:48 +01:00
Eugen Rochko
9eb775a9d1
Fix error when using raw distribution worker ( #17334 )
...
Regression from #16697
2022-01-19 23:05:59 +01:00
Eugen Rochko
d412a8d1f2
Fix error when processing poll updates ( #17333 )
...
Regression from #16697
2022-01-19 22:50:01 +01:00
Eugen Rochko
1060666c58
Add support for editing for published statuses ( #16697 )
...
* Add support for editing for published statuses
* Fix references to stripped-out code
* Various fixes and improvements
* Further fixes and improvements
* Fix updates being potentially sent to unauthorized recipients
* Various fixes and improvements
* Fix wrong words in test
* Fix notifying accounts that were tagged but were not in the audience
* Fix mistake
2022-01-19 22:37:27 +01:00
Claire
b209e919bd
Merge pull request #1662 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2022-01-19 14:22:59 +01:00
Claire
c42938aed4
Merge branch 'main' into glitch-soc/merge-upstream
2022-01-19 12:32:44 +01:00
Jeong Arm
2d1f082bb6
Fix NameError on ActivityPub::FetchFeaturedCollectionService ( #17326 )
...
Related: #16954
2022-01-19 04:08:46 +01:00
dependabot[bot]
f616897841
Bump json-ld from 3.1.10 to 3.2.0 ( #17224 )
...
Bumps [json-ld](https://github.com/ruby-rdf/json-ld ) from 3.1.10 to 3.2.0.
- [Release notes](https://github.com/ruby-rdf/json-ld/releases )
- [Commits](https://github.com/ruby-rdf/json-ld/compare/3.1.10...3.2.0 )
---
updated-dependencies:
- dependency-name: json-ld
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-01-19 11:12:01 +09:00
dependabot[bot]
a1c14eb076
Bump thor from 1.1.0 to 1.2.1 ( #17250 )
...
Bumps [thor](https://github.com/rails/thor ) from 1.1.0 to 1.2.1.
- [Release notes](https://github.com/rails/thor/releases )
- [Commits](https://github.com/rails/thor/compare/v1.1.0...v1.2.1 )
---
updated-dependencies:
- dependency-name: thor
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-01-19 11:07:37 +09:00
dependabot[bot]
987299e0d1
Bump nokogiri from 1.12.5 to 1.13.1 ( #17306 )
...
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri ) from 1.12.5 to 1.13.1.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases )
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md )
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.12.5...v1.13.1 )
---
updated-dependencies:
- dependency-name: nokogiri
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-01-19 11:06:17 +09:00
dependabot[bot]
db9d8c8e33
Bump aws-sdk-s3 from 1.109.0 to 1.111.1 ( #17277 )
...
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby ) from 1.109.0 to 1.111.1.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases )
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/version-3/gems/aws-sdk-s3/CHANGELOG.md )
- [Commits](https://github.com/aws/aws-sdk-ruby/commits )
---
updated-dependencies:
- dependency-name: aws-sdk-s3
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-01-19 11:04:34 +09:00
dependabot[bot]
587dc720c3
Bump prop-types from 15.7.2 to 15.8.1 ( #17278 )
...
Bumps [prop-types](https://github.com/facebook/prop-types ) from 15.7.2 to 15.8.1.
- [Release notes](https://github.com/facebook/prop-types/releases )
- [Changelog](https://github.com/facebook/prop-types/blob/main/CHANGELOG.md )
- [Commits](https://github.com/facebook/prop-types/compare/v15.7.2...v15.8.1 )
---
updated-dependencies:
- dependency-name: prop-types
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-01-19 11:04:24 +09:00
dependabot[bot]
8e619ab341
Bump ed25519 from 1.2.4 to 1.3.0 ( #17310 )
...
Bumps [ed25519](https://github.com/RubyCrypto/ed25519 ) from 1.2.4 to 1.3.0.
- [Release notes](https://github.com/RubyCrypto/ed25519/releases )
- [Changelog](https://github.com/RubyCrypto/ed25519/blob/main/CHANGES.md )
- [Commits](https://github.com/RubyCrypto/ed25519/compare/v1.2.4...v1.3.0 )
---
updated-dependencies:
- dependency-name: ed25519
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-01-19 11:04:11 +09:00
dependabot[bot]
da2e05582b
Bump bootsnap from 1.9.3 to 1.10.1 ( #17311 )
...
Bumps [bootsnap](https://github.com/Shopify/bootsnap ) from 1.9.3 to 1.10.1.
- [Release notes](https://github.com/Shopify/bootsnap/releases )
- [Changelog](https://github.com/Shopify/bootsnap/blob/main/CHANGELOG.md )
- [Commits](https://github.com/Shopify/bootsnap/compare/v1.9.3...v1.10.1 )
---
updated-dependencies:
- dependency-name: bootsnap
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-01-19 11:03:28 +09:00
dependabot[bot]
37ecfa090f
Bump sass from 1.45.2 to 1.48.0 ( #17315 )
...
Bumps [sass](https://github.com/sass/dart-sass ) from 1.45.2 to 1.48.0.
- [Release notes](https://github.com/sass/dart-sass/releases )
- [Changelog](https://github.com/sass/dart-sass/blob/main/CHANGELOG.md )
- [Commits](https://github.com/sass/dart-sass/compare/1.45.2...1.48.0 )
---
updated-dependencies:
- dependency-name: sass
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-01-19 11:01:18 +09:00
dependabot[bot]
bc563c4847
Bump babel-jest from 27.4.5 to 27.4.6 ( #17280 )
...
Bumps [babel-jest](https://github.com/facebook/jest/tree/HEAD/packages/babel-jest ) from 27.4.5 to 27.4.6.
- [Release notes](https://github.com/facebook/jest/releases )
- [Changelog](https://github.com/facebook/jest/blob/main/CHANGELOG.md )
- [Commits](https://github.com/facebook/jest/commits/v27.4.6/packages/babel-jest )
---
updated-dependencies:
- dependency-name: babel-jest
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-01-19 10:53:39 +09:00
dependabot[bot]
4cda245ed9
Bump @babel/plugin-transform-runtime from 7.16.7 to 7.16.8 ( #17314 )
...
Bumps [@babel/plugin-transform-runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-plugin-transform-runtime ) from 7.16.7 to 7.16.8.
- [Release notes](https://github.com/babel/babel/releases )
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md )
- [Commits](https://github.com/babel/babel/commits/v7.16.8/packages/babel-plugin-transform-runtime )
---
updated-dependencies:
- dependency-name: "@babel/plugin-transform-runtime"
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-01-19 10:53:26 +09:00
dependabot[bot]
c4e748dcf2
Bump ws from 8.3.0 to 8.4.2 ( #17318 )
...
Bumps [ws](https://github.com/websockets/ws ) from 8.3.0 to 8.4.2.
- [Release notes](https://github.com/websockets/ws/releases )
- [Commits](https://github.com/websockets/ws/compare/8.3.0...8.4.2 )
---
updated-dependencies:
- dependency-name: ws
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-01-19 10:53:12 +09:00
dependabot[bot]
b066bcf277
Bump rubocop-rails from 2.13.0 to 2.13.2 ( #17321 )
...
Bumps [rubocop-rails](https://github.com/rubocop/rubocop-rails ) from 2.13.0 to 2.13.2.
- [Release notes](https://github.com/rubocop/rubocop-rails/releases )
- [Changelog](https://github.com/rubocop/rubocop-rails/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rubocop/rubocop-rails/compare/v2.13.0...v2.13.2 )
---
updated-dependencies:
- dependency-name: rubocop-rails
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-01-19 10:53:03 +09:00
dependabot[bot]
777b248bd1
Bump redis from 4.0.1 to 4.0.2 ( #17309 )
...
Bumps [redis](https://github.com/redis/node-redis ) from 4.0.1 to 4.0.2.
- [Release notes](https://github.com/redis/node-redis/releases )
- [Changelog](https://github.com/redis/node-redis/blob/master/CHANGELOG.md )
- [Commits](https://github.com/redis/node-redis/compare/redis@4.0.1...redis@4.0.2 )
---
updated-dependencies:
- dependency-name: redis
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-01-18 22:39:12 +09:00
dependabot[bot]
3b825be804
Bump bullet from 7.0.0 to 7.0.1 ( #17312 )
...
Bumps [bullet](https://github.com/flyerhzm/bullet ) from 7.0.0 to 7.0.1.
- [Release notes](https://github.com/flyerhzm/bullet/releases )
- [Changelog](https://github.com/flyerhzm/bullet/blob/master/CHANGELOG.md )
- [Commits](https://github.com/flyerhzm/bullet/compare/7.0.0...7.0.1 )
---
updated-dependencies:
- dependency-name: bullet
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-01-18 22:38:54 +09:00
dependabot[bot]
733691322c
Bump react-select from 5.2.1 to 5.2.2 ( #17313 )
...
Bumps [react-select](https://github.com/JedWatson/react-select ) from 5.2.1 to 5.2.2.
- [Release notes](https://github.com/JedWatson/react-select/releases )
- [Changelog](https://github.com/JedWatson/react-select/blob/master/docs/CHANGELOG.md )
- [Commits](https://github.com/JedWatson/react-select/compare/react-select@5.2.1...react-select@5.2.2 )
---
updated-dependencies:
- dependency-name: react-select
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-01-18 22:38:45 +09:00
dependabot[bot]
95d63271be
Bump @babel/preset-env from 7.16.7 to 7.16.8 ( #17317 )
...
Bumps [@babel/preset-env](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-env ) from 7.16.7 to 7.16.8.
- [Release notes](https://github.com/babel/babel/releases )
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md )
- [Commits](https://github.com/babel/babel/commits/v7.16.8/packages/babel-preset-env )
---
updated-dependencies:
- dependency-name: "@babel/preset-env"
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-01-18 22:38:12 +09:00
dependabot[bot]
11a97be4b1
Bump pkg-config from 1.4.6 to 1.4.7 ( #17307 )
...
Bumps [pkg-config](https://github.com/ruby-gnome/pkg-config ) from 1.4.6 to 1.4.7.
- [Release notes](https://github.com/ruby-gnome/pkg-config/releases )
- [Changelog](https://github.com/ruby-gnome/pkg-config/blob/master/NEWS )
- [Commits](https://github.com/ruby-gnome/pkg-config/compare/1.4.6...1.4.7 )
---
updated-dependencies:
- dependency-name: pkg-config
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-01-18 22:36:39 +09:00
dependabot[bot]
18cf973345
Bump active_model_serializers from 0.10.12 to 0.10.13 ( #17305 )
...
Bumps [active_model_serializers](https://github.com/rails-api/active_model_serializers ) from 0.10.12 to 0.10.13.
- [Release notes](https://github.com/rails-api/active_model_serializers/releases )
- [Changelog](https://github.com/rails-api/active_model_serializers/blob/v0.10.13/CHANGELOG.md )
- [Commits](https://github.com/rails-api/active_model_serializers/compare/v0.10.12...v0.10.13 )
---
updated-dependencies:
- dependency-name: active_model_serializers
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-01-18 22:36:22 +09:00
dependabot[bot]
eefa287d59
Bump follow-redirects from 1.14.4 to 1.14.7 ( #17285 )
...
Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects ) from 1.14.4 to 1.14.7.
- [Release notes](https://github.com/follow-redirects/follow-redirects/releases )
- [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.14.4...v1.14.7 )
---
updated-dependencies:
- dependency-name: follow-redirects
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-01-18 22:36:11 +09:00
dependabot[bot]
8f8f4ab099
Bump jest from 27.4.5 to 27.4.7 ( #17279 )
...
Bumps [jest](https://github.com/facebook/jest ) from 27.4.5 to 27.4.7.
- [Release notes](https://github.com/facebook/jest/releases )
- [Changelog](https://github.com/facebook/jest/blob/main/CHANGELOG.md )
- [Commits](https://github.com/facebook/jest/compare/v27.4.5...v27.4.7 )
---
updated-dependencies:
- dependency-name: jest
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-01-18 22:35:31 +09:00
dependabot[bot]
ecfed4f3e5
Bump rspec_junit_formatter from 0.5.0 to 0.5.1 ( #17275 )
...
Bumps [rspec_junit_formatter](https://github.com/sj26/rspec_junit_formatter ) from 0.5.0 to 0.5.1.
- [Release notes](https://github.com/sj26/rspec_junit_formatter/releases )
- [Changelog](https://github.com/sj26/rspec_junit_formatter/blob/main/CHANGELOG.md )
- [Commits](https://github.com/sj26/rspec_junit_formatter/compare/v0.5.0...v0.5.1 )
---
updated-dependencies:
- dependency-name: rspec_junit_formatter
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-01-18 22:35:15 +09:00
dependabot[bot]
8647e19020
Bump rubocop-rails from 2.13.0 to 2.13.1 ( #17274 )
...
Bumps [rubocop-rails](https://github.com/rubocop/rubocop-rails ) from 2.13.0 to 2.13.1.
- [Release notes](https://github.com/rubocop/rubocop-rails/releases )
- [Changelog](https://github.com/rubocop/rubocop-rails/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rubocop/rubocop-rails/compare/v2.13.0...v2.13.1 )
---
updated-dependencies:
- dependency-name: rubocop-rails
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-01-18 22:35:02 +09:00
dependabot[bot]
2a0fb61e31
Bump scenic from 1.5.4 to 1.5.5 ( #17193 )
...
Bumps [scenic](https://github.com/scenic-views/scenic ) from 1.5.4 to 1.5.5.
- [Release notes](https://github.com/scenic-views/scenic/releases )
- [Changelog](https://github.com/scenic-views/scenic/blob/main/CHANGELOG.md )
- [Commits](https://github.com/scenic-views/scenic/compare/v1.5.4...v1.5.5 )
---
updated-dependencies:
- dependency-name: scenic
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-01-18 22:34:45 +09:00
Claire
f6acc039ec
Merge pull request #1660 from ClearlyClaire/glitch-soc/features/themes-multiple-packs
...
Refactor glitch-soc's theme handling
2022-01-18 00:18:07 +01:00
Claire
b9ed7e0f55
Please CodeClimate
2022-01-17 13:06:06 +01:00
Claire
c7e2b9cf64
Move controller theming code to concern
2022-01-17 12:50:52 +01:00
Claire
c60f8ce032
Fix `pinned` attribute not being set for private self-posts ( #17304 )
2022-01-17 11:59:46 +01:00
Eugen Rochko
69208ef6ff
[Glitch] Add notifications for statuses deleted by moderators
...
Port front-end changes from 14f436c457
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-01-17 11:19:44 +01:00
Claire
b3bf32a21e
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/admin/reports/show.html.haml`:
Conflicts due to glitch-soc's theming system.
2022-01-17 10:45:25 +01:00
Claire
430d442791
Merge pull request #1661 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2022-01-17 10:01:02 +01:00
Claire
77dd4ab8f5
Fix `pinned` attribute not being set for private self-posts
2022-01-17 09:52:19 +01:00
Eugen Rochko
14f436c457
Add notifications for statuses deleted by moderators ( #17204 )
2022-01-17 09:41:33 +01:00
Claire
5effc0f8fa
[Glitch] Add support for private pinned posts
...
Port JS changes from d5c9feb7b7
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-01-17 08:35:27 +01:00
Claire
2d4b4b0b45
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `app/controllers/accounts_controller.rb`:
Upstream introduced support for private pinned toots, but glitch-soc's query
was a bit different as it filtered out local-only toots.
Used upstream's query, while adding local-only filtering back.
- `app/controllers/activitypub/collections_controller.rb`:
Same thing with regards to local-only posts.
- `app/validators/status_pin_validator.rb`:
Not a real conflict, but the line below was different in glitch-soc due to
the configurable pinned toots limit.
2022-01-17 08:28:52 +01:00
Claire
d5c9feb7b7
Add support for private pinned posts ( #16954 )
...
* Add support for private pinned toots
* Allow local user to pin private toots
* Change wording to avoid "direct message"
2022-01-17 00:49:55 +01:00
Claire
a85912b0d6
Merge pull request #1659 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2022-01-16 22:39:35 +01:00
Claire
278bd61d6f
Merge branch 'main' into glitch-soc/merge-upstream
2022-01-16 22:29:05 +01:00
Claire
de4c67c5fa
Fix missing media: 'all' on default skins
2022-01-16 22:26:18 +01:00
Claire
c789bcc844
Refactor theming HAML template a bit
2022-01-16 22:26:18 +01:00
Claire
1b386c881c
Refactor theme config loading
2022-01-16 22:26:18 +01:00
Claire
c61b29ebfd
Refactor some more
2022-01-16 22:26:18 +01:00
Claire
30d9abdfc9
Refactor glitch-soc's theme handling
2022-01-16 22:12:11 +01:00
Claire
081e4426f8
Fix admin interface crash when displaying deleted user ( #17301 )
2022-01-16 20:57:37 +01:00
Jeong Arm
474cd302c9
[Glitch] Gradually increase retry waiting for media processing
...
Port bc7a8ae6d6
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-01-16 18:14:33 +01:00
Claire
b61c3ddff8
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `README.md`:
Upstream added some text, but our README is completely different.
Kept our README unchanged.
2022-01-16 18:11:20 +01:00
Claire
462bc65112
Add line about using vagrant-hostsupdater in the Vagrant short guide ( #17243 )
...
This is documented in the Vagrantfile, but not in the README. As far as I know,
following the short guide without installing this plugin will not make the
container accessible at mastodon.local, thus breaking the last step of the
guide.
2022-01-16 16:55:41 +01:00
Eugen Rochko
8e84ebf0cb
Remove IP tracking columns from users table ( #16409 )
2022-01-16 13:23:50 +01:00
tkr
b52fdb4c6f
Fix SMTP_ENABLE_STARTTLS_AUTO/SMTP_TLS/SMTP_SSL environment variables don't work ( #17216 )
...
#17215
2022-01-13 12:05:22 +01:00
Claire
07cb948f39
Remove reference to dev.glitch.social from README
...
Fixes #1584
It's been down for a while.
2022-01-10 20:59:26 +01:00
Jeong Arm
ea61d3acd6
Fix media API limit ( #17272 )
2022-01-10 14:25:24 +01:00
Jeong Arm
bc7a8ae6d6
Gradually increase retry waiting for media processing ( #17271 )
2022-01-10 14:25:08 +01:00
Alexandra Catalina
3dc0357d9e
helm: upgrade elasticsearch to 7.x ( #17262 )
2022-01-09 03:21:19 +01:00
Claire
5b185b05f1
Merge pull request #1655 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2022-01-07 22:43:28 +01:00
Claire
af86c7a5de
[Glitch] Fix media descriptions not being used for client-side filtering
...
Port 37e80994f8
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-01-07 19:54:58 +01:00
Claire
fca50e4b50
Merge branch 'main' into glitch-soc/merge-upstream
2022-01-07 19:51:47 +01:00
Claire
bc066d8936
Fix timeline streaming stopping for multiple sessions instead of one ( #17259 )
...
* Fix timeline streaming stopping for multiple sessions instead of one
Fixes #17256 .
In updating the code for a newer version of node-redis, #17183 also broke
redis subscription management when multiple streaming clients subscribe to the
same channel.
This commit restores the redis subscription management code.
* Let node-redis actually handle the subscriptions
2022-01-07 19:50:12 +01:00
dependabot[bot]
e002f32336
Bump rspec_junit_formatter from 0.4.1 to 0.5.0 ( #17249 )
...
Bumps [rspec_junit_formatter](https://github.com/sj26/rspec_junit_formatter ) from 0.4.1 to 0.5.0.
- [Release notes](https://github.com/sj26/rspec_junit_formatter/releases )
- [Changelog](https://github.com/sj26/rspec_junit_formatter/blob/main/CHANGELOG.md )
- [Commits](https://github.com/sj26/rspec_junit_formatter/compare/v0.4.1...v0.5.0 )
---
updated-dependencies:
- dependency-name: rspec_junit_formatter
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-01-06 10:35:42 +09:00
dependabot[bot]
5339af0efb
Bump @babel/plugin-transform-react-inline-elements from 7.16.5 to 7.16.7 ( #17233 )
...
Bumps [@babel/plugin-transform-react-inline-elements](https://github.com/babel/babel/tree/HEAD/packages/babel-plugin-transform-react-inline-elements ) from 7.16.5 to 7.16.7.
- [Release notes](https://github.com/babel/babel/releases )
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md )
- [Commits](https://github.com/babel/babel/commits/v7.16.7/packages/babel-plugin-transform-react-inline-elements )
---
updated-dependencies:
- dependency-name: "@babel/plugin-transform-react-inline-elements"
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-01-06 10:35:23 +09:00
dependabot[bot]
0dcb8f6e37
Bump eslint-plugin-react from 7.27.1 to 7.28.0 ( #17200 )
...
Bumps [eslint-plugin-react](https://github.com/yannickcr/eslint-plugin-react ) from 7.27.1 to 7.28.0.
- [Release notes](https://github.com/yannickcr/eslint-plugin-react/releases )
- [Changelog](https://github.com/yannickcr/eslint-plugin-react/blob/master/CHANGELOG.md )
- [Commits](https://github.com/yannickcr/eslint-plugin-react/compare/v7.27.1...v7.28.0 )
---
updated-dependencies:
- dependency-name: eslint-plugin-react
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-01-06 10:28:18 +09:00
dependabot[bot]
de7f68d11c
Bump oj from 3.13.10 to 3.13.11 ( #17251 )
...
Bumps [oj](https://github.com/ohler55/oj ) from 3.13.10 to 3.13.11.
- [Release notes](https://github.com/ohler55/oj/releases )
- [Changelog](https://github.com/ohler55/oj/blob/develop/CHANGELOG.md )
- [Commits](https://github.com/ohler55/oj/compare/v3.13.10...v3.13.11 )
---
updated-dependencies:
- dependency-name: oj
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-01-06 10:27:30 +09:00
dependabot[bot]
69acb8faea
Bump rubocop from 1.23.0 to 1.24.1 ( #17228 )
...
Bumps [rubocop](https://github.com/rubocop/rubocop ) from 1.23.0 to 1.24.1.
- [Release notes](https://github.com/rubocop/rubocop/releases )
- [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rubocop/rubocop/compare/v1.23.0...v1.24.1 )
---
updated-dependencies:
- dependency-name: rubocop
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-01-06 10:26:53 +09:00
dependabot[bot]
609dc96ebe
Bump @babel/core from 7.16.5 to 7.16.7 ( #17238 )
...
Bumps [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core ) from 7.16.5 to 7.16.7.
- [Release notes](https://github.com/babel/babel/releases )
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md )
- [Commits](https://github.com/babel/babel/commits/v7.16.7/packages/babel-core )
---
updated-dependencies:
- dependency-name: "@babel/core"
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-01-06 10:25:52 +09:00
dependabot[bot]
3fa903fcf1
Bump @babel/preset-react from 7.16.5 to 7.16.7 ( #17235 )
...
Bumps [@babel/preset-react](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-react ) from 7.16.5 to 7.16.7.
- [Release notes](https://github.com/babel/babel/releases )
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md )
- [Commits](https://github.com/babel/babel/commits/v7.16.7/packages/babel-preset-react )
---
updated-dependencies:
- dependency-name: "@babel/preset-react"
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-01-06 10:25:38 +09:00
dependabot[bot]
b10933e1f6
Bump @babel/plugin-transform-runtime from 7.16.5 to 7.16.7 ( #17239 )
...
Bumps [@babel/plugin-transform-runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-plugin-transform-runtime ) from 7.16.5 to 7.16.7.
- [Release notes](https://github.com/babel/babel/releases )
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md )
- [Commits](https://github.com/babel/babel/commits/v7.16.7/packages/babel-plugin-transform-runtime )
---
updated-dependencies:
- dependency-name: "@babel/plugin-transform-runtime"
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-01-06 10:25:22 +09:00
dependabot[bot]
b1e5ba09d4
Bump bufferutil from 4.0.5 to 4.0.6 ( #17225 )
...
Bumps [bufferutil](https://github.com/websockets/bufferutil ) from 4.0.5 to 4.0.6.
- [Release notes](https://github.com/websockets/bufferutil/releases )
- [Commits](https://github.com/websockets/bufferutil/compare/v4.0.5...v4.0.6 )
---
updated-dependencies:
- dependency-name: bufferutil
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-01-06 10:14:35 +09:00
dependabot[bot]
d5662b18af
Bump sass from 1.45.1 to 1.45.2 ( #17237 )
...
Bumps [sass](https://github.com/sass/dart-sass ) from 1.45.1 to 1.45.2.
- [Release notes](https://github.com/sass/dart-sass/releases )
- [Changelog](https://github.com/sass/dart-sass/blob/main/CHANGELOG.md )
- [Commits](https://github.com/sass/dart-sass/compare/1.45.1...1.45.2 )
---
updated-dependencies:
- dependency-name: sass
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-01-06 10:11:25 +09:00
dependabot[bot]
05d14a9956
Bump @babel/plugin-proposal-decorators from 7.16.5 to 7.16.7 ( #17229 )
...
Bumps [@babel/plugin-proposal-decorators](https://github.com/babel/babel/tree/HEAD/packages/babel-plugin-proposal-decorators ) from 7.16.5 to 7.16.7.
- [Release notes](https://github.com/babel/babel/releases )
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md )
- [Commits](https://github.com/babel/babel/commits/v7.16.7/packages/babel-plugin-proposal-decorators )
---
updated-dependencies:
- dependency-name: "@babel/plugin-proposal-decorators"
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-01-06 10:10:00 +09:00
dependabot[bot]
7ac14a44be
Bump i18n-tasks from 0.9.35 to 0.9.37 ( #17227 )
...
Bumps [i18n-tasks](https://github.com/glebm/i18n-tasks ) from 0.9.35 to 0.9.37.
- [Release notes](https://github.com/glebm/i18n-tasks/releases )
- [Changelog](https://github.com/glebm/i18n-tasks/blob/main/CHANGES.md )
- [Commits](https://github.com/glebm/i18n-tasks/compare/v0.9.35...v0.9.37 )
---
updated-dependencies:
- dependency-name: i18n-tasks
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-01-06 10:01:31 +09:00
dependabot[bot]
51c46c8bd6
Bump @babel/runtime from 7.16.5 to 7.16.7 ( #17236 )
...
Bumps [@babel/runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-runtime ) from 7.16.5 to 7.16.7.
- [Release notes](https://github.com/babel/babel/releases )
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md )
- [Commits](https://github.com/babel/babel/commits/v7.16.7/packages/babel-runtime )
---
updated-dependencies:
- dependency-name: "@babel/runtime"
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-01-06 09:58:12 +09:00
dependabot[bot]
a1b50a8a70
Bump eslint-plugin-import from 2.25.3 to 2.25.4 ( #17234 )
...
Bumps [eslint-plugin-import](https://github.com/import-js/eslint-plugin-import ) from 2.25.3 to 2.25.4.
- [Release notes](https://github.com/import-js/eslint-plugin-import/releases )
- [Changelog](https://github.com/import-js/eslint-plugin-import/blob/main/CHANGELOG.md )
- [Commits](https://github.com/import-js/eslint-plugin-import/compare/v2.25.3...v2.25.4 )
---
updated-dependencies:
- dependency-name: eslint-plugin-import
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-01-06 09:56:33 +09:00
dependabot[bot]
f96282f56e
Bump utf-8-validate from 5.0.7 to 5.0.8 ( #17231 )
...
Bumps [utf-8-validate](https://github.com/websockets/utf-8-validate ) from 5.0.7 to 5.0.8.
- [Release notes](https://github.com/websockets/utf-8-validate/releases )
- [Commits](https://github.com/websockets/utf-8-validate/compare/v5.0.7...v5.0.8 )
---
updated-dependencies:
- dependency-name: utf-8-validate
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-01-06 09:56:20 +09:00
dependabot[bot]
f82eaf531b
Bump @babel/preset-env from 7.16.5 to 7.16.7 ( #17230 )
...
Bumps [@babel/preset-env](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-env ) from 7.16.5 to 7.16.7.
- [Release notes](https://github.com/babel/babel/releases )
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md )
- [Commits](https://github.com/babel/babel/commits/v7.16.7/packages/babel-preset-env )
---
updated-dependencies:
- dependency-name: "@babel/preset-env"
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-01-06 09:55:17 +09:00
dependabot[bot]
a2ad0b0457
Bump yargs from 17.3.0 to 17.3.1 ( #17199 )
...
Bumps [yargs](https://github.com/yargs/yargs ) from 17.3.0 to 17.3.1.
- [Release notes](https://github.com/yargs/yargs/releases )
- [Changelog](https://github.com/yargs/yargs/blob/main/CHANGELOG.md )
- [Commits](https://github.com/yargs/yargs/compare/v17.3.0...v17.3.1 )
---
updated-dependencies:
- dependency-name: yargs
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-01-06 09:54:51 +09:00
dependabot[bot]
e8552007da
Bump kaminari from 1.2.1 to 1.2.2 ( #17197 )
...
Bumps [kaminari](https://github.com/kaminari/kaminari ) from 1.2.1 to 1.2.2.
- [Release notes](https://github.com/kaminari/kaminari/releases )
- [Changelog](https://github.com/kaminari/kaminari/blob/master/CHANGELOG.md )
- [Commits](https://github.com/kaminari/kaminari/compare/v1.2.1...v1.2.2 )
---
updated-dependencies:
- dependency-name: kaminari
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-01-06 09:54:38 +09:00
dependabot[bot]
cb499882dc
Bump rubocop-rails from 2.12.4 to 2.13.0 ( #17195 )
...
Bumps [rubocop-rails](https://github.com/rubocop/rubocop-rails ) from 2.12.4 to 2.13.0.
- [Release notes](https://github.com/rubocop/rubocop-rails/releases )
- [Changelog](https://github.com/rubocop/rubocop-rails/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rubocop/rubocop-rails/compare/v2.12.4...v2.13.0 )
---
updated-dependencies:
- dependency-name: rubocop-rails
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-01-06 09:51:46 +09:00
Jeong Arm
d3db2eb7fb
Remove custom emojis on domain purge ( #17210 )
2021-12-30 08:41:09 +01:00
Claire
37e80994f8
Fix media descriptions not being used for client-side filtering ( #17206 )
...
Fix oversight in #13837
2021-12-28 23:25:50 +01:00
Claire
e2933854ac
Merge pull request #1653 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2021-12-27 16:46:38 +01:00
Rens Groothuijsen
f011787003
[Glitch] Fix tag rendering error in hashtag column settings
...
Port e65080181a
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-12-27 15:22:12 +01:00
Claire
09c61e1376
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `README.md`:
We have completely different contents. Kept our version.
- `package.json`:
Not a real conflict, just an upstream dependency udpated
textually too close to a glitch-soc-only dependency.
Updated dependencies like upstream.
- `streaming/index.js`:
Conflict due to code style changes on parts that were
modified in glitch-soc to handle local-only toots.
Changed style according to upstream.
2021-12-27 15:16:18 +01:00
Eugen Rochko
fe71548844
Fix warnings on Rails boot ( #16946 )
2021-12-27 00:47:20 +01:00
Rens Groothuijsen
e65080181a
Fix tag rendering error in hashtag column settings ( #17184 )
...
* Flatten tags in configuration to regular array before converting to JSON
* Render filter tags using toJS instead of toJSON
2021-12-26 19:22:05 +01:00
Zach Neill
d78ddb1cea
Modify Readme syntax ( #17112 )
...
* Modify syntax
* Change ** bold to ### header
* Revert license edit
2021-12-25 22:55:31 +01:00
Lerk
4d1eaf3e6e
Finish update of node-redis ( #17183 )
...
* fix streaming redis client
* use console.error instead of console.log
* follow node-redis migration guide
https://github.com/redis/node-redis/blob/master/docs/v3-to-v4.md
* fix config options for node-redis
* keep indentation
* Update streaming/index.js
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2021-12-25 22:55:06 +01:00
Jeong Arm
fad37dd1bc
Save bundle config as local ( #17188 )
...
Some bundle options are saved as global user config and not project local.
Specially, `deployment` must be saved as local config to be run on copied environment
2021-12-25 22:52:24 +01:00
Lerk
56c55ab9f6
Add ReadWritePaths directive to service files ( #17178 )
...
* Update mastodon-web.service
* Update mastodon-streaming.service
* Update mastodon-sidekiq.service
2021-12-22 04:34:12 +01:00
dependabot[bot]
512bc9db7d
Bump redis from 3.1.2 to 4.0.1 ( #17161 )
...
Bumps [redis](https://github.com/redis/node-redis ) from 3.1.2 to 4.0.1.
- [Release notes](https://github.com/redis/node-redis/releases )
- [Changelog](https://github.com/redis/node-redis/blob/master/.release-it.json )
- [Commits](https://github.com/redis/node-redis/compare/v3.1.2...redis@4.0.1 )
---
updated-dependencies:
- dependency-name: redis
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-12-21 11:28:00 +09:00
dependabot[bot]
7cd26c8dbd
Bump bullet from 6.1.5 to 7.0.0 ( #17154 )
...
Bumps [bullet](https://github.com/flyerhzm/bullet ) from 6.1.5 to 7.0.0.
- [Release notes](https://github.com/flyerhzm/bullet/releases )
- [Changelog](https://github.com/flyerhzm/bullet/blob/master/CHANGELOG.md )
- [Commits](https://github.com/flyerhzm/bullet/compare/6.1.5...7.0.0 )
---
updated-dependencies:
- dependency-name: bullet
dependency-type: direct:development
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-12-21 10:58:59 +09:00
dependabot[bot]
cde4976d40
Bump npmlog from 5.0.1 to 6.0.0 ( #17026 )
...
Bumps [npmlog](https://github.com/npm/npmlog ) from 5.0.1 to 6.0.0.
- [Release notes](https://github.com/npm/npmlog/releases )
- [Changelog](https://github.com/npm/npmlog/blob/main/CHANGELOG.md )
- [Commits](https://github.com/npm/npmlog/compare/v5.0.1...v6.0.0 )
---
updated-dependencies:
- dependency-name: npmlog
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-12-21 10:57:25 +09:00
dependabot[bot]
82fdc81ae9
Bump eslint-plugin-promise from 5.1.1 to 6.0.0 ( #17173 )
...
Bumps [eslint-plugin-promise](https://github.com/xjamundx/eslint-plugin-promise ) from 5.1.1 to 6.0.0.
- [Release notes](https://github.com/xjamundx/eslint-plugin-promise/releases )
- [Changelog](https://github.com/xjamundx/eslint-plugin-promise/blob/development/CHANGELOG.md )
- [Commits](https://github.com/xjamundx/eslint-plugin-promise/commits )
---
updated-dependencies:
- dependency-name: eslint-plugin-promise
dependency-type: direct:development
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-12-21 10:55:38 +09:00
dependabot[bot]
85307c5ccf
Bump @babel/plugin-transform-runtime from 7.16.4 to 7.16.5 ( #17164 )
...
Bumps [@babel/plugin-transform-runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-plugin-transform-runtime ) from 7.16.4 to 7.16.5.
- [Release notes](https://github.com/babel/babel/releases )
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md )
- [Commits](https://github.com/babel/babel/commits/v7.16.5/packages/babel-plugin-transform-runtime )
---
updated-dependencies:
- dependency-name: "@babel/plugin-transform-runtime"
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-12-21 10:54:54 +09:00
dependabot[bot]
0a25c95950
Bump sass from 1.45.0 to 1.45.1 ( #17174 )
...
Bumps [sass](https://github.com/sass/dart-sass ) from 1.45.0 to 1.45.1.
- [Release notes](https://github.com/sass/dart-sass/releases )
- [Changelog](https://github.com/sass/dart-sass/blob/main/CHANGELOG.md )
- [Commits](https://github.com/sass/dart-sass/compare/1.45.0...1.45.1 )
---
updated-dependencies:
- dependency-name: sass
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-12-21 10:12:18 +09:00
dependabot[bot]
e884315bb3
Bump @babel/preset-env from 7.16.4 to 7.16.5 ( #17169 )
...
Bumps [@babel/preset-env](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-env ) from 7.16.4 to 7.16.5.
- [Release notes](https://github.com/babel/babel/releases )
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md )
- [Commits](https://github.com/babel/babel/commits/v7.16.5/packages/babel-preset-env )
---
updated-dependencies:
- dependency-name: "@babel/preset-env"
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-12-21 10:11:48 +09:00
dependabot[bot]
8fd6bba577
Bump @babel/runtime from 7.16.3 to 7.16.5 ( #17170 )
...
Bumps [@babel/runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-runtime ) from 7.16.3 to 7.16.5.
- [Release notes](https://github.com/babel/babel/releases )
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md )
- [Commits](https://github.com/babel/babel/commits/v7.16.5/packages/babel-runtime )
---
updated-dependencies:
- dependency-name: "@babel/runtime"
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-12-21 10:11:24 +09:00
dependabot[bot]
0fd5c51028
Bump @babel/core from 7.16.0 to 7.16.5 ( #17168 )
...
Bumps [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core ) from 7.16.0 to 7.16.5.
- [Release notes](https://github.com/babel/babel/releases )
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md )
- [Commits](https://github.com/babel/babel/commits/v7.16.5/packages/babel-core )
---
updated-dependencies:
- dependency-name: "@babel/core"
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-12-21 10:11:05 +09:00
dependabot[bot]
077d9f0c45
Bump pghero from 2.8.1 to 2.8.2 ( #17165 )
...
Bumps [pghero](https://github.com/ankane/pghero ) from 2.8.1 to 2.8.2.
- [Release notes](https://github.com/ankane/pghero/releases )
- [Changelog](https://github.com/ankane/pghero/blob/master/CHANGELOG.md )
- [Commits](https://github.com/ankane/pghero/compare/v2.8.1...v2.8.2 )
---
updated-dependencies:
- dependency-name: pghero
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-12-21 10:10:45 +09:00
dependabot[bot]
81d6a67676
Bump @babel/plugin-transform-react-inline-elements from 7.16.0 to 7.16.5 ( #17162 )
...
Bumps [@babel/plugin-transform-react-inline-elements](https://github.com/babel/babel/tree/HEAD/packages/babel-plugin-transform-react-inline-elements ) from 7.16.0 to 7.16.5.
- [Release notes](https://github.com/babel/babel/releases )
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md )
- [Commits](https://github.com/babel/babel/commits/v7.16.5/packages/babel-plugin-transform-react-inline-elements )
---
updated-dependencies:
- dependency-name: "@babel/plugin-transform-react-inline-elements"
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-12-21 10:09:34 +09:00
dependabot[bot]
9ee341aa04
Bump babel-jest from 27.4.0 to 27.4.5 ( #17132 )
...
Bumps [babel-jest](https://github.com/facebook/jest/tree/HEAD/packages/babel-jest ) from 27.4.0 to 27.4.5.
- [Release notes](https://github.com/facebook/jest/releases )
- [Changelog](https://github.com/facebook/jest/blob/main/CHANGELOG.md )
- [Commits](https://github.com/facebook/jest/commits/v27.4.5/packages/babel-jest )
---
updated-dependencies:
- dependency-name: babel-jest
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-12-21 10:09:09 +09:00
dependabot[bot]
4eef05d2d2
Bump express from 4.17.1 to 4.17.2 ( #17171 )
...
Bumps [express](https://github.com/expressjs/express ) from 4.17.1 to 4.17.2.
- [Release notes](https://github.com/expressjs/express/releases )
- [Changelog](https://github.com/expressjs/express/blob/master/History.md )
- [Commits](https://github.com/expressjs/express/compare/4.17.1...4.17.2 )
---
updated-dependencies:
- dependency-name: express
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-12-21 09:39:21 +09:00
dependabot[bot]
1fcd9d8519
Bump @babel/preset-react from 7.16.0 to 7.16.5 ( #17167 )
...
Bumps [@babel/preset-react](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-react ) from 7.16.0 to 7.16.5.
- [Release notes](https://github.com/babel/babel/releases )
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md )
- [Commits](https://github.com/babel/babel/commits/v7.16.5/packages/babel-preset-react )
---
updated-dependencies:
- dependency-name: "@babel/preset-react"
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-12-21 09:38:53 +09:00
dependabot[bot]
4aca1633f3
Bump @babel/plugin-proposal-decorators from 7.16.4 to 7.16.5 ( #17163 )
...
Bumps [@babel/plugin-proposal-decorators](https://github.com/babel/babel/tree/HEAD/packages/babel-plugin-proposal-decorators ) from 7.16.4 to 7.16.5.
- [Release notes](https://github.com/babel/babel/releases )
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md )
- [Commits](https://github.com/babel/babel/commits/v7.16.5/packages/babel-plugin-proposal-decorators )
---
updated-dependencies:
- dependency-name: "@babel/plugin-proposal-decorators"
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-12-21 09:38:29 +09:00
dependabot[bot]
43b4c14ac9
Bump strong_migrations from 0.7.8 to 0.7.9 ( #17166 )
...
Bumps [strong_migrations](https://github.com/ankane/strong_migrations ) from 0.7.8 to 0.7.9.
- [Release notes](https://github.com/ankane/strong_migrations/releases )
- [Changelog](https://github.com/ankane/strong_migrations/blob/master/CHANGELOG.md )
- [Commits](https://github.com/ankane/strong_migrations/compare/v0.7.8...v0.7.9 )
---
updated-dependencies:
- dependency-name: strong_migrations
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-12-21 09:38:06 +09:00
dependabot[bot]
4e017eaa06
Bump fabrication from 2.22.0 to 2.23.1 ( #17160 )
...
Bumps [fabrication](https://github.com/paulelliott/fabrication ) from 2.22.0 to 2.23.1.
- [Release notes](https://github.com/paulelliott/fabrication/releases )
- [Changelog](https://github.com/paulelliott/fabrication/blob/master/Changelog.markdown )
- [Commits](https://github.com/paulelliott/fabrication/commits )
---
updated-dependencies:
- dependency-name: fabrication
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-12-21 09:37:42 +09:00
dependabot[bot]
0d4af8008a
Bump brakeman from 5.1.2 to 5.2.0 ( #17158 )
...
Bumps [brakeman](https://github.com/presidentbeef/brakeman ) from 5.1.2 to 5.2.0.
- [Release notes](https://github.com/presidentbeef/brakeman/releases )
- [Changelog](https://github.com/presidentbeef/brakeman/blob/main/CHANGES.md )
- [Commits](https://github.com/presidentbeef/brakeman/compare/v5.1.2...v5.2.0 )
---
updated-dependencies:
- dependency-name: brakeman
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-12-21 09:37:25 +09:00
dependabot[bot]
e85960bbd7
Bump fastimage from 2.2.5 to 2.2.6 ( #17157 )
...
Bumps [fastimage](https://github.com/sdsykes/fastimage ) from 2.2.5 to 2.2.6.
- [Release notes](https://github.com/sdsykes/fastimage/releases )
- [Changelog](https://github.com/sdsykes/fastimage/blob/master/CHANGELOG )
- [Commits](https://github.com/sdsykes/fastimage/compare/v2.2.5...v2.2.6 )
---
updated-dependencies:
- dependency-name: fastimage
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-12-21 09:36:53 +09:00
dependabot[bot]
b93b0ad70d
Bump discard from 1.2.0 to 1.2.1 ( #17156 )
...
Bumps [discard](https://github.com/jhawthorn/discard ) from 1.2.0 to 1.2.1.
- [Release notes](https://github.com/jhawthorn/discard/releases )
- [Changelog](https://github.com/jhawthorn/discard/blob/master/CHANGELOG.md )
- [Commits](https://github.com/jhawthorn/discard/commits/v1.2.1 )
---
updated-dependencies:
- dependency-name: discard
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-12-21 09:36:35 +09:00
dependabot[bot]
88c94eb088
Bump sass from 1.43.5 to 1.45.0 ( #17131 )
...
Bumps [sass](https://github.com/sass/dart-sass ) from 1.43.5 to 1.45.0.
- [Release notes](https://github.com/sass/dart-sass/releases )
- [Changelog](https://github.com/sass/dart-sass/blob/main/CHANGELOG.md )
- [Commits](https://github.com/sass/dart-sass/compare/1.43.5...1.45.0 )
---
updated-dependencies:
- dependency-name: sass
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-12-21 09:24:34 +09:00
dependabot[bot]
980cfc127c
Bump jest from 27.4.3 to 27.4.5 ( #17130 )
...
Bumps [jest](https://github.com/facebook/jest ) from 27.4.3 to 27.4.5.
- [Release notes](https://github.com/facebook/jest/releases )
- [Changelog](https://github.com/facebook/jest/blob/main/CHANGELOG.md )
- [Commits](https://github.com/facebook/jest/compare/v27.4.3...v27.4.5 )
---
updated-dependencies:
- dependency-name: jest
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-12-21 09:23:58 +09:00
dependabot[bot]
4f1c6e28c7
Bump oj from 3.13.9 to 3.13.10 ( #17129 )
...
Bumps [oj](https://github.com/ohler55/oj ) from 3.13.9 to 3.13.10.
- [Release notes](https://github.com/ohler55/oj/releases )
- [Changelog](https://github.com/ohler55/oj/blob/develop/CHANGELOG.md )
- [Commits](https://github.com/ohler55/oj/compare/v3.13.9...v3.13.10 )
---
updated-dependencies:
- dependency-name: oj
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-12-21 09:23:28 +09:00
dependabot[bot]
267121824b
Bump devise from 4.8.0 to 4.8.1 ( #17155 )
...
Bumps [devise](https://github.com/heartcombo/devise ) from 4.8.0 to 4.8.1.
- [Release notes](https://github.com/heartcombo/devise/releases )
- [Changelog](https://github.com/heartcombo/devise/blob/main/CHANGELOG.md )
- [Commits](https://github.com/heartcombo/devise/compare/v4.8.0...v4.8.1 )
---
updated-dependencies:
- dependency-name: devise
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-12-21 09:22:58 +09:00
dependabot[bot]
4c375fe4f7
Bump sprockets-rails from 3.4.1 to 3.4.2 ( #17128 )
...
Bumps [sprockets-rails](https://github.com/rails/sprockets-rails ) from 3.4.1 to 3.4.2.
- [Release notes](https://github.com/rails/sprockets-rails/releases )
- [Commits](https://github.com/rails/sprockets-rails/compare/v3.4.1...v3.4.2 )
---
updated-dependencies:
- dependency-name: sprockets-rails
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-12-21 09:22:27 +09:00
dependabot[bot]
d17ba32b4a
Bump yargs from 17.2.1 to 17.3.0 ( #17102 )
...
Bumps [yargs](https://github.com/yargs/yargs ) from 17.2.1 to 17.3.0.
- [Release notes](https://github.com/yargs/yargs/releases )
- [Changelog](https://github.com/yargs/yargs/blob/main/CHANGELOG.md )
- [Commits](https://github.com/yargs/yargs/compare/v17.2.1...v17.3.0 )
---
updated-dependencies:
- dependency-name: yargs
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-12-21 09:19:51 +09:00
dependabot[bot]
10058dd668
Bump aws-sdk-s3 from 1.107.0 to 1.109.0 ( #17101 )
...
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby ) from 1.107.0 to 1.109.0.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases )
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/version-3/gems/aws-sdk-s3/CHANGELOG.md )
- [Commits](https://github.com/aws/aws-sdk-ruby/commits )
---
updated-dependencies:
- dependency-name: aws-sdk-s3
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-12-21 09:19:29 +09:00
dependabot[bot]
efd1b0cec3
Bump sidekiq-unique-jobs from 7.1.8 to 7.1.12 ( #17100 )
...
Bumps [sidekiq-unique-jobs](https://mhenrixon.github.io/sidekiq-unique-jobs ) from 7.1.8 to 7.1.12.
---
updated-dependencies:
- dependency-name: sidekiq-unique-jobs
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-12-21 09:17:45 +09:00
dependabot[bot]
a72f39f5d0
Bump @testing-library/jest-dom from 5.16.0 to 5.16.1 ( #17106 )
...
Bumps [@testing-library/jest-dom](https://github.com/testing-library/jest-dom ) from 5.16.0 to 5.16.1.
- [Release notes](https://github.com/testing-library/jest-dom/releases )
- [Changelog](https://github.com/testing-library/jest-dom/blob/main/CHANGELOG.md )
- [Commits](https://github.com/testing-library/jest-dom/compare/v5.16.0...v5.16.1 )
---
updated-dependencies:
- dependency-name: "@testing-library/jest-dom"
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-12-21 09:17:16 +09:00
Jeong Arm
720e8ab0f5
Fix duplicate record on admin/accounts when searching with IP ( #17150 )
2021-12-21 00:17:14 +01:00
Claire
3b9a6049ad
Merge pull request #1650 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2021-12-18 13:17:37 +01:00
Claire
fec4ed5074
Revert "Change workflow to push to Docker Hub ( #16980 )"
...
This reverts commit 4b616c4f0a
.
2021-12-18 12:47:57 +01:00
Claire
e061ea5f71
[Glitch] Change title of retention chart
...
Port 0c17fd9109
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-12-18 11:47:54 +01:00
Claire
d4f315f304
Merge branch 'main' into glitch-soc/merge-upstream
2021-12-18 11:44:54 +01:00
Claire
76761d5fc0
Add ability for admins to delete canonical email blocks ( #16644 )
...
* Add admin option to remove canonical email blocks from a deleted account
* Add tootctl canonical_email_blocks to inspect and remove canonical email blocks
2021-12-17 23:02:14 +01:00
Claire
7f803c41e2
Add ability to purge undeliverable domains from admin interface ( #16686 )
...
* Add ability to purge undeliverable domains from admin interface
* Add tests
2021-12-17 23:01:21 +01:00
Claire
0c17fd9109
Change title of retention chart ( #16909 )
...
Changes from “Retention” to “User retention rate by month after sign-up”.
This should make it much clearer to people not familiar with retention charts
what it actually means.
2021-12-17 23:00:41 +01:00
Claire
40f202c1e5
Change list title input styling ( #17092 )
2021-12-17 23:00:05 +01:00
Claire
7efef7db9e
Merge pull request #1648 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2021-12-16 19:45:17 +01:00
David Sterry
50d62fe2e7
[Glitch] ignore hashtag suggestions if they vary only in case
...
Port 2aafa5b4e7
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-12-16 16:48:42 +01:00
Rens Groothuijsen
59a5193280
[Glitch] Show correct error message if chosen password is too long
...
Port 66baa629ea
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-12-16 16:26:04 +01:00
Eugen Rochko
9cecf59300
[Glitch] Add batch suspend for accounts in admin UI
...
Port SCSS changes from 2aafa5b4e7
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-12-16 16:25:21 +01:00
Claire
b2526316f5
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/admin/pending_accounts/index.html.haml`:
Removed upstream, while it had glitch-soc-specific changes to accomodate
for glitch-soc's theming system.
Removed the file.
Additional changes:
- `app/views/admin/accounts/index.html.haml':
Accomodate for glitch-soc's theming system.
2021-12-16 16:20:44 +01:00
David Sterry
2aafa5b4e7
ignore hashtag suggestions if they vary only in case ( #16460 )
...
* ignore hashtag suggestions if they vary only in case
* remove console.logs and unused args
* consistently add space when dismissing suggestions
* linting
2021-12-15 23:47:19 +01:00
Takeshi Umeda
bda8e4f815
Fix follow recommendation biased towards older accounts ( #17126 )
2021-12-13 23:21:14 +01:00
Claire
0fc73bbcb9
Fix incorrect singular version of some translation strings ( #17124 )
...
Fixes #17120
Co-authored-by: Mélanie Chauvel <perso@hack-libre.org>
Co-authored-by: Mélanie Chauvel <perso@hack-libre.org>
2021-12-13 18:25:25 +01:00
Eugen Rochko
fe45184b36
Change trending hashtags threshold back from 15 to 5 ( #17122 )
2021-12-13 05:32:29 +01:00
Takeshi Umeda
6c8c031bcd
Add remove orphans to tootctl statuses remove ( #17067 )
...
* Add remove orphans to tootctl statuses remove
* Add REINDEX and change option from vacuum to compression-database
* Changed to extract the deletion target of conversations to a temporary table
* Support progress bar and exceptions when media remove
* Add continue option
* Fix compression to compress
* Remove skip_remove_orphans
2021-12-12 06:09:14 +01:00
Shlee
211958e8b8
Update .dockerignore/.gitignore for #16947 etc ( #17099 )
...
* Update .dockerignore
* Update .gitignore
2021-12-06 18:04:04 +01:00
heguro
41503507ec
Fix redirection when succeeded WebAuthn ( #17098 )
2021-12-05 21:50:12 +01:00
Rens Groothuijsen
66baa629ea
Show correct error message if chosen password is too long ( #17082 )
...
* Add correct error message for exceeding max length on password confirmation field
* Code style fixes
2021-12-05 21:49:50 +01:00
Eugen Rochko
0fb9536d38
Add batch suspend for accounts in admin UI ( #17009 )
2021-12-05 21:48:39 +01:00
dependabot[bot]
2e2ea6bb6b
Bump jest from 27.3.1 to 27.4.3 ( #17094 )
...
Bumps [jest](https://github.com/facebook/jest ) from 27.3.1 to 27.4.3.
- [Release notes](https://github.com/facebook/jest/releases )
- [Changelog](https://github.com/facebook/jest/blob/main/CHANGELOG.md )
- [Commits](https://github.com/facebook/jest/compare/v27.3.1...v27.4.3 )
---
updated-dependencies:
- dependency-name: jest
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-12-04 23:53:39 +09:00
dependabot[bot]
88b19ac3f5
Bump @testing-library/jest-dom from 5.15.1 to 5.16.0 ( #17095 )
...
Bumps [@testing-library/jest-dom](https://github.com/testing-library/jest-dom ) from 5.15.1 to 5.16.0.
- [Release notes](https://github.com/testing-library/jest-dom/releases )
- [Changelog](https://github.com/testing-library/jest-dom/blob/main/CHANGELOG.md )
- [Commits](https://github.com/testing-library/jest-dom/compare/v5.15.1...v5.16.0 )
---
updated-dependencies:
- dependency-name: "@testing-library/jest-dom"
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-12-04 23:53:26 +09:00
dependabot[bot]
1710915711
Bump reselect from 4.1.4 to 4.1.5 ( #17075 )
...
Bumps [reselect](https://github.com/reduxjs/reselect ) from 4.1.4 to 4.1.5.
- [Release notes](https://github.com/reduxjs/reselect/releases )
- [Changelog](https://github.com/reduxjs/reselect/blob/master/CHANGELOG.md )
- [Commits](https://github.com/reduxjs/reselect/compare/v4.1.4...v4.1.5 )
---
updated-dependencies:
- dependency-name: reselect
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-12-04 23:41:40 +09:00
dependabot[bot]
f6a8b0dd6e
Bump redux-thunk from 2.4.0 to 2.4.1 ( #17074 )
...
Bumps [redux-thunk](https://github.com/reduxjs/redux-thunk ) from 2.4.0 to 2.4.1.
- [Release notes](https://github.com/reduxjs/redux-thunk/releases )
- [Commits](https://github.com/reduxjs/redux-thunk/compare/v2.4.0...v2.4.1 )
---
updated-dependencies:
- dependency-name: redux-thunk
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-12-04 23:41:12 +09:00
dependabot[bot]
4b30129391
Bump ws from 8.2.3 to 8.3.0 ( #17076 )
...
Bumps [ws](https://github.com/websockets/ws ) from 8.2.3 to 8.3.0.
- [Release notes](https://github.com/websockets/ws/releases )
- [Commits](https://github.com/websockets/ws/compare/8.2.3...8.3.0 )
---
updated-dependencies:
- dependency-name: ws
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-12-04 23:40:19 +09:00
dependabot[bot]
f80d50fc42
Bump @testing-library/jest-dom from 5.15.0 to 5.15.1 ( #17081 )
...
Bumps [@testing-library/jest-dom](https://github.com/testing-library/jest-dom ) from 5.15.0 to 5.15.1.
- [Release notes](https://github.com/testing-library/jest-dom/releases )
- [Changelog](https://github.com/testing-library/jest-dom/blob/main/CHANGELOG.md )
- [Commits](https://github.com/testing-library/jest-dom/compare/v5.15.0...v5.15.1 )
---
updated-dependencies:
- dependency-name: "@testing-library/jest-dom"
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-12-04 23:39:18 +09:00
dependabot[bot]
0268868e25
Bump sass from 1.43.4 to 1.43.5 ( #17080 )
...
Bumps [sass](https://github.com/sass/dart-sass ) from 1.43.4 to 1.43.5.
- [Release notes](https://github.com/sass/dart-sass/releases )
- [Changelog](https://github.com/sass/dart-sass/blob/main/CHANGELOG.md )
- [Commits](https://github.com/sass/dart-sass/compare/1.43.4...1.43.5 )
---
updated-dependencies:
- dependency-name: sass
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-12-04 23:39:00 +09:00
dependabot[bot]
f21537ba6b
Bump babel-jest from 27.3.1 to 27.4.0 ( #17078 )
...
Bumps [babel-jest](https://github.com/facebook/jest/tree/HEAD/packages/babel-jest ) from 27.3.1 to 27.4.0.
- [Release notes](https://github.com/facebook/jest/releases )
- [Changelog](https://github.com/facebook/jest/blob/main/CHANGELOG.md )
- [Commits](https://github.com/facebook/jest/commits/v27.4.0/packages/babel-jest )
---
updated-dependencies:
- dependency-name: babel-jest
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-12-04 23:38:38 +09:00
Claire
d911c17f52
Fix unneeded outline around list name edition input
2021-12-03 21:03:40 +01:00
gunchleoc
2e0d5753e3
Prevent translations from accidentally becoming completely different from source strings on Crowdin without translators noticing. ( #17085 )
2021-12-01 19:03:35 +01:00
Claire
c5751f8377
Merge pull request #1643 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2021-11-30 17:34:22 +01:00
Claire
5bf3a09c5b
Merge branch 'main' into glitch-soc/merge-upstream
2021-11-30 12:13:54 +01:00
Eugen Rochko
a458b74c7e
Fix error on trending mailer due to missing constant ( #17072 )
2021-11-29 17:39:40 +01:00
dependabot[bot]
f200775fde
Bump @babel/plugin-transform-runtime from 7.16.0 to 7.16.4 ( #17023 )
...
Bumps [@babel/plugin-transform-runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-plugin-transform-runtime ) from 7.16.0 to 7.16.4.
- [Release notes](https://github.com/babel/babel/releases )
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md )
- [Commits](https://github.com/babel/babel/commits/v7.16.4/packages/babel-plugin-transform-runtime )
---
updated-dependencies:
- dependency-name: "@babel/plugin-transform-runtime"
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2021-11-29 15:41:17 +09:00
dependabot[bot]
87ed4e7e45
Bump cld3 from 3.4.2 to 3.4.3 ( #17047 )
...
Bumps [cld3](https://github.com/akihikodaki/cld3-ruby ) from 3.4.2 to 3.4.3.
- [Release notes](https://github.com/akihikodaki/cld3-ruby/releases )
- [Commits](https://github.com/akihikodaki/cld3-ruby/compare/v3.4.2...v3.4.3 )
---
updated-dependencies:
- dependency-name: cld3
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-11-29 15:19:22 +09:00
dependabot[bot]
9380318681
Bump aws-sdk-s3 from 1.106.0 to 1.107.0 ( #17048 )
...
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby ) from 1.106.0 to 1.107.0.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases )
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/version-3/gems/aws-sdk-s3/CHANGELOG.md )
- [Commits](https://github.com/aws/aws-sdk-ruby/commits )
---
updated-dependencies:
- dependency-name: aws-sdk-s3
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-11-29 15:18:59 +09:00
dependabot[bot]
7be9c31862
Bump @babel/preset-env from 7.16.0 to 7.16.4 ( #17024 )
...
Bumps [@babel/preset-env](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-env ) from 7.16.0 to 7.16.4.
- [Release notes](https://github.com/babel/babel/releases )
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md )
- [Commits](https://github.com/babel/babel/commits/v7.16.4/packages/babel-preset-env )
---
updated-dependencies:
- dependency-name: "@babel/preset-env"
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-11-29 15:18:41 +09:00
Jeong Arm
4a109ec1ba
Fix server graph on admin/tags/:id ( #17066 )
2021-11-28 23:13:07 +01:00
Alexandra Catalina
af93d938d4
Update tootsuite/mastodon Docker tag to v3.4.4 ( #17065 )
...
Co-authored-by: Renovate Bot <bot@renovateapp.com>
2021-11-27 03:06:39 +01:00
Claire
4aec8087c7
Merge pull request #1640 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2021-11-26 23:41:01 +01:00
Claire
ca5d78816b
[Glitch] Fix searching for additional hashtags in hashtag column
...
Port 3f382e337d
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-11-26 22:58:46 +01:00
Claire
d5d44b431a
[Glitch] Fix color of hashtag column settings inputs
...
Port 1630807ee2
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-11-26 22:58:13 +01:00
Claire
9b861d56a9
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `.env.production.sample`:
Copied upstream changes.
- `app/controllers/settings/identity_proofs_controller.rb`:
Minor conflict due to glitch-soc's extra “enable_keybase” setting.
Upstream removed keybase support altogether, so did the same.
- `app/controllers/well_known/keybase_proof_config_controller.rb`:
Minor conflict due to glitch-soc's extra “enable_keybase” setting.
Upstream removed keybase support altogether, so did the same.
- `lib/mastodon/statuses_cli.rb`:
Minor conflict due to an optimization that wasn't shared between
the two versions. Copied upstream's version.
2021-11-26 22:53:55 +01:00
Jeong Arm
1c826471e7
Fix admin statuses order( #16937 ) ( #16969 )
...
* Fix #16937
* Add test for statuses order
2021-11-26 22:12:27 +01:00
Claire
3f382e337d
Fix searching for additional hashtags in hashtag column ( #17054 )
2021-11-26 22:11:09 +01:00
Claire
1630807ee2
Fix color of hashtag column settings inputs ( #17058 )
...
Fixes #17057
2021-11-26 22:09:11 +01:00
Takeshi Umeda
0ac7efdc50
Fix performance of tootctl statuses remove ( #17052 )
...
* Fix performance of tootctl statuses remove
* Fix model class
2021-11-26 22:08:47 +01:00
Claire
ddcb9da74f
Fix opening wrong profile when clicking on username of boosting user in WebUI ( #17060 )
...
Fixes #16799
2021-11-26 22:04:09 +01:00
zunda
912c6b3f49
Upgrade bootsnap for Ruby 3.0.3 ( #17064 )
...
https://github.com/Shopify/bootsnap/blob/v1.9.3/CHANGELOG.md#193
2021-11-26 22:03:35 +01:00
Jeong Arm
97151840b0
[Glitch] Port upstream changes about trending links
2021-11-26 11:36:22 +01:00
Takeshi Umeda
06631fdc53
Fix ElasticSearch to Elasticsearch ( #17050 )
2021-11-26 08:30:02 +01:00
OSAMU SATO
53aca8aecf
Add batch_size option to bin/tootctl search deploy ( #17049 )
2021-11-26 08:29:53 +01:00
dependabot[bot]
0909874c08
Bump sprockets-rails from 3.4.0 to 3.4.1 ( #17021 )
...
Bumps [sprockets-rails](https://github.com/rails/sprockets-rails ) from 3.4.0 to 3.4.1.
- [Release notes](https://github.com/rails/sprockets-rails/releases )
- [Commits](https://github.com/rails/sprockets-rails/compare/v3.4.0...v3.4.1 )
---
updated-dependencies:
- dependency-name: sprockets-rails
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-11-26 14:06:23 +09:00
dependabot[bot]
45f8eb110a
Bump eslint-plugin-react from 7.27.0 to 7.27.1 ( #17022 )
...
Bumps [eslint-plugin-react](https://github.com/yannickcr/eslint-plugin-react ) from 7.27.0 to 7.27.1.
- [Release notes](https://github.com/yannickcr/eslint-plugin-react/releases )
- [Changelog](https://github.com/yannickcr/eslint-plugin-react/blob/master/CHANGELOG.md )
- [Commits](https://github.com/yannickcr/eslint-plugin-react/compare/v7.27.0...v7.27.1 )
---
updated-dependencies:
- dependency-name: eslint-plugin-react
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-11-26 14:06:12 +09:00
dependabot[bot]
5b8928fef9
Bump reselect from 4.1.2 to 4.1.4 ( #17025 )
...
Bumps [reselect](https://github.com/reduxjs/reselect ) from 4.1.2 to 4.1.4.
- [Release notes](https://github.com/reduxjs/reselect/releases )
- [Changelog](https://github.com/reduxjs/reselect/blob/master/CHANGELOG.md )
- [Commits](https://github.com/reduxjs/reselect/compare/v4.1.2...v4.1.4 )
---
updated-dependencies:
- dependency-name: reselect
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-11-26 14:01:53 +09:00
dependabot[bot]
9a77a16087
Bump @babel/plugin-proposal-decorators from 7.16.0 to 7.16.4 ( #17027 )
...
Bumps [@babel/plugin-proposal-decorators](https://github.com/babel/babel/tree/HEAD/packages/babel-plugin-proposal-decorators ) from 7.16.0 to 7.16.4.
- [Release notes](https://github.com/babel/babel/releases )
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md )
- [Commits](https://github.com/babel/babel/commits/v7.16.4/packages/babel-plugin-proposal-decorators )
---
updated-dependencies:
- dependency-name: "@babel/plugin-proposal-decorators"
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-11-26 14:01:31 +09:00
Eugen Rochko
7de0ee7aba
Remove Keybase integration ( #17045 )
2021-11-26 05:58:18 +01:00
Claire
025a2ceb0f
Merge pull request #1637 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2021-11-26 01:25:29 +01:00
Claire
3304df0ab5
Merge branch 'main' into glitch-soc/merge-upstream
2021-11-26 01:15:32 +01:00
Claire
afd71867ba
Revert "Fix trends admin page crashing"
...
This reverts commit 5f10e64330
.
2021-11-26 01:15:29 +01:00
Eugen Rochko
12b3ff6c6d
Fix error on trending hashtags/links pages in admin UI due to missing constant ( #17044 )
2021-11-26 01:12:39 +01:00
Claire
b4f785c1f4
Merge pull request #1636 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2021-11-26 01:12:09 +01:00
Claire
5f10e64330
Fix trends admin page crashing
2021-11-26 00:50:13 +01:00
Claire
0ccaedc92b
Disable trending links review request emails
2021-11-25 23:55:05 +01:00
Claire
67c4e8e317
[Glitch] Fix handling of recursive toots in WebUI
...
Port b1fd6d4490
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-11-25 23:52:22 +01:00
Claire
443ec4f8ba
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/admin/tags/index.html.haml`:
Removed upstream while it had changes in glitch-soc to accomodate for the
theming system.
Additional changes to accomodate for the theming system:
- `app/views/admin/trends/links/preview_card_providers/index.html.haml`
- `app/views/admin/trends/links/index.html.haml`
- `app/views/admin/trends/tags/index.html.haml`
- `app/views/admin/tags/show.html.haml`
2021-11-25 23:50:35 +01:00
Claire
b1fd6d4490
Fix handling of recursive toots in WebUI ( #17041 )
2021-11-25 23:46:39 +01:00
Claire
013bee6afb
Fix filtering DMs from non-followed users ( #17042 )
2021-11-25 23:46:30 +01:00
Claire
8c2fe2a846
Merge pull request #1635 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2021-11-25 20:21:25 +01:00
Claire
534b0a2704
Merge branch 'main' into glitch-soc/merge-upstream
2021-11-25 18:42:18 +01:00
Eugen Rochko
6e50134a42
Add trending links ( #16917 )
...
* Add trending links
* Add overriding specific links trendability
* Add link type to preview cards and only trend articles
Change trends review notifications from being sent every 5 minutes to being sent every 2 hours
Change threshold from 5 unique accounts to 15 unique accounts
* Fix tests
2021-11-25 13:07:38 +01:00
zunda
46e62fc4b3
Upgrade Ruby to 3.0.3 ( #17038 )
...
https://www.ruby-lang.org/en/news/2021/11/24/ruby-3-0-3-released/
2021-11-24 20:29:05 +01:00
trwnh
08a7c5139d
Better ordering for bug report issue template ( #17019 )
...
Logically, it makes more sense to provide the steps leading up to the bug before asking what the bug is. This change moves "steps to reproduce" above "expected behavior" and "actual behavior" to enforce the above progression and logical flow.
2021-11-24 20:24:09 +01:00
Claire
02a87431cf
Fix error when suspending user with an already-existing canonical email block ( #17036 )
...
* Fix error when suspending user with an already-existing canonical email block
Fixes #17033
While attempting to create a `CanonicalEmailBlock` with an existing hash would
raise an `ActiveRecord::RecordNotUnique` error, this being done within a
transaction would cancel the whole transaction. For this reason, checking for
uniqueness in Rails would query the database within the transaction and avoid
invalidating the whole transaction for this reason.
A race condition is still possible, where multiple accounts sharing a canonical
email would be blocked in concurrent transactions, in which only one would
succeed, but that is way less likely to happen that the current issue, and can
always be retried after the first failure, unlike the current situation.
* Add tests
2021-11-24 17:41:03 +01:00
Claire
9c44cf205f
Add FEDERATION.md ( #17029 )
...
Some ActivityPub projects have a FEDERATION.md which is used to describe the
various extensions they use.
Everything here is also documented elsewhere, but it's a concise starting point
with links to that documentation.
2021-11-23 00:15:31 +01:00
Claire
3ba7c85ec9
Merge pull request #1634 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2021-11-19 19:55:02 +01:00
Claire
189cf652e6
[Glitch] Fix overflow of long profile fields in admin view
...
Port db32835338
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-11-19 18:55:27 +01:00
Claire
2b4c7beb73
Merge branch 'main' into glitch-soc/merge-upstream
2021-11-19 18:51:41 +01:00
Claire
db32835338
Fix overflow of long profile fields in admin view ( #17010 )
2021-11-19 18:22:49 +01:00
Claire
6159020617
Fix background-color of emoji-mart selector ( #17011 )
...
Reverts part of #16907 to fix hardcoded color
2021-11-19 18:21:37 +01:00
Takeshi Umeda
3419d3ec84
Bump chewy from 5.2.0 to 7.2.3 (supports Elasticsearch 7.x) ( #16915 )
...
* Bump chewy from 5.2.0 to 7.2.2
* fix style (codeclimate)
* fix style
* fix style
* Bump chewy from 7.2.2 to 7.2.3
2021-11-18 22:02:08 +01:00
Mashiro
2b6a25c609
Add lazy load to emoji-mart ( #16907 )
...
* perf: lazyload emoji-mart!
* Bump lazyload
2021-11-18 22:01:31 +01:00
Shlee
d647f6ad04
Update Dockerfile ( #16939 )
2021-11-18 22:00:38 +01:00
Shlee
ac8ad78e91
[Docker-Compose] [Breaking] Postgres 9.6 is EOL (11th Nov 2021) - Migrate to 14 Stable ( #16947 )
...
* Update docker-compose.yml
* Update docker-compose.yml
* Update docker-compose.yml
* Update docker-compose.yml
2021-11-18 22:00:27 +01:00
Shlee
c242c1d87a
Ruby 3.0.2 Upgrade ( #16982 )
...
* Update .ruby-version
* Update Gemfile
* Update Gemfile.lock
* Update Dockerfile
* Update check-i18n.yml
* Update config.yml
* Update config.yml
2021-11-18 21:59:57 +01:00
Shlee
bc348dbe94
[Dockerfile] Upgrade ElasticSearch-OSS 6.8.10 to 7.10.2 ( #16956 )
...
* Update docker-compose.yml
* Update docker-compose.yml
* Update docker-compose.yml
2021-11-18 21:59:34 +01:00
dependabot[bot]
4ad7b81bc9
Bump aws-sdk-s3 from 1.105.1 to 1.106.0 ( #17001 )
...
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby ) from 1.105.1 to 1.106.0.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases )
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/version-3/gems/aws-sdk-s3/CHANGELOG.md )
- [Commits](https://github.com/aws/aws-sdk-ruby/commits )
---
updated-dependencies:
- dependency-name: aws-sdk-s3
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-11-18 09:44:23 +09:00
dependabot[bot]
d0d69fd88a
Bump mime-types from 3.4.0 to 3.4.1 ( #17002 )
...
Bumps [mime-types](https://github.com/mime-types/ruby-mime-types ) from 3.4.0 to 3.4.1.
- [Release notes](https://github.com/mime-types/ruby-mime-types/releases )
- [Changelog](https://github.com/mime-types/ruby-mime-types/blob/main/History.md )
- [Commits](https://github.com/mime-types/ruby-mime-types/compare/v3.4.0...v3.4.1 )
---
updated-dependencies:
- dependency-name: mime-types
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-11-18 09:44:08 +09:00
dependabot[bot]
0d624c89f8
Bump eslint-plugin-jsx-a11y from 6.4.1 to 6.5.1 ( #16993 )
...
Bumps [eslint-plugin-jsx-a11y](https://github.com/jsx-eslint/eslint-plugin-jsx-a11y ) from 6.4.1 to 6.5.1.
- [Release notes](https://github.com/jsx-eslint/eslint-plugin-jsx-a11y/releases )
- [Changelog](https://github.com/jsx-eslint/eslint-plugin-jsx-a11y/blob/master/CHANGELOG.md )
- [Commits](https://github.com/jsx-eslint/eslint-plugin-jsx-a11y/compare/v6.4.1...v6.5.1 )
---
updated-dependencies:
- dependency-name: eslint-plugin-jsx-a11y
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-11-18 09:42:12 +09:00
dependabot[bot]
e53fb1569c
Bump letter_opener_web from 1.4.1 to 2.0.0 ( #16960 )
...
Bumps [letter_opener_web](https://github.com/fgrehm/letter_opener_web ) from 1.4.1 to 2.0.0.
- [Release notes](https://github.com/fgrehm/letter_opener_web/releases )
- [Changelog](https://github.com/fgrehm/letter_opener_web/blob/master/CHANGELOG.md )
- [Commits](https://github.com/fgrehm/letter_opener_web/compare/v1.4.1...v2.0.0 )
---
updated-dependencies:
- dependency-name: letter_opener_web
dependency-type: direct:development
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-11-18 09:20:31 +09:00
dependabot[bot]
1b46004635
Bump eslint-plugin-import from 2.25.2 to 2.25.3 ( #16995 )
...
Bumps [eslint-plugin-import](https://github.com/import-js/eslint-plugin-import ) from 2.25.2 to 2.25.3.
- [Release notes](https://github.com/import-js/eslint-plugin-import/releases )
- [Changelog](https://github.com/import-js/eslint-plugin-import/blob/main/CHANGELOG.md )
- [Commits](https://github.com/import-js/eslint-plugin-import/compare/v2.25.2...v2.25.3 )
---
updated-dependencies:
- dependency-name: eslint-plugin-import
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-11-18 09:08:10 +09:00
dependabot[bot]
ffcb58414e
Bump @babel/runtime from 7.16.0 to 7.16.3 ( #16994 )
...
Bumps [@babel/runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-runtime ) from 7.16.0 to 7.16.3.
- [Release notes](https://github.com/babel/babel/releases )
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md )
- [Commits](https://github.com/babel/babel/commits/v7.16.3/packages/babel-runtime )
---
updated-dependencies:
- dependency-name: "@babel/runtime"
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-11-18 09:07:56 +09:00
dependabot[bot]
934c62dc05
Bump eslint-plugin-react from 7.26.1 to 7.27.0 ( #16992 )
...
Bumps [eslint-plugin-react](https://github.com/yannickcr/eslint-plugin-react ) from 7.26.1 to 7.27.0.
- [Release notes](https://github.com/yannickcr/eslint-plugin-react/releases )
- [Changelog](https://github.com/yannickcr/eslint-plugin-react/blob/master/CHANGELOG.md )
- [Commits](https://github.com/yannickcr/eslint-plugin-react/compare/v7.26.1...v7.27.0 )
---
updated-dependencies:
- dependency-name: eslint-plugin-react
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-11-18 09:07:15 +09:00
dependabot[bot]
08114772db
Bump mime-types from 3.3.1 to 3.4.0 ( #16991 )
...
Bumps [mime-types](https://github.com/mime-types/ruby-mime-types ) from 3.3.1 to 3.4.0.
- [Release notes](https://github.com/mime-types/ruby-mime-types/releases )
- [Changelog](https://github.com/mime-types/ruby-mime-types/blob/main/History.md )
- [Commits](https://github.com/mime-types/ruby-mime-types/compare/v3.3.1...v3.4.0 )
---
updated-dependencies:
- dependency-name: mime-types
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-11-18 09:06:58 +09:00
dependabot[bot]
7936bae40c
Bump sprockets-rails from 3.2.2 to 3.4.0 ( #16990 )
...
Bumps [sprockets-rails](https://github.com/rails/sprockets-rails ) from 3.2.2 to 3.4.0.
- [Release notes](https://github.com/rails/sprockets-rails/releases )
- [Commits](https://github.com/rails/sprockets-rails/compare/v3.2.2...v3.4.0 )
---
updated-dependencies:
- dependency-name: sprockets-rails
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-11-18 09:06:40 +09:00
dependabot[bot]
96f1538cc8
Bump rubocop from 1.22.3 to 1.23.0 ( #16989 )
...
Bumps [rubocop](https://github.com/rubocop/rubocop ) from 1.22.3 to 1.23.0.
- [Release notes](https://github.com/rubocop/rubocop/releases )
- [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rubocop/rubocop/compare/v1.22.3...v1.23.0 )
---
updated-dependencies:
- dependency-name: rubocop
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-11-18 09:06:26 +09:00
Shlee
03338d1297
[Dockerfile] [Security] Update NodeJS to V16 (LTS) on docker. ( #16856 )
...
* [Security] Update NodeJS on docker.
https://nodejs.org/en/blog/vulnerability/oct-2021-security-releases/
* Update Dockerfile
* Upgrade npm package
* Update Dockerfile
2021-11-17 07:57:01 +01:00
Eugen Rochko
f603de1f4c
Add manual GitHub Actions runs ( #17000 )
2021-11-16 21:42:14 +01:00
Claire
48f8658d34
Fix upload of remote media with OpenStack Swift sometimes failing ( #16998 )
...
Under certain conditions, files fetched from remotes trigger an error when
being uploaded using OpenStack Swift. This is because in some cases, the
remote server will not return a content-length, so our ResponseWithLimitAdapter
will hold a `nil` value for `#size`, which will lead to an invalid value
for the Content-Length header of the Swift API call.
This commit fixes that by taking the size from the actually-downloaded file
size rather than the upstream-provided Content-Length header value.
2021-11-16 21:36:28 +01:00
Claire
3517867b76
Fix confusing error when webfinger request returns empty document ( #16986 )
...
For some reason, some misconfigured servers return an empty document when
queried over webfinger. Since an empty document does not lead to a parse
error, the error is not caught properly and triggers uncaught exceptions
later on.
This PR fixes that by immediately erroring out with `Webfinger::Error` on
getting an empty response.
2021-11-14 21:55:40 +01:00
Eugen Rochko
4b616c4f0a
Change workflow to push to Docker Hub ( #16980 )
2021-11-14 06:11:05 +01:00
Eugen Rochko
5d7c852283
Fix no link previews being generated for pages with invalid structured data ( #16979 )
...
Fix #16955
2021-11-13 23:07:13 +01:00
dependabot[bot]
070b1b8397
Bump react-select from 5.1.0 to 5.2.1 ( #16967 )
...
Bumps [react-select](https://github.com/JedWatson/react-select ) from 5.1.0 to 5.2.1.
- [Release notes](https://github.com/JedWatson/react-select/releases )
- [Changelog](https://github.com/JedWatson/react-select/blob/master/docs/CHANGELOG.md )
- [Commits](https://github.com/JedWatson/react-select/compare/react-select@5.1.0...react-select@5.2.1 )
---
updated-dependencies:
- dependency-name: react-select
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-11-13 18:51:42 +09:00
dependabot[bot]
80c2b305e8
Bump @testing-library/jest-dom from 5.14.1 to 5.15.0 ( #16966 )
...
Bumps [@testing-library/jest-dom](https://github.com/testing-library/jest-dom ) from 5.14.1 to 5.15.0.
- [Release notes](https://github.com/testing-library/jest-dom/releases )
- [Changelog](https://github.com/testing-library/jest-dom/blob/main/CHANGELOG.md )
- [Commits](https://github.com/testing-library/jest-dom/compare/v5.14.1...v5.15.0 )
---
updated-dependencies:
- dependency-name: "@testing-library/jest-dom"
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-11-13 18:51:07 +09:00
dependabot[bot]
c47ad38853
Bump reselect from 4.1.1 to 4.1.2 ( #16963 )
...
Bumps [reselect](https://github.com/reduxjs/reselect ) from 4.1.1 to 4.1.2.
- [Release notes](https://github.com/reduxjs/reselect/releases )
- [Changelog](https://github.com/reduxjs/reselect/blob/master/CHANGELOG.md )
- [Commits](https://github.com/reduxjs/reselect/compare/v4.1.1...v4.1.2 )
---
updated-dependencies:
- dependency-name: reselect
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-11-13 18:49:38 +09:00
dependabot[bot]
8ce60c94d8
Bump sidekiq from 6.2.2 to 6.3.1 ( #16965 )
...
Bumps [sidekiq](https://github.com/mperham/sidekiq ) from 6.2.2 to 6.3.1.
- [Release notes](https://github.com/mperham/sidekiq/releases )
- [Changelog](https://github.com/mperham/sidekiq/blob/main/Changes.md )
- [Commits](https://github.com/mperham/sidekiq/compare/v6.2.2...v6.3.1 )
---
updated-dependencies:
- dependency-name: sidekiq
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-11-13 18:48:34 +09:00
dependabot[bot]
3a5e7495f6
Bump webpack-dev-server from 3.11.2 to 3.11.3 ( #16964 )
...
Bumps [webpack-dev-server](https://github.com/webpack/webpack-dev-server ) from 3.11.2 to 3.11.3.
- [Release notes](https://github.com/webpack/webpack-dev-server/releases )
- [Changelog](https://github.com/webpack/webpack-dev-server/blob/v3.11.3/CHANGELOG.md )
- [Commits](https://github.com/webpack/webpack-dev-server/compare/v3.11.2...v3.11.3 )
---
updated-dependencies:
- dependency-name: webpack-dev-server
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-11-13 18:46:14 +09:00
Claire
f2b376e9d8
Merge pull request #1632 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2021-11-13 10:41:25 +01:00
dependabot[bot]
554d6831b1
Bump aws-sdk-s3 from 1.104.0 to 1.105.1 ( #16962 )
...
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby ) from 1.104.0 to 1.105.1.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases )
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/version-3/gems/aws-sdk-s3/CHANGELOG.md )
- [Commits](https://github.com/aws/aws-sdk-ruby/commits )
---
updated-dependencies:
- dependency-name: aws-sdk-s3
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-11-13 18:36:28 +09:00
dependabot[bot]
f460f24fbe
Bump ox from 2.14.5 to 2.14.6 ( #16961 )
...
Bumps [ox](https://github.com/ohler55/ox ) from 2.14.5 to 2.14.6.
- [Release notes](https://github.com/ohler55/ox/releases )
- [Changelog](https://github.com/ohler55/ox/blob/develop/CHANGELOG.md )
- [Commits](https://github.com/ohler55/ox/compare/v2.14.5...v2.14.6 )
---
updated-dependencies:
- dependency-name: ox
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-11-13 18:35:52 +09:00
dependabot[bot]
4b1af2249d
Bump i18n-tasks from 0.9.34 to 0.9.35 ( #16959 )
...
Bumps [i18n-tasks](https://github.com/glebm/i18n-tasks ) from 0.9.34 to 0.9.35.
- [Release notes](https://github.com/glebm/i18n-tasks/releases )
- [Changelog](https://github.com/glebm/i18n-tasks/blob/main/CHANGES.md )
- [Commits](https://github.com/glebm/i18n-tasks/compare/v0.9.34...v0.9.35 )
---
updated-dependencies:
- dependency-name: i18n-tasks
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-11-13 18:34:28 +09:00
dependabot[bot]
6a34be0cab
Bump idn-ruby from 0.1.2 to 0.1.4 ( #16958 )
...
Bumps [idn-ruby](https://github.com/deepfryed/idn-ruby ) from 0.1.2 to 0.1.4.
- [Release notes](https://github.com/deepfryed/idn-ruby/releases )
- [Changelog](https://github.com/deepfryed/idn-ruby/blob/master/CHANGES )
- [Commits](https://github.com/deepfryed/idn-ruby/compare/v0.1.2...v0.1.4 )
---
updated-dependencies:
- dependency-name: idn-ruby
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-11-13 18:34:00 +09:00
Claire
2cda8be805
Merge branch 'main' into glitch-soc/merge-upstream
2021-11-13 09:40:13 +01:00
Claire
ef8deb0878
Fix OpenGraph/LinkedData embeds having incorrectly-generated iframes ( #16978 )
2021-11-13 03:30:27 +01:00
Jeong Arm
8b8d58c670
Rename, move, fix code
2021-11-12 19:51:35 +01:00
Jeong Arm
3238e60823
Fix admin sidebar on Mobile layout
2021-11-12 19:51:35 +01:00
Claire
f33878969a
Fix some glitch-soc styling issues due to different class names
...
Partial fix to #1629
2021-11-12 16:29:36 +01:00
Claire
a25839340e
Merge pull request #1628 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2021-11-06 00:33:55 +01:00
Claire
4bb6b1a1e7
Merge branch 'main' into glitch-soc/merge-upstream
2021-11-06 00:15:38 +01:00
Claire
e0f3962697
Merge pull request #1625 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2021-10-25 21:31:10 +02:00
Sasha Sorokin
a30ac454b2
[Glitch] Split context for filter bar and unread markers
...
Port 11d4f9eefc
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-10-25 20:37:07 +02:00
Mashiro
dbbb077c19
[Glitch] Enhance dashboard styles
...
Port b58d32cfe2
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-10-25 20:36:31 +02:00
Claire
e855df149b
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `.env.production.sample`:
Upstream added new configuration options, uncommented by default.
Commented them.
- `Gemfile.lock`:
Upstream updated dependencies textually close to glitch-soc-specific
dependencies.
Updated those upstream dependencies.
2021-10-25 20:28:51 +02:00
Claire
c647fa99ca
Merge pull request #1624 from atsu1125/glitch-translate
...
translation glitch's web interface [ja]
2021-10-25 20:24:23 +02:00
atsu1125
dae377b3b5
translation glitch's web interface [ja]
...
Squashed commit of the following:
commit f8c339b4dafd7347c5e824191dbf28d770d6583d
Author: atsuchan <83960488+atsu1125@users.noreply.github.com>
Date: Sat Oct 23 20:24:28 2021 +0900
translation glitch's web interface [ja]
commit a9520d5c5fb21490fa66c51bf1063f1edb9150ff
Author: atsu1125 <mastodon@atsuchan.page>
Date: Sat Oct 23 15:21:55 2021 +0900
translation glitch's web interface [ja]
commit 699848f2abff24be149c4a1c623df8b920ef2ed9
Author: atsu1125 <mastodon@atsuchan.page>
Date: Sat Oct 23 13:23:39 2021 +0900
translation glitch's web interface [ja]
2021-10-24 00:05:33 +09:00
Claire
8ef8d2b790
Merge pull request #1623 from atsu1125/glitch-translate
...
Translation glitch's interface [ja]
2021-10-20 15:42:10 +02:00
atsu1125
7bc7da565b
translation glitch's preferences [ja]
2021-10-20 13:04:50 +09:00
atsu1125
aa6269b08e
translation glitch's client setting interface [ja]
2021-10-20 13:00:51 +09:00
Claire
b6f24ef0fb
Merge pull request #1622 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2021-10-14 22:57:41 +02:00
Claire
6964952d5f
Merge branch 'main' into glitch-soc/merge-upstream
2021-10-14 22:22:39 +02:00
Claire
b2eaf5562d
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `README.md`:
Upstream added some documentation in the README, but our README is pretty
different and barebone.
Kept our README.
2021-10-14 22:14:26 +02:00
Eugen Rochko
7aec1bc308
[Glitch] Add graphs and retention metrics to admin dashboard ( #16829 )
...
Port 07341e7aa6
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-10-14 21:45:01 +02:00
Claire
694c073d1f
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `app/controllers/admin/dashboard_controller.rb`:
Upstream completely redesigned the admin dashboard.
glitch-soc tracked extra features, but that list is
gone.
Followed upstram.
- `app/views/admin/dashboard/index.html.haml`
Upstream completely redesigned the admin dashboard.
glitch-soc tracked extra features, but that list is
gone.
Followed upstram.
2021-10-14 21:44:57 +02:00
Claire
ebf2c31956
Merge pull request #1620 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2021-10-13 16:29:17 +02:00
Sasha Sorokin
5169b374c6
[Glitch] Add single option votes tooltip in polls
...
Port 89b5071fde
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-10-13 15:53:33 +02:00
Claire
1665b84285
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `package.json`:
Not really a conflict, just a glitch-soc-only dependency textually too close
to an updated upstream one.
- `yarn.lock`:
Not really a conflict, just a glitch-soc-only dependency textually too close
to an updated upstream one.
2021-10-13 15:50:24 +02:00
Jeong Arm
0220065770
Fix status open hotkey
2021-10-07 23:40:35 +02:00
Julianne420
ebb4de7d3e
Add zh-CN translations
2021-10-07 23:40:18 +02:00
Claire
44fd66f0c6
Merge pull request #1616 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2021-10-06 18:02:18 +02:00
Mélanie Chauvel
cef109e046
[Glitch] Improve hover and focus style in columns settings
...
Port 900481b7fa
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-10-06 16:51:42 +02:00
Claire
079ed6c26d
Merge branch 'main' into glitch-soc/merge-upstream
2021-10-06 16:46:32 +02:00
Claire
b31748a496
Fix clicking on account name in “[xxx] boosted” text leading to broken path
2021-09-30 12:31:08 +02:00
Claire
e660a7bbb0
Merge pull request #1613 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2021-09-30 12:30:48 +02:00
Claire
56f9c44f33
Merge branch 'main' into glitch-soc/merge-upstream
2021-09-30 11:45:13 +02:00
Claire
5e36c3b44c
Merge pull request #1612 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2021-09-30 00:29:38 +02:00
Claire
29b5c5f483
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/custom_emoji.rb`:
Slight refactor upstream, next to a line that was different in glitch-soc
because of our local configurable limits on custom emoji size.
Ported upstream changes.
- `yarn.lock`:
Not really a conflict, upstream dependency textually too close to a
glitch-soc-only dependency.
Updated upstream dependency as upstream.
2021-09-30 00:01:20 +02:00
Claire
00889b3131
Merge pull request #1609 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2021-09-28 14:10:30 +02:00
Claire
c4ccbbccab
Fixup style issue
2021-09-28 13:24:34 +02:00
Claire
345b64340b
[Glitch] Fix incorrect use of old WebUI paths
...
Port 6b19e1e632
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-09-28 13:07:27 +02:00
Claire
188d66c9a8
[Glitch] Add aliases for WebUI routes that were renamed in #16171
...
Port 11502ae46e
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-09-28 13:07:27 +02:00
Claire
b2dd2e95ad
Merge branch 'main' into glitch-soc/merge-upstream
2021-09-28 12:37:54 +02:00
Eugen Rochko
a7f6524c6b
[Glitch] Change routing paths to use usernames in web UI
...
Port 52e5c07948
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-09-26 21:35:57 +02:00
Claire
3622110778
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `streaming/index.js`:
Filtering code for streaming notifications has been refactored upstream, but
glitch-soc had similar code for local-only toots in the same places.
Ported upstream changes, but did not refactor local-only filtering.
2021-09-26 18:28:59 +02:00
Claire
4b7e436026
Merge pull request #1606 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2021-09-22 17:27:15 +02:00
Claire
7c25251a39
Merge branch 'main' into glitch-soc/merge-upstream
2021-09-22 16:50:33 +02:00
Claire
3d05ebfdc3
Merge pull request #1604 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2021-09-19 14:10:26 +02:00
Claire
bf827b17e1
Merge branch 'main' into glitch-soc/merge-upstream
2021-09-19 13:07:27 +02:00
Claire
35469b1952
Merge pull request #1602 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2021-09-14 22:48:26 +02:00
Claire
f1e6884d6b
Merge branch 'main' into glitch-soc/merge-upstream
2021-09-14 13:50:30 +02:00
Claire
7aa4d481db
Fix media icons not being added in CWs
2021-09-09 17:14:09 +02:00
Claire
4a94f4127b
Fix glitch-soc front-end not linking to the provided SOURCE_URL
2021-09-08 16:36:45 +02:00
Claire
6bbcd99f14
Fix media attachments not being displayed on polls
...
Fixes #1595
2021-09-08 16:36:30 +02:00
Claire
e2921375c3
Merge pull request #1597 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2021-09-08 14:16:17 +02:00
Claire
5d81d621b6
Merge branch 'main' into glitch-soc/merge-upstream
2021-09-08 13:27:37 +02:00
Claire
127aaa8174
Merge pull request #1594 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2021-09-08 13:24:54 +02:00
Claire
f9185c72a9
Merge branch 'main' into glitch-soc/merge-upstream
2021-09-02 10:52:09 +02:00
Claire
e7e04b46d7
Merge pull request #1591 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2021-08-27 15:28:00 +02:00
matildepark
39193be1c4
[Glitch] Fix follow request count to dynamically update
...
Port 79341d0f5f
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-08-27 11:31:09 +02:00
Claire
463d23dfd5
Merge branch 'main' into glitch-soc/merge-upstream
2021-08-27 11:29:03 +02:00
Claire
70909c5b09
Merge pull request #1589 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2021-08-20 16:30:21 +02:00
Claire
1aca5ef9bc
Merge branch 'main' into glitch-soc/merge-upstream
2021-08-20 16:14:45 +02:00
Claire
65b003cab8
Merge pull request #1588 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2021-08-20 14:26:14 +02:00
Claire
4f074b68ba
[Glitch] Fix crash if a notification contains an unprocessed media attachment
...
Port 0c24c865b7
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-08-20 13:14:59 +02:00
Claire
0e62c38b02
[Glitch] Fix download button color in audio player
...
Port aaf24d3093
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-08-20 13:14:03 +02:00
Claire
4e2a8c9b38
Merge branch 'main' into glitch-soc/merge-upstream
2021-08-20 13:01:50 +02:00
Claire
4a364de500
Merge pull request #1585 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2021-08-11 17:25:06 +02:00
Claire
47ea9b2d67
Merge branch 'main' into glitch-soc/merge-upstream
2021-08-11 16:41:59 +02:00
Claire
70b7ac9ff3
Merge pull request #1583 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2021-08-10 00:25:33 +02:00
Takeshi Umeda
8681ef85d0
[Glitch] Fix logout link not working in safari
...
Port b2875b1864
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-08-09 23:45:58 +02:00
Jeong Arm
8d55cb7d71
[Glitch] Fix trends layout
...
Port 6e0ab6814f
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-08-09 23:40:31 +02:00
Claire
76c7226eb0
Fix account statuses cleanup settings controller for glitch-soc's theming system
2021-08-09 23:28:06 +02:00
Claire
8ec4be4233
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `Gemfile.lock`:
Not a real conflict, upstream-updated dependency (redis) textually too
close to glitch-soc-only dependecy.
Updated redis gem like upstream did.
2021-08-09 23:25:49 +02:00
Jeong Arm
a61645ed30
Add missing Korean translations
2021-08-06 20:06:05 +02:00
Jeong Arm
0843a3dd6d
Fix typo on simple_form.ko.yml
2021-08-06 20:06:05 +02:00
Jeong Arm
69b5139d2a
Add Korean translations
2021-08-06 20:06:05 +02:00
Claire
359f8de2e8
Merge pull request #1570 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2021-07-25 14:31:49 +02:00
Claire
2f6ff14198
[Glitch] Fix crashes with Microsoft Translate on Microsoft Edge
...
Port e9659ae031
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-07-25 13:04:59 +02:00
Claire
34a573ac27
[Glitch] Add confirmation modal when closing media edit modal with unsaved changes
...
Port a8a7066e97
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-07-25 12:59:03 +02:00
Claire
08139d3cd7
[Glitch] Fix “open” link of media modal not closing modal
...
Port af08229ff4
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-07-25 12:51:33 +02:00
Claire
b5e10d07ff
Merge branch 'main' into glitch-soc/merge-upstream
2021-07-25 12:48:48 +02:00
Claire
a2df067f98
Merge pull request #1569 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2021-07-19 12:09:41 +02:00
Claire
d1c87be8cf
Merge branch 'main' into glitch-soc/merge-upstream
2021-07-17 17:45:35 +02:00
Claire
e42ed4502f
Merge pull request #1567 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2021-07-13 23:55:09 +02:00
Claire
fc500a6062
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `CONTRIBUTING.md`:
Upstream file has changed and we're quoting it.
Ported the changes.
- `README.md`:
Upstream file has changed but we have a completely different one.
Kept our version.
- `lib/mastodon/version.rb`:
Upstream has changed from `tootsuite/mastodon` to `mastodon/mastodon`,
but we're still `glitch-soc/mastodon`.
Kept our version.
- `spec/presenters/instance_presenter_spec.rb`:
Upstream has changed from `tootsuite/mastodon` to `mastodon/mastodon`,
but we're still `glitch-soc/mastodon`.
Kept our version.
2021-07-13 17:57:15 +02:00
Claire
82bc8e7647
Merge pull request #1566 from ClearlyClaire/glitch-soc/feature/modal-stack
...
Fix boost/fav confirmation modals closing media modal
2021-07-13 15:45:21 +02:00
Claire
e4270cb55a
Please CodeClimate
2021-07-13 13:49:40 +02:00
Claire
19ea6618b1
Small scroll/history behavior fixup to take weird browser patterns into account
2021-07-13 13:21:00 +02:00
Claire
84fbe4d030
Refactor shouldUpdateScroll stuff
2021-07-13 12:51:06 +02:00
Claire
99f28c17de
Fix scroll handling with modals
2021-07-13 11:07:16 +02:00
Claire
6e3d5cbca2
Fix and simplify browser history handling in relation to modals
...
This simplifies the logic to:
- when the last modal gets closed and we're in our history buffer state, go back
- whenever a modal is open, ensure we're in a history buffer state by
potentially pushing one
2021-07-12 20:13:02 +02:00
Claire
c5b4e6b708
Add modal stack to allow better boost modal and media modal interaction.
2021-07-12 17:00:14 +02:00
Claire
ddf3f4cf85
Fix clicking on the pop-up player placeholder expanding the clicked toot
2021-07-12 16:24:53 +02:00
Claire
a85eb7d930
Fix follow suggestions scrolling on mobile view
...
Also simplify the CSS a bit and bring it closer to upstream.
2021-07-12 10:22:57 +02:00
Claire
0c6dfcf3de
Merge pull request #1563 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2021-07-11 22:38:06 +02:00
Claire
cdf20f4367
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `app/serializers/rest/instance_serializer.rb`:
Upstream changed the fields returned by /api/v1/instance by adding a
`configuration` field holding a lot of useful information making our
`max_toot_chars` and `poll_limits` fields obsolete.
Keeping those around for now for compatibility.
- `app/validators/status_length_validator.rb`:
No real conflict, just URL_PLACEHOLDER_CHARS introduced too close to
MAX_CHARS which is defined differently in glitch-soc.
Ported upstream changes.
2021-07-11 21:41:23 +02:00
Claire
f040b9aee3
Merge pull request #1562 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2021-07-08 19:53:43 +02:00
Claire
101f8616fe
[Glitch] Fix pop-in player display when poster has long username or handle
...
Port 1381e0e1d9
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-07-08 16:23:09 +02:00
Claire
3160e050a9
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `app/helpers/accounts_helper.rb`:
Conflict due to upstream changing how followers count is displayed while we
have an option to hide followers count.
Ported upstream change.
- `app/views/accounts/_header.html.haml`:
Conflict due to upstream changing how followers count is displayed while we
have an option to hide followers count.
Ported upstream change.
- `app/views/directories/index.html.haml`:
Conflict due to upstream changing how followers count is displayed while we
have an option to hide followers count.
Ported upstream change.
2021-07-08 16:17:19 +02:00
Claire
0c2eb949fc
Merge pull request #1560 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2021-07-02 16:57:28 +02:00
Claire
1e2097afd4
Merge branch 'main' into glitch-soc/merge-upstream
2021-07-02 16:12:11 +02:00
Claire
f4b9d94ce7
Merge pull request #1559 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2021-06-30 11:13:38 +02:00
Claire
81d8a20a88
Merge branch 'main' into glitch-soc/merge-upstream
2021-06-30 09:43:18 +02:00
Claire
a4c828f8e7
Merge pull request #1558 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2021-06-30 01:01:43 +02:00
David Sterry
ba8f4535e3
[Glitch] Hide /about/more footer link in limited federation mode
...
Port 7c27ccb8d8
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-06-30 00:45:00 +02:00
Claire
d1780fb9a4
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/ISSUE_TEMPLATE/bug_report.md`:
Removed upstream, while we had a checkbox telling people to check if the
issue was present upstream. Removed the file as well.
2021-06-30 00:42:52 +02:00
Claire
ff3626269e
Merge pull request #1557 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2021-06-25 12:20:46 +02:00
Claire
a993ff6e2f
Merge branch 'main' into glitch-soc/merge-upstream
2021-06-25 10:44:06 +02:00
Claire
0eebade48c
Merge pull request #1556 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2021-06-24 19:22:13 +02:00
Claire
83b4e8584b
Merge branch 'main' into glitch-soc/merge-upstream
2021-06-24 18:59:19 +02:00
Claire
62bf929684
Merge pull request #1555 from ClearlyClaire/glitch-soc/fixes/video-player-crash
...
[Glitch] Fix WebUI crash when a toot with a playing video gets deleted
2021-06-24 16:00:26 +02:00
Claire
b6f952ec5b
[Glitch] Fix styling of boost button in media modal not reflecting ability to boost
...
Port tootsuite#16387 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-06-24 15:43:04 +02:00
Claire
f024f523b2
Fix pop-up player not closing the moment a status is deleted
...
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-06-24 15:19:18 +02:00
Claire
036ec18fb3
Fix WebUI crash when a toot with a playing video gets deleted
...
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-06-24 15:19:12 +02:00
Claire
2a4e44a725
Merge pull request #1553 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2021-06-24 15:16:38 +02:00
Claire
86aca08ec6
Merge branch 'main' into glitch-soc/merge-upstream
2021-06-24 08:08:02 +02:00
Claire
776e00f193
Merge pull request #1551 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2021-06-23 12:49:09 +02:00
Claire
979059fbc9
Fix login date not showing up in login history by using “public” pack
2021-06-23 12:21:40 +02:00
Eugen Rochko
d10d1e5eac
[Glitch] Add authentication history
...
Port SCSS changes from d174d12c83
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-06-23 11:40:18 +02:00
Claire
37fd9670a5
Merge branch 'main' into glitch-soc/merge-upstream
2021-06-23 10:46:24 +02:00
Claire
a434f370f3
Merge pull request #1550 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2021-06-16 12:42:40 +02:00
Claire
6dd51448a6
[Glitch] Fix OCR failure when erroneous lang data is in cache
...
Port 8428faa085
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-06-16 11:29:07 +02:00
Claire
4aa78027ea
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `Gemfile.lock`: upstream-updated dependency (redis) textually too close to
glitch-specific one (redcarpet).
Ported upstream change.
2021-06-16 11:24:55 +02:00
Claire
db5baf3d1a
Merge pull request #1547 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2021-06-03 22:30:38 +02:00
Claire
1ac5427ddc
[Glitch] Update emoji codepoint mappings to v13.1
...
Port f6088922c0
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-06-03 21:07:35 +02:00
Claire
fa383531a7
[Glitch] Fix deprecated slash as division in SASS files
...
Port be8079f637
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-06-03 21:06:16 +02:00
Eugen Rochko
d2c9f39c0b
[Glitch] Add assets from Twemoji 13.1.0
...
Port abd7b4636a
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-06-03 21:05:24 +02:00
Claire
0157caacef
Merge branch 'main' into glitch-soc/merge-upstream
2021-06-03 20:47:02 +02:00
Claire
02dffa8edd
Merge pull request #1546 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2021-05-31 16:49:48 +02:00
Claire
fb8c5979b4
Merge branch 'main' into glitch-soc/merge-upstream
2021-05-31 11:53:57 +02:00
Claire
bbc9ca5d38
Merge pull request #1544 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2021-05-27 18:59:48 +02:00
Claire
10a31a934f
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `README.md`:
Upstream's README got updated, but we have a completely different one.
Kept ours.
2021-05-27 17:58:44 +02:00
Claire
2024aef0f9
Merge pull request #1542 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2021-05-22 15:16:21 +02:00
Zero King
8027d921ab
[Glitch] Remove duplicate CSS properties
...
Port 028ba13eb3
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-05-22 13:22:26 +02:00
Claire
1a591ffc8b
[Glitch] Fix unread notification count when polling
...
Port 92f1d739b5
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-05-22 13:20:07 +02:00
Zero King
bb0c9fcde7
[Glitch] Remove duplicate CSS property of margin
...
Port 689974b1ed
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-05-22 13:18:32 +02:00
Claire
5f334807d2
Merge branch 'main' into glitch-soc/merge-upstream
2021-05-22 13:11:31 +02:00
Claire
03952c7d49
Merge pull request #1541 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2021-05-18 09:57:30 +02:00
Claire
f3d96d4ecb
Merge branch 'main' into glitch-soc/merge-upstream
2021-05-18 09:40:17 +02:00
Claire
567745c1e6
Merge pull request #1539 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2021-05-17 11:33:17 +02:00
Claire
69737b703a
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `README.md`: our READMEs are entirely different and
upstream's has been updated. Kept our README.
2021-05-17 10:30:34 +02:00
Claire
678e07c544
Fix local-only toggle being buggy when replying to remote toot
2021-05-12 12:38:21 +02:00
Claire
db2f6fa49b
Merge pull request #1535 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2021-05-12 11:39:55 +02:00
Claire
671a95c545
[Glitch] Fix follow recommendations UI in advanced layout
...
Port 4f747d9f83
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-05-12 11:08:37 +02:00
Mélanie Chauvel
67c2c0a41e
[Glitch] Fix dialog close button
...
Port 0464240f19
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-05-12 11:07:40 +02:00
Claire
dc58d02192
Merge branch 'main' into glitch-soc/merge-upstream
2021-05-12 11:03:05 +02:00
Claire
ffc3f8eebe
Merge pull request #1534 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2021-05-10 22:17:28 +02:00
Claire
7ac8bcf209
Merge branch 'main' into glitch-soc/merge-upstream
2021-05-10 21:45:32 +02:00
Claire
fc8baba8cb
Merge pull request #1533 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2021-05-09 11:14:32 +02:00
Mélanie Chauvel
299ab28d5f
[Glitch] Make media_gallery.toggle_visible less confusing to translate
...
Port 68181b9506
to glitch-soc
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-05-09 10:50:39 +02:00
Claire
87c3a0d0b3
Merge branch 'main' into glitch-soc/merge-upstream
2021-05-09 10:41:28 +02:00
Claire
5233e99106
Merge pull request #1531 from ClearlyClaire/glitch-soc/features/upstream-media-modal
...
Port upstream's new media modal
2021-05-08 00:37:51 +02:00
Claire
df82963ea4
Merge pull request #1532 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2021-05-08 00:21:55 +02:00
Claire
fbf097f7e1
Merge branch 'main' into glitch-soc/merge-upstream
2021-05-08 00:01:47 +02:00
Marcin Mikołajczak
196cef8977
[Glitch] Add transition to media modal background
...
Port f8e50eaea3
to glitch-soc
Signed-off-by: marcin mikołajczak <me@mkljczk.pl>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-05-07 22:47:09 +02:00
Takeshi Umeda
34cc6f45ac
[Glitch] Fix expand video on public page
...
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-05-07 22:47:09 +02:00
ThibG
d8e756eda8
[Glitch] Fix media modal buttons not showing up on mobile
...
Port b08d2d4f78
to glitch-soc
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-05-07 22:47:09 +02:00
Eugen Rochko
d973a90bcc
[Glitch] Fix not being able to open audio modal in web UI
...
Port a8c471fcc0
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-05-07 22:47:09 +02:00
Eugen Rochko
f29f8caccb
[Glitch] Fix too low contrast on new media modal background in web UI
...
Port 014733d1e4
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-05-07 22:47:09 +02:00
Eugen Rochko
cccc65651d
[Glitch] Fix media modal crashing when media has no blurhash
...
Port 13206fcfb8
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-05-07 22:47:09 +02:00
Eugen Rochko
9dde2400d0
[Glitch] Fix media modal regression on public pages
...
Port e1a6526c8d
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-05-07 22:47:09 +02:00
Eugen Rochko
50b100df00
Change media modals look in web UI
...
Port 1e89e2ed98
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-05-07 22:47:09 +02:00
Eugen Rochko
d30dd5b1db
[Glitch] Change home timeline to reload after follow recommendations in web UI
...
Port 0ad240cb6b
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-05-07 22:00:11 +02:00
Eugen Rochko
5fa4138bd8
[Glitch] Fix "You might be interested in" flashing while searching in web UI
...
Port 0a3fa034fc
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-05-07 22:00:11 +02:00
Eugen Rochko
b571bc3278
[Glitch] Add empty state message for follow recommendations in web UI
...
Port 8d75bd002d
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-05-07 22:00:11 +02:00
Claire
56135a77f9
[Glitch] Hide floating action button on onboarding page
...
Port 2c322addf3
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-05-07 22:00:11 +02:00
Eugen Rochko
2f2c77c747
[Glitch] Change follow recommendations to be limited to 20 instead of 40 in web UI
...
Port 7762d3d275
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-05-07 22:00:11 +02:00
Eugen Rochko
0936ae4132
[Glitch] Fix newlines not being considered sentence separators in account note
...
Port b5ac17c4b6
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-05-07 22:00:11 +02:00
Eugen Rochko
89bc4dff6f
[Glitch] Change onboarding by replacing tutorial with follow recommendations in web UI
...
Port bf903dc510
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-05-07 22:00:11 +02:00
Claire
8615848348
Disable onboarding modal (keep it in “Show me around” from getting started menu)
2021-05-07 22:00:11 +02:00
Claire
50f8ee2e07
Merge pull request #1526 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2021-05-07 19:51:00 +02:00
Eugen Rochko
e08b31a706
[Glitch] Add joined date to profiles in web UI
...
Port 2c77d97e0d
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-05-07 18:39:07 +02:00
fusagiko / takayamaki
dbb942999c
[Glitch] fix component name
...
Port c35a6b9e01
to glitch-soc
Co-authored-by: fusagiko / takayamaki <takayamaki@users.noreply.github.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-05-07 18:34:54 +02:00
Claire
50b430d9a2
Merge branch 'main' into glitch-soc/merge-upstream
...
- `app/views/statuses/_simple_status.html.haml`:
Small markup change in glitch-soc, on a line that has been modified by
upstream. Ported upstream changes.
2021-05-07 18:21:59 +02:00
Claire
a346912030
Add environment variables to control custom emoji size limits
...
Fixes #1524
2021-04-26 11:22:22 +02:00
Claire
a627e59116
Merge pull request #1523 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2021-04-21 20:28:24 +02:00
Claire
536892b8ae
Merge branch 'main' into glitch-soc/merge-upstream
2021-04-21 13:52:03 +02:00
Takeshi Umeda
b1d4f21db0
[Glitch] Fix not to show follow button in global suggestion
...
Port baed52c2a7
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-04-21 13:50:51 +02:00
Takeshi Umeda
72eac238ba
[Glitch] Fix to update suggestion list after dismiss
...
Port 9bb3341849
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-04-21 13:50:51 +02:00
Claire
8fc0b592cb
[Glitch] Add border to 🚲 emoji
...
Port front-end changes from e78d06eecf
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-04-21 13:50:51 +02:00
Eugen Rochko
e6501d5112
[Glitch] Add cold-start follow recommendations
...
Port front-end changes from f7117646af
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-04-21 13:50:51 +02:00
Claire
97da7b7307
Merge pull request #1521 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2021-04-20 18:06:40 +02:00
Claire
4b115d070c
Fix the follow recommendation admin page on glitch-soc
2021-04-20 12:22:50 +02:00
Claire
e2a2bc9021
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `README.md`:
Upstream updated copyright year, we don't mention it so kept our version.
- `app/controllers/admin/dashboard_controller.rb`:
Not really a conflict, upstream change (removing the spam checker) too close
to glitch-soc changes. Ported upstream changes.
- `app/models/form/admin_settings.rb`:
Same.
- `app/services/remove_status_service.rb`:
Same.
- `app/views/admin/settings/edit.html.haml`:
Same.
- `config/settings.yml`:
Same.
- `config/environments/production.rb`:
Not a real conflict, upstream added a default HTTP header, but we have
extra headers in glitch-soc.
Added the header.
2021-04-20 12:17:14 +02:00
Claire
df326b8b5c
Merge pull request #1519 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2021-04-06 11:17:52 +02:00
Claire
5c225b03db
Fix glitch-soc-specific health check spec
2021-04-05 15:21:38 +02:00
Eugen Rochko
2ae8c41e5d
[Glitch] Add system checks to dashboard in admin UI
...
Port SCSS changes from 487e37d6d4
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-04-05 14:34:36 +02:00
Claire
6be0b4b014
[Glitch] Fix crash in old browsers
...
Port abad99fa10
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-04-05 14:33:42 +02:00
Claire
c901ae77d4
Merge branch 'main' into glitch-soc/merge-upstream
2021-04-05 14:31:07 +02:00
Noiob
39b9a0619a
Remove superfluous toot length check
2021-04-05 14:30:43 +02:00
Claire
b7ec2a9002
Merge pull request #1517 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2021-03-31 13:25:15 +02:00
Claire
15efa32cca
Merge branch 'main' into glitch-soc/merge-upstream
2021-03-31 10:34:29 +02:00
Claire
a2a85d5ae0
Merge pull request #1516 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2021-03-25 00:31:15 +01:00
Claire
5ea53b6158
[Glitch] Fix compose form behavior in mobile view
...
Port 034f37b85a
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-03-24 11:21:21 +01:00
dependabot[bot]
b61e44461c
[Glitch] Bump react-select from 3.2.0 to 4.0.2
...
Add cacheKey to NonceProvider for react-select
Port changes from c3aef491d6
to glitch-soc
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-03-24 11:01:57 +01:00
Claire
9541605024
Fix ActiveRecord monkey-patching migration hack
2021-03-24 10:55:02 +01:00
Claire
f60c99a8fb
Merge branch 'main' into glitch-soc/merge-upstream
2021-03-24 10:53:50 +01:00
Claire
d7c1c41859
Merge pull request #1515 from ClearlyClaire/glitch-soc/features/notifications-design
...
Change notification settings UI to be more compact
2021-03-24 10:14:42 +01:00
Claire
2bb573d021
Messing around with box-shadow
...
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-03-19 14:47:57 +01:00
Claire
e71f4d468b
Add more button states?
...
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-03-19 14:47:54 +01:00
Claire
200d7a1708
Change notification settings UI to be more compact
...
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-03-19 14:47:06 +01:00
Claire
c7f04961b6
Merge pull request #1513 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2021-03-19 14:34:08 +01:00
Claire
3b7b607300
Migrate glitch-soc local notification settings to upstream system
2021-03-19 13:57:36 +01:00
Claire
db6551ec09
Add option to opt out of unread notification markers
...
Port 55ac2b9c60
to glitch-soc
2021-03-19 13:57:32 +01:00
Claire
3ad6ef72cb
Merge branch 'main' into glitch-soc/merge-upstream
2021-03-19 13:57:15 +01:00
Claire
ba22398c38
Merge pull request #1512 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2021-03-15 23:46:33 +01:00
Claire
eac4a3e9c8
Merge branch 'main' into glitch-soc/merge-upstream
2021-03-15 11:26:59 +01:00
Claire
995ad2af30
Fix DM timeline failing to load from database
2021-03-12 23:17:34 +01:00
Claire
935e376078
Merge pull request #1510 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2021-03-11 18:04:18 +01:00
Claire
1b6a21e6bc
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `app/validators/status_length_validator.rb`:
Conflict due to glitch-soc's configurable maximum toot chars.
Ported upstream changes.
2021-03-11 16:08:15 +01:00
Claire
318efa49de
Fix various CodeClimate warnings
2021-03-06 14:51:53 +01:00
dependabot[bot]
454d036b74
Bump redcarpet from 3.5.0 to 3.5.1
...
Bumps [redcarpet](https://github.com/vmg/redcarpet ) from 3.5.0 to 3.5.1.
- [Release notes](https://github.com/vmg/redcarpet/releases )
- [Changelog](https://github.com/vmg/redcarpet/blob/master/CHANGELOG.md )
- [Commits](https://github.com/vmg/redcarpet/compare/v3.5.0...v3.5.1 )
Signed-off-by: dependabot[bot] <support@github.com>
2021-03-06 14:51:45 +01:00
Claire
f4abf8e782
Merge pull request #1504 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2021-03-02 16:33:06 +01:00
Claire
7336276252
[Glitch] Update twitter-text from 1.14 to 3.1.0 and fix toot character counting
...
Port 65db262550
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-03-02 12:37:23 +01:00
Claire
7cffe8dca7
[Glitch] Add borders to 📱 and 📲 emojis
...
Port a8139ab016
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-03-02 12:27:29 +01:00
Claire
974ddc28a3
[Glitch] Fix WebUI crashing when SVG support is disabled
...
Port 0635c8760d
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-03-02 12:26:12 +01:00
Claire
d8fdbb054e
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `app/validators/status_length_validator.rb`:
Upstream changes too close to glitch-soc MAX_CHARS changes, but not a real
conflict.
Applied upstream changes.
- `package.json`:
glitch-soc-only dependency textually too close to a dependency updated
upstream, not a real conflict.
Applied upstream changes.
2021-03-02 12:06:58 +01:00
Claire
4aa860b65b
Merge pull request #1501 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2021-02-22 19:36:03 +01:00
abcang
6ae04d990c
[Glitch] Fix default searchTokens
...
Port 2127f40e6b
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-02-22 15:47:17 +01:00
Eugen Rochko
24fb5d7572
[Glitch] Add server rules
...
Port SCSS changes from 8331fdf7e0
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-02-22 15:45:28 +01:00
Claire
679642e26c
Merge branch 'main' into glitch-soc/merge-upstream
2021-02-22 15:23:46 +01:00
Claire
8792128f38
Merge pull request #1500 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2021-02-12 14:02:24 +01:00
Claire
49eef466b8
[Glitch] Add dropdown for boost privacy in boost confirmation modal
...
Port 07b46cb332
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-02-12 12:31:49 +01:00
Claire
9213b02656
Refactor privacy dropdown to have an interface closer to upstream's
2021-02-12 12:04:04 +01:00
kaias1jp
847779b1e4
[Glitch] Fixed WebUI crash when a status opened in the media modal is deleted
...
Port 08ae116dc6
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-02-12 10:58:34 +01:00
Jeong Arm
8f24f7626a
[Glitch] Use custom mascot on static share page
...
Port d499bb031f
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-02-12 10:57:09 +01:00
Mélanie Chauvel
0e7484209c
[Glitch] Slightly reorder three dots menu on toots to make it more intuitive
...
Port f5fefdc11a
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-02-12 10:55:37 +01:00
Eugen Rochko
28f533f370
[Glitch] Change max. image dimensions to 1920x1080px (1080p)
...
Port acf1842896
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-02-12 10:46:00 +01:00
Claire
5e11f3a6e1
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/styles/mastodon/modal.scss`:
For some reason we changed the file loading path in glitch-soc,
but now upstream has completely changed how the logo is loaded.
Applied upstream changes.
2021-02-12 10:28:32 +01:00
Claire
a30a40c437
Fix background color for favourite modal on DMs
2021-02-10 19:27:18 +01:00
Claire
4ed9576cd2
Merge pull request #1496 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2021-02-03 18:57:38 +01:00
ThibG
e1fa06c459
[Glitch] Change custom emoji to be animated when hovering container
...
Port 3efa0c54b6
to glitch-soc
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-02-03 17:16:22 +01:00
Claire
4d40685850
Merge branch 'main' into glitch-soc/merge-upstream
2021-02-03 17:02:48 +01:00
Claire
7632255115
Change default site title to not point to dev.glitch.social
2021-01-27 14:45:45 +01:00
ThibG
52ff3ca675
Merge pull request #1491 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2021-01-26 23:21:32 +01:00
leo60228
ca6c62068e
Support customizing poll option limits
2021-01-26 14:07:31 +01:00
ThibG
00e55445b9
[Glitch] Add “translate” class to other user strings
...
Port 5fcac81302
to glitch-soc
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-01-26 14:05:24 +01:00
Claire
b81710c02c
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `CONTRIBUTING.md`:
Not a real conflict, glitch-soc quotes the upstream file, which has been
changed. Update the quote.
2021-01-26 14:01:30 +01:00
ThibG
d1255ab8a5
Merge pull request #1487 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2021-01-21 17:51:43 +01:00
ThibG
c48e2a48ba
[Glitch] Fix Google Translate breaking web interface
...
Port 7d0031a515
to glitch-soc
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-01-21 16:59:47 +01:00
Claire
f90fa11db5
Merge branch 'main' into glitch-soc/merge-upstream
2021-01-21 16:51:12 +01:00
ThibG
73d5b05019
Merge pull request #1484 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2021-01-18 14:37:57 +01:00
Claire
e202314a75
Merge branch 'master' into glitch-soc/merge-upstream
2021-01-18 13:57:12 +01:00
ThibG
a7a47834e5
Merge pull request #1483 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2021-01-11 13:44:57 +01:00
ThibG
31e68bf3d3
[Glitch] Fix OCR lang data failing to load
...
Port 73ddb60c32
to glitch-soc
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-01-11 12:00:26 +01:00
Claire
33d30632fb
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/public_feed.rb`:
Upstream refactored a bit, glitch-soc had specific code for local-only
statuses.
Updated glitch-soc's specific code accordingly.
2021-01-11 11:55:42 +01:00
ThibG
d42e7e01dc
Merge pull request #1482 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2021-01-06 22:03:23 +01:00
Takeshi Umeda
55e84f9125
[Glitch] Fix logo button style more
...
Port 3f4b0dfd47
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-01-06 19:03:52 +01:00
Takeshi Umeda
7710a6c4b1
[Glitch] Fix logo button style
...
Port ba748a83f2
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-01-06 19:03:21 +01:00
Takeshi Umeda
f3aa085af5
[Glitch] Fix getting-started footer in single column mode not being clickable in Safari
...
Port e38874dcf7
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-01-06 18:38:10 +01:00
Takeshi Umeda
98fd0cca55
[Glitch] Fix defaultProps of frameRate to string
...
Port a50fe47a77
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-01-06 18:32:37 +01:00
Takeshi Umeda
f17ff99257
[Glitch] Fix missing key in list timeline policy
...
Port 71f0968887
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-01-06 18:23:44 +01:00
Claire
90528f43bc
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- `config/webpack/configuration.js`:
Upstream updated the `js-yaml` dependency, which changed how to call it.
Those changes conflicted because that code is pretty different in glitch-soc
which has to deal with its more complex theming system.
Proceeded to the same compatibility changes in glitch-soc's code.
- `package.json` and `yarn.lock`:
Not really a conflict, just glitch-soc-specific dependencies textually too
close to some dependencies updated upstream.
2021-01-06 18:08:06 +01:00
ThibG
225c934a1b
Merge pull request #1481 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2020-12-23 14:33:47 +01:00
Claire
537afa00f3
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- `app/lib/feed_manager.rb`:
Not a real conflict, glitch-soc-only DM-related method
too close to changed upstream stuff.
Ported upstream changes.
- `app/services/batched_remove_status_service.rb`:
Additional logic in glitch-soc to clear DMs from timelines.
Ported upstream changes and fixed the DM TL clearing logic.
- `app/workers/scheduler/feed_cleanup_scheduler.rb`:
Additional code in glitch-soc to clear DM timelines.
Ported upstream changes.
2020-12-23 01:47:45 +01:00
ThibG
81f4c550b2
Merge pull request #1480 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2020-12-21 22:11:27 +01:00
Claire
38bfaf8855
Merge branch 'master' into glitch-soc/merge-upstream
2020-12-21 18:28:23 +01:00
ThibG
61d5744dcc
Merge pull request #1478 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2020-12-19 15:31:39 +01:00
Claire
ec3e2b8f72
Merge branch 'master' into glitch-soc/merge-upstream
2020-12-19 14:52:09 +01:00
ThibG
79c57810b7
Merge pull request #1477 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2020-12-19 02:17:02 +01:00
ThibG
5c966bef8b
[Glitch] Fix styling issue on /about when server admin has a long username
...
Port 47c6c54d31
to glitch-soc
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2020-12-19 01:03:38 +01:00
ThibG
e0a253fb22
[Glitch] Change notification permission handling
...
Port 79efcf8aad
to glitch-soc
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2020-12-19 01:02:32 +01:00
Claire
f9d000ebae
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- `app/services/resolve_url_service.rb`:
The private toot search by URL hack has been revamped upstream.
Took upstream's version.
2020-12-19 00:55:12 +01:00
ThibG
92cfcf168c
Merge pull request #1476 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2020-12-15 18:19:20 +01:00
Eugen Rochko
b0722fbc14
[Glitch] Change RTL detection to rely on unicode-bidi paragraph by paragraph
...
Port 1f564051b6
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2020-12-15 16:42:39 +01:00
ThibG
6205107229
[Glitch] Add ability to require invite request text
...
Port CSS changes from 47e507fa61
to glitch-soc
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2020-12-15 16:22:36 +01:00
Eugen Rochko
5ca7bc2bed
[Glitch] Change "Profile unavailable" string to "Account suspended" in web UI
...
Port 4fd3062003
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2020-12-15 16:19:28 +01:00
Claire
e4f8679eae
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/form/admin_settings.rb`:
New setting added upstream. Ported it.
- `app/views/statuses/_simple_status.html.haml`:
Upstream removed RTL classes. Did the same.
- `config/settings.yml`:
New setting added upstream. Ported it.
2020-12-15 14:27:06 +01:00
Claire
1978f7265e
Fix processing of Delete activities on direct messages
2020-12-14 23:05:32 +01:00
Claire
4acb5c90a2
Use “public.js” pack for auth pages for form validation helpers
2020-12-10 13:01:51 +01:00
ThibG
cbe9b0640b
Merge pull request #1473 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2020-12-10 10:25:52 +01:00
ThibG
9a5825f864
[Glitch] Add honeypot fields and minimum fill-out time for sign-up form
...
Port 49eb4d4ddf
to glitch-soc
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2020-12-10 09:44:16 +01:00
ThibG
237025b5ef
[Glitch] Fix notifications being unnecessarily redrawn on state change
...
Port 9669167aae
to glitch-soc
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2020-12-10 09:42:32 +01:00
Claire
7782e4dc0d
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- `app/controllers/about_controller.rb`:
Minor conflict caused by glitch-soc's theming system.
Ported upstream changes.
2020-12-10 09:41:49 +01:00
ThibG
b27d11dd33
Merge pull request #1472 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2020-12-09 19:06:13 +01:00
ThibG
7d0e45a3be
[Glitch] Fix column swiping animation logic
...
Port 0b437325dc
to glitch-soc
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2020-12-09 15:12:28 +01:00
Eugen Rochko
e18f9f8228
[Glitch] Fix unnecessary re-rendering of various components when typing in web UI
...
Partially port 9620ee90be
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2020-12-09 15:11:38 +01:00
trwnh
3449ffa133
[Glitch] rename replies_policy enumerables
...
Port front-end changes from 127c543a6e
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2020-12-09 14:58:09 +01:00
Eugen Rochko
b5134595d8
[Glitch] Fix alert when failing to save timeline markers in web UI
...
Port 59d943e152
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2020-12-09 14:57:17 +01:00
Claire
a16175645d
Merge branch 'master' into glitch-soc/merge-upstream
2020-12-09 14:42:33 +01:00
ThibG
25f725d67a
Merge pull request #1470 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2020-12-05 22:03:28 +01:00
Mélanie Chauvel
40e2de3904
[Glitch] Fix character count not ignoring hidden CW field
...
Port 68775b6039
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2020-12-05 21:15:18 +01:00
Claire
f8d867bac4
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- `app/services/remove_status_service.rb`:
Conflict caused by us having a distinc Direct timeline.
Ported upstream changes.
- `app/javascript/mastodon/features/compose/components/compose_form.js`:
Conflict between glitch-soc's variable character limit and upstream
refactoring that part of the code.
Ported upstream changes.
2020-12-05 17:33:37 +01:00
Starfall
13df125b6c
Add favourite modal to light theme CSS
2020-12-05 13:23:39 +01:00
ThibG
29812c2e59
Merge pull request #1468 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2020-11-25 19:01:15 +01:00
abcang
b9fc807115
[Glitch] Fixed ESLint error
...
Port a2da02626e
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-11-25 15:56:43 +01:00
Eugen Rochko
3d970faeb1
[Glitch] Remove fade-in animation from modals in web UI
...
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-11-25 15:50:22 +01:00
Thibaut Girka
4dab236690
Default to 25 fps for frame seeking if framerate information isn't known
2020-11-25 15:47:23 +01:00
Eugen Rochko
51d0e1c7b4
[Glitch] Fix hardcoded frame rate for frame by frame video navigation in web UI
...
Port f970e1fab6
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-11-25 15:46:09 +01:00
Thibaut Girka
e71b16ae2b
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- `Gemfile.lock`:
glitch-soc-only dependency textually too close to updated upstream
dependencies. Updated to upsteam dependencies.
2020-11-25 15:31:45 +01:00
ThibG
24696458bf
Merge pull request #1467 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2020-11-20 15:11:43 +01:00
Thibaut Girka
3281c9b4c0
Fix video not taking focus on interaction
...
Revert part of #737 to restore hotkey functionality
2020-11-20 14:20:17 +01:00
ThibG
15be0bde8a
[Glitch] Fix image uploads being random data when canvas read access is blocked
...
Port d8d43a427a
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-11-20 13:41:07 +01:00
Eugen Rochko
b82aa33dea
[Glitch] Add hotkeys for audio/video control
...
Port 04a079e723
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-11-20 13:40:05 +01:00
Thibaut Girka
48f0f3ffee
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/ISSUE_TEMPLATE/bug_report.md`:
Upstream added the `bug` label to bug reports.
Did the same.
- `app/services/fan_out_on_write_service.rb`:
Upstream put DMs back into timelines, glitch-soc was already doing it.
Ignored upstream changes.
2020-11-20 13:27:48 +01:00
ThibG
db01f8b942
Merge pull request #1465 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2020-11-14 00:50:43 +01:00
Thibaut Girka
de5cc20dd8
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- `app/controllers/concerns/sign_in_token_authentication_concern.rb`:
Conflict caused because of glitch-soc's theming system.
Took upstream's new code and applied the theming system changes on top
of it.
- `app/controllers/concerns/two_factor_authentication_concern.rb`:
Conflict caused because of glitch-soc's theming system.
Took upstream's new code and applied the theming system changes on top
of it.
2020-11-14 00:30:36 +01:00
Thibaut Girka
8ffae82fa6
Fix minor design issues with fav confirmation modal
2020-11-13 01:14:52 +01:00
Thibaut Girka
339f78fb63
Fix media not being marked sensitive when outgoing CW is set
...
Fixes #1461
Fixes a regression from a recent merge
2020-11-13 01:05:55 +01:00
Thibaut Girka
265b26489a
Fix “Show boosts/replies in public timelines” only affecting streaming
...
Fixes #1456
2020-11-12 23:44:53 +01:00
Thibaut Girka
6c05db70fa
Add tests
2020-11-12 23:44:30 +01:00
Thibaut Girka
10bd6f415d
Improve searching for private toots from URL
...
Most of the time, when sharing toots, people use the toot URL rather than
the toot URI, which makes sense since it is the user-facing URL.
In Mastodon's case, the URL and URI are different, and Mastodon does not
have an index on URL, which means searching a private toot by URL is done
with a slow query that will only succeed for very recent toots.
This change gets rid of the slow query, and attempts to guess the URI from
URL instead, as Mastodon's are predictable.
2020-11-12 23:44:30 +01:00
ThibG
3b6e27978d
Merge pull request #1457 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2020-11-12 22:57:57 +01:00
Thibaut Girka
3f09d4ca03
Add missing locales to glitch flavor
2020-11-12 22:27:44 +01:00
Takeshi Umeda
412fe2ebb0
[Glitch] Add interrelationship icon
...
Port SCSS changes from 148ce97e21
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-11-12 22:24:24 +01:00
Eugen Rochko
0aeb833317
[Glitch] Add button to dismiss desktop notifications permissions banner
...
Port 4790a126be
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-11-12 22:23:06 +01:00
Thibaut Girka
c077cdaba7
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- `app/controllers/relationships_controller.rb`:
Upstream changed a line too close to a glitch-soc only line related to
glitch-soc's theming system.
Applied upstream changes accordingly.
2020-11-12 22:13:57 +01:00
ThibG
67125534bc
Merge pull request #1454 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2020-11-09 11:30:28 +01:00
Thibaut Girka
ecd83f495c
Merge branch 'master' into glitch-soc/merge-upstream
2020-11-09 10:53:53 +01:00
Thibaut Girka
0437d70628
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- `app/controllers/follower_accounts_controller.rb`:
Conflict due to upstream changing suspension logic while
glitch-soc has an extra option to hide followers count.
Ported upstream changes.
2020-11-08 14:20:35 +01:00
ThibG
cfb16b9b70
Merge pull request #1453 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2020-11-07 21:47:31 +01:00
Mashiro
e4d62042bd
[Glitch] Add limitation of image's max zoom rate (max to the original size of image)
...
Port f720af6b72
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-11-07 18:33:16 +01:00
dependabot[bot]
91c2f14fd2
[Glitch] Bump detect-passive-events from 1.0.5 to 2.0.1
...
Port e16b0fb15a
to glitch-soc
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-11-07 18:32:09 +01:00
Thibaut Girka
412218af2e
Merge branch 'master' into glitch-soc/merge-upstream
2020-11-07 18:23:02 +01:00
Thibaut Girka
5a9fc749c3
Fix unsightly re-layout delay for media previews
2020-11-04 18:53:52 +01:00
Thibaut Girka
a48dbc78f8
Fix hiding video breaking playback
...
Also make the video player code closer to upstream
2020-11-04 18:53:39 +01:00
ThibG
1f69ad798d
Merge pull request #1450 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2020-11-04 14:52:19 +01:00
Mashiro
dc86d814d9
[Glitch] add mouse scroll lock in image expand view
...
Port f645dad661
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-11-04 12:24:40 +01:00
Mashiro
40af1cf65b
[Glitch] Add expand/compress image button on image view box
...
Port 6a2db10f76
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-11-04 12:24:40 +01:00
mayaeh
f5df3d1ae2
[Glitch] Fix width of content text fluctuating over time
...
Port 2ae751f19d
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-11-04 12:24:40 +01:00
Mélanie Chauvel
078744f210
[Glitch] Make visibility icon clickable as part of the time of a toot
...
Port 1d07f51039
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-11-04 12:24:40 +01:00
Mélanie Chauvel
578e757d09
[Glitch] Make click area of video/audio player buttons bigger in WebUI
...
Port a5afbb62d2
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-11-03 17:42:40 +01:00
ThibG
adfaf9551c
[Glitch] Fix some account media gallery items having empty labels
...
Port 9d023ed4f6
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-11-03 17:38:50 +01:00
fuyu
37dfb9dddc
[Glitch] Fix wrong seek bar width on media player
...
Port 8d7fbe7dd9
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-11-03 17:37:53 +01:00
Mélanie Chauvel
3b96141633
[Glitch] Make “Mark media as sensitive” properly translatable
...
Port c5704e75ae
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-11-03 17:36:54 +01:00
Thibaut Girka
cd675fbe18
Merge branch 'master' into glitch-soc/merge-upstream
2020-11-03 17:28:54 +01:00
Thibaut Girka
b8e790c3c2
Fix crash when viewing a profile with a filtered out pinned toot
2020-11-01 16:53:03 +01:00
Thibaut Girka
5a41704f89
Fix IP blocks in admin panel
...
It was broken due to discrepancies between upstream and glitch-soc's
theming system.
2020-10-28 23:55:41 +01:00
Thibaut Girka
a81bb14abe
Add option to hide notification markers
2020-10-27 11:20:11 +01:00
ThibG
c762ca49dc
Merge pull request #1443 from ThibG/glitch-soc/features/upstream-pop-in
...
Port upstream's pop-in player to glitch-soc
2020-10-26 22:54:50 +01:00
Thibaut Girka
49ee69f75f
Add local setting for pop-in player position
2020-10-26 20:51:28 +01:00
Thibaut Girka
ea5298ab9b
Add setting to disable the pop-in player
2020-10-26 20:31:54 +01:00
Thibaut Girka
5ee2b860f9
Respect glitch-soc's reply counter setting in the pop-in player
2020-10-26 20:31:54 +01:00
Eugen Rochko
47edac871c
[Glitch] Fix regressions in icon buttons in web UI
...
Port a549415868
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-10-26 19:51:09 +01:00
Eugen Rochko
8f950e540b
[Glitch] Add pop-out player for audio/video in web UI
...
port d88a79b456
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-10-26 19:51:09 +01:00
ThibG
9c88792f0a
Merge pull request #1442 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2020-10-26 16:11:58 +01:00
ThibG
ddbb9f0ec4
[Glitch] Fix follow request notifications
...
Port 3678b10823
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-10-26 15:50:48 +01:00
Thibaut Girka
9c34090db8
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- `app/services/process_mentions_service.rb`:
glitch-soc local-only handling, ported upstream changes
2020-10-26 15:48:16 +01:00
ThibG
36e5c9d45b
Merge pull request #1441 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2020-10-22 22:38:11 +02:00
mayaeh
5c60f7eaed
[Glitch] Fix strings that could not be translated
...
Port fb5f3be18f
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-10-21 21:49:46 +02:00
Eugen Rochko
4ae4b03974
[Glitch] Change how missing desktop notifications permission is displayed
...
Port a69ca29473
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-10-21 21:49:46 +02:00
Thibaut Girka
dca05c79a9
Move columns-related CSS rules into the appropriate files
2020-10-21 21:28:47 +02:00
ThibG
b5927301cf
[Glitch] Fix browser notification permission request logic
...
Port f54ca3d08e
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-10-21 21:28:47 +02:00
Thibaut Girka
2eb054c07f
Remove glitch-soc specific and obsolete /api/v1/mutes/details
2020-10-21 21:28:47 +02:00
OSAMU SATO
78ad04420c
[Glitch] Add duration parameter to muting.
...
Port 96761752ec
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-10-21 21:28:47 +02:00
ThibG
813c84cd6c
[Glitch] Change how CDN_HOST is passed down to make assets build reproducible
...
Port 4c45b43cb8
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-10-21 21:28:47 +02:00
ThibG
842c048c6b
[Glitch] Fix unread notification marker not updating when mounting column
...
Port dac3e362fd
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-10-21 19:36:41 +02:00
ThibG
f7306c7b7c
[Glitch] Ignore alt-key hotkeys in text fields
...
Port 63770d3aac
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-10-21 19:34:44 +02:00
Takeshi Umeda
8071613dd7
[Glitch] Fix mark as read in notifications to be saved immediately
...
Port bec8b12bb5
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-10-21 19:33:20 +02:00
ThibG
c3d82027cf
[Glitch] Fix bell button causing a brief “Cancel follow request” on locked accounts
...
Port 82951920f7
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-10-21 19:24:32 +02:00
Thibaut Girka
ec49aa8175
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/dependabot.yml`:
Updated upstream, we deleted it to not be flooded by Depandabot.
Kept deleted.
- `Gemfile.lock`:
Puma updated on both sides, went for the most recent version.
- `app/controllers/api/v1/mutes_controller.rb`:
Upstream updated the serializer to support timed mutes, while
glitch-soc added a custom API ages ago to get information that
is already available elsewhere.
Dropped the glitch-soc-specific API, went with upstream changes.
- `app/javascript/core/admin.js`:
Conflict due to changing how assets are loaded. Went with upstream.
- `app/javascript/packs/public.js`:
Conflict due to changing how assets are loaded. Went with upstream.
- `app/models/mute.rb`:
🤷
- `app/models/user.rb`:
New user setting added upstream while we have glitch-soc-specific
user settings. Added upstream's user setting.
- `config/settings.yml`:
Upstream added a new user setting close to a user setting we had
changed the defaults for. Added the new upstream setting.
- `package.json`:
Upstream dependency updated “too close” to a glitch-soc-specific
dependency. No real conflict. Updated the dependency.
2020-10-21 19:10:50 +02:00
otrapersona
29870d2be6
Glitchsoc translation to 'es' language ( #1439 )
...
glitch-soc-specific translation to 'es' language
2020-10-19 22:17:29 +02:00
Thibaut Girka
311f457430
Fix crash when autolinking an invalid URI in Markdown
2020-10-13 14:35:07 +02:00
Thibaut Girka
cd861c051c
Fix issue checking for last unread notification when there are gaps
2020-10-08 22:44:30 +02:00
Thibaut Girka
b5edf30160
Fix boost icon not being displayed in boost notifications
2020-09-29 11:05:05 +02:00
ThibG
62e3f588de
Merge pull request #1430 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2020-09-29 10:29:42 +02:00
Thibaut Girka
ccfc2b6dce
Make explicit in glitch-soc's WebUI when an account is suspended
2020-09-28 18:00:49 +02:00
Thibaut Girka
e3f822ac1b
Do not filter out temporarily-suspended accounts from relationships API
2020-09-28 17:56:16 +02:00
Thibaut Girka
1ce3acac27
Bump puma to 5.0.1
...
Fixes LoadError on some OSes/architectures
2020-09-28 17:56:16 +02:00
Thibaut Girka
785852eb15
Fix glitch-soc specific test
2020-09-28 17:56:16 +02:00
Eugen Rochko
dadec533ce
[Glitch] Fix unreadable placeholder text color in high contrast theme in web UI ( #14803 )
...
Port bbcbf12215
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-09-28 17:56:16 +02:00
Thibaut Girka
6dde075425
Fix actions being performed before the redux state is set up
2020-09-28 17:49:55 +02:00
ThibG
f8205b7b4a
[Glitch] Add paragraph about browser add-ons when encountering some errors
...
Port b67caf9be4
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-09-28 17:49:55 +02:00
Eugen Rochko
14869ee656
[Glitch] Add option to be notified when a followed user posts
...
Port 974b1b79ce
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-09-28 17:49:55 +02:00
Eugen Rochko
0a069bffd9
[Glitch] Optimize the process of following someone
...
Port front-end changes from 6d59dfa15d
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-09-28 17:49:55 +02:00
Eugen Rochko
6775de3fc9
[Glitch] Change web UI to show empty profile for suspended accounts
...
Port fcb9350ff8
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-09-28 17:49:55 +02:00
ThibG
572d1a1bf8
[Glitch] Fix home TL marker code mishandling gaps
...
Port eaea2311aa
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-09-28 15:00:19 +02:00
ThibG
4586202448
[Glitch] Fix notification filter bar incorrectly filtering gaps
...
Port aab867b0e8
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-09-28 14:59:10 +02:00
ThibG
d31792a2a6
[Glitch] Add border around 🕺 emoji
...
Port 91eecd1b3c
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-09-28 14:58:25 +02:00
Thibaut Girka
a7aedebc31
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- `Gemfile.lock`:
Not a real conflict, upstream updated dependencies that were too close to
glitch-soc-only ones in the file.
- `app/controllers/oauth/authorized_applications_controller.rb`:
Upstream changed the logic surrounding suspended accounts.
Minor conflict due to glitch-soc's theming system.
Ported upstream changes.
- `app/controllers/settings/base_controller.rb`:
Upstream refactored and changed the logic surrounding suspended accounts.
Minor conflict due to glitch-soc's theming system.
Ported upstream changes.
- `app/controllers/settings/sessions_controller.rb`:
Upstream refactored and changed the logic surrounding suspended accounts.
Minor conflict due to glitch-soc's theming system.
Ported upstream changes.
- `app/models/user.rb`:
Upstream refactored and changed the logic surrounding suspended accounts.
Minor conflict due to glitch-soc not preventing moved accounts from logging
in.
Ported upstream changes while keeping the ability for moved accounts to log
in.
- `app/policies/status_policy.rb`:
Upstream refactored and changed the logic surrounding suspended accounts.
Minor conflict due to glitch-soc's local-only toots.
Ported upstream changes.
- `app/serializers/rest/account_serializer.rb`:
Upstream refactored and changed the logic surrounding suspended accounts.
Minor conflict due to glitch-soc's ability to hide followers count.
Ported upstream changes.
- `app/services/process_mentions_service.rb`:
Upstream refactored and changed the logic surrounding suspended accounts.
Minor conflict due to glitch-soc's local-only toots.
Ported upstream changes.
- `package.json`:
Not a real conflict, upstream updated dependencies that were too close to
glitch-soc-only ones in the file.
2020-09-28 14:13:30 +02:00
Thibaut Girka
787d5d7289
Fix minor bugs
2020-09-19 15:01:46 +02:00
Thibaut Girka
312c936d51
Minor refactoring and fixups
2020-09-19 14:15:28 +02:00
Thibaut Girka
85b9086e6b
Filter out mounted lists from “getting started” column
2020-09-18 20:07:25 +02:00
Thibaut Girka
a681980307
Submit timeline markers closer to the moment they change
2020-09-17 15:22:56 +02:00
Thibaut Girka
60eebc6cc4
Fix crashes when connection drops
2020-09-17 15:22:56 +02:00
Thibaut Girka
f1c0cf9806
Add button to manually mark all notifications as read
2020-09-17 15:22:56 +02:00
Thibaut Girka
94c290d7d2
Only update read marker when giving focus/mounting column
2020-09-17 15:22:56 +02:00
Thibaut Girka
145ed37978
Refactor and change logic to only update marker if we reached the last
...
read notification.
2020-09-17 15:22:56 +02:00
Thibaut Girka
66e9a77e36
Display unread marker for notifications
2020-09-17 15:22:56 +02:00
Thibaut Girka
ae698469d0
Clean up leftover from DM conversation view redesign
2020-09-17 15:22:56 +02:00
kedama
afa753a890
[Glitch] Set z-index of dropdown to 9999.
...
Port 678f5ed296
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-09-10 17:44:38 +02:00
ThibG
6e83020950
Merge pull request #1419 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2020-09-08 17:20:00 +02:00
Thibaut Girka
9748f074a3
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/controllers/api/v1/timelines/public_controller.rb
- app/lib/feed_manager.rb
- app/models/status.rb
- app/services/precompute_feed_service.rb
- app/workers/feed_insert_worker.rb
- spec/models/status_spec.rb
All conflicts are due to upstream refactoring feed management and us having
local-only toots on top of that. Rewrote local-only toots management for
upstream's changes.
2020-09-08 16:26:47 +02:00
ThibG
437d71bddf
Merge pull request #1418 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2020-09-07 14:16:54 +02:00
Thibaut Girka
e5f934ddf0
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- `app/controllers/activitypub/collections_controller.rb`:
Conflict caused because we have additional code to make sure pinned
local-only toots don't get rendered on the ActivityPub endpoints.
Ported upstream changes.
2020-09-07 09:21:38 +02:00
ThibG
d967251fdc
Merge pull request #1417 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2020-09-01 17:36:30 +02:00
ThibG
787a629b8f
[Glitch] Update Tesseract.js
...
Port 5fc5a9f9f1
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-09-01 17:10:20 +02:00
ThibG
a2d66a90e6
[Glitch] Add border around 🐞 emoji
...
Port JS change from f0b6ddd979
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-09-01 17:08:09 +02:00
Thibaut Girka
3fefb7909b
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- `config/webpack/shared.js`:
Upstream has changed how Tesseract.js gets included and dropped a dependency.
The conflict is caused by glitch-soc having different code due to its
theming system.
Ported upstream changes.
- `lib/mastodon/version.rb`:
Upstream refactor/code style change in a place we replaced upstream's
repo URL with ours.
Ported upstram changes, keeping our repo URL.
- `yarn.lock`:
Upstream dropped dependencies, one of which was textually too close to
a glitch-soc-specific dependency. Not a real conflict.
2020-09-01 17:02:18 +02:00
Thibaut Girka
d95dd3883e
Change radio button design to be consistent with that of the directory explorer
...
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-09-01 14:09:35 +02:00
Thibaut Girka
70e64206be
Capitalize replies_policy strings
...
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-09-01 14:09:35 +02:00
Thibaut Girka
e02f375d22
Fix threaded mode
...
Fixes #1414
2020-09-01 09:37:17 +02:00
Thibaut Girka
38182fceb3
Fix crash when opening detailed view of a status you boosted
2020-08-31 23:48:16 +02:00
ThibG
f715e8b516
Merge pull request #1411 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2020-08-30 18:34:51 +02:00
Thibaut Girka
a68ec50e4e
Adapt 2FA changes to glitch-soc's theming system
2020-08-30 17:26:18 +02:00
santiagorodriguez96
a340e653df
[Glitch] Add WebAuthn as an alternative 2FA method
...
Port CSS changes from e8d41bc2fe
Co-authored-by: Facundo Padula <facundo.padula@cedarcode.com>
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-08-30 17:21:16 +02:00
Tdxdxoz
bf55b5463a
[Glitch] Fix: also use custom private boost icon for detailed status
...
Port a3ec9af9b0
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-08-30 16:51:16 +02:00
Daigo 3 Dango
72b1d5fdc5
[Glitch] Better manage subscriptionCounters
...
Port 9669557be1
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-08-30 16:35:33 +02:00
proxy
3bbf6b1519
[Glitch] reword "boost to original audience" as per tootsuite#14596
...
Port 46210a65d1
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-08-30 16:34:38 +02:00
Takeshi Umeda
cd806663af
[Glitch] Fix click range discrepancies in gifv
...
Port debf6ae316
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-08-30 16:31:41 +02:00
ThibG
45d1f34a30
[Glitch] Fix scrolling issues when closing some dropdown menus
...
Port c7cfd4e67a
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-08-30 16:31:02 +02:00
Thibaut Girka
8c3c27bf06
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- `app/controllers/accounts_controller.rb`:
Upstream change too close to a glitch-soc change related to
instance-local toots. Merged upstream changes.
- `app/services/fan_out_on_write_service.rb`:
Minor conflict due to glitch-soc's handling of Direct Messages,
merged upstream changes.
- `yarn.lock`:
Not really a conflict, caused by glitch-soc-only dependencies
being textually too close to updated upstream dependencies.
Merged upstream changes.
2020-08-30 16:13:08 +02:00
Thibaut Girka
30632adf9e
Fix replying to some remote toots switching to local-only
2020-08-29 19:57:32 +02:00
Thibaut Girka
f1d31cf18d
Fix spacing around reblog counter in detailed statuses
...
And bring the whole thing closer to upstream's code.
2020-08-24 20:03:37 +02:00
ThibG
83cd512777
Merge pull request #1408 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2020-08-19 19:36:58 +02:00
Thibaut Girka
74a9affdcc
Merge branch 'master' into glitch-soc/merge-upstream
2020-08-19 19:16:41 +02:00
Thibaut Girka
5dcc406abe
Change styling to always have scrollbar on search results
2020-08-17 15:46:18 +02:00
Thibaut Girka
d4b65193c7
Fix WebUI crash in edge case when media display size causes scroll
...
Fixes #1406
2020-08-17 15:46:18 +02:00
Thibaut Girka
e5dbdebc31
Fix styling of display names and account handles, make it closer to upstream
2020-08-13 23:32:29 +02:00
ThibG
6fece522f9
Merge pull request #1404 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2020-08-13 23:10:19 +02:00
ThibG
0f71372d63
[Glitch] Add client-side validation in password change forms
...
Port 7dc4c74265
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-08-13 22:26:22 +02:00
ThibG
b6c0f1fdc6
[Glitch] Add HTML form validation for the registration form
...
Port d70c3ab4c3
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-08-13 22:25:33 +02:00
Thibaut Girka
da62e350e0
Merge branch 'master' into glitch-soc/merge-upstream
2020-08-13 22:17:29 +02:00
Thibaut Girka
660188c900
Fix local-only flag not necessarily being preserved on delete & redraft
2020-08-12 00:02:44 +02:00
Thibaut Girka
7c20530fb7
Fix embedded player
...
(broken because I forgot to adapt it to glitch-soc's theming system)
2020-08-12 00:00:42 +02:00
Thibaut Girka
0376b6b92b
Fix new audio player when under content warnings
2020-08-11 22:37:51 +02:00
ThibG
59c44ce323
Merge pull request #1398 from ThibG/glitch-soc/master
...
Merge upstream changes
2020-08-11 20:15:03 +02:00
Eugen Rochko
8ae52dc792
[Glitch] Add support for managing multiple stream subscriptions in a single connection
...
Ported ef057584fd
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-08-11 19:40:35 +02:00
Thibaut Girka
78fa15d08f
Merge branch 'master' into glitch-soc/master
...
Conflicts:
- `streaming/index.js`:
Upstream entirely refactored it.
Ported our changes to upstream's refactor. Hopefuly.
2020-08-11 19:19:27 +02:00
ThibG
03712799e2
Merge pull request #1397 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2020-08-08 19:41:24 +02:00
Thibaut Girka
5d5b9e2f62
Merge branch 'master' into glitch-soc/merge-upstream
2020-08-08 19:10:40 +02:00
Thibaut Girka
a3806ec6ba
[Glitch] Fallback to previous, more approximative hashtag RE on older browsers
...
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-08-05 13:43:32 +02:00
Fire Demon
13501f7393
Add tests for direct message assertions
2020-08-04 19:43:19 +02:00
Fire Demon
3d5b3e357c
Add support for direct message assertions
2020-08-04 19:43:19 +02:00
ThibG
b988bc7564
Merge pull request #1393 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2020-08-02 22:46:25 +02:00
ThibG
8f0e6122a9
[Glitch] Fix audio player on Safari
...
Port 635b6a0f1a
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-08-02 22:30:51 +02:00
Thibaut Girka
b578d70957
Merge branch 'master' into glitch-soc/merge-upstream
2020-08-02 22:29:17 +02:00
ThibG
141ac8db8b
Merge pull request #1392 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2020-08-02 16:05:01 +02:00
ThibG
de7ba22c45
[Glitch] Fix new audio player features not working on Safari
...
Port 51b5bb5301
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-08-02 14:35:40 +02:00
ThibG
8f3295f212
[Glitch] Fix wrong proptypes for onEditAccountNote
...
Port 5faf2de938
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-08-02 14:34:56 +02:00
kedama
1d8e930445
[Glitch] Fix the hashtag judgment of the compose form to be the same as the server side
...
Port cd94854e7d
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-08-02 14:33:22 +02:00
Thibaut Girka
23cd5f2c15
Merge branch 'master' into glitch-soc/merge-upstream
2020-08-02 14:30:28 +02:00
ThibG
b12117c4a3
Merge pull request #1391 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2020-08-01 21:42:58 +02:00
Thibaut Girka
2cfa142961
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- `yarn.lock`:
No real conflict, just a glitch-soc-only dependency textually too close to
one updated upstream. Ported upstream changes.
2020-08-01 20:24:23 +02:00
Thibaut Girka
ab967cf5a0
Fix local-only toots not being returned by the local TL API
...
Fixes #1389
2020-07-25 13:25:58 +02:00
ThibG
913141c678
Merge pull request #1388 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2020-07-24 12:32:33 +02:00
Thibaut Girka
5e93c7359d
Fix custom boost icon colors being swapped
2020-07-24 11:58:09 +02:00
ThibG
b136e621ea
[Glitch] Add custom icon for private boosts
...
Port 956473142c
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-07-24 11:29:20 +02:00
Thibaut Girka
4d950c71e9
Merge branch 'master' into glitch-soc/master
2020-07-24 11:26:40 +02:00
ThibG
16416e940f
Merge pull request #1387 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2020-07-22 23:21:11 +02:00
ThibG
59e0eb1ba0
[Glitch] Change disabled retweet icon
...
Port e93efc0309
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-07-22 22:57:57 +02:00
Thibaut Girka
c03d1a9ac8
Merge branch 'master' into glitch-soc/merge-upstream
2020-07-22 22:53:46 +02:00
Thibaut Girka
855ada7e93
Fix “Show less for all”/”Show more for all” eye icon not reflecting state
2020-07-22 22:53:10 +02:00
ThibG
4024952b58
Merge pull request #1385 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2020-07-22 15:39:36 +02:00
ThibG
f8e315cd74
[Glitch] Fix keyboard navigation in scrollable lists
...
Port 98f6380dee
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-07-22 13:51:44 +02:00
Sasha Sorokin
4412e2579c
[Glitch] Fix following_counter plural to include "one"
...
Port 17b1d71536
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-07-22 13:50:58 +02:00
ThibG
9bdad8f14e
[Glitch] Fix audio player controls color in mastodon-light theme
...
Port 85bc0f9639
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-07-22 13:50:15 +02:00
Thibaut Girka
b9f351d845
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/mastodon/actions/compose.js`:
Not a “real” conflict, but change too close to a change we made to
fix the vanilla WebUI locally pushing authored local-only toots in the
public TL view.
2020-07-22 13:38:17 +02:00
ThibG
801e546ecc
Merge pull request #1383 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2020-07-16 15:01:13 +02:00
ThibG
f94cb94767
[Glitch] Fix error when closing a playing audio or video modal
...
Port bfed7dd5f3
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-07-16 14:44:53 +02:00
Thibaut Girka
1c6c40d17c
Merge branch 'master' into glitch-soc/merge-upstream
2020-07-16 14:43:50 +02:00
ThibG
37c092e9fd
Merge pull request #1382 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2020-07-15 16:56:33 +02:00
Thibaut Girka
470458da13
Fix style of visibility icon in boost modal
2020-07-15 16:04:56 +02:00
han@highemelry
610f71db7a
[Glitch] Add a visibility icon to boost modal
...
Port 8b35ed96c0
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-07-15 15:50:09 +02:00
Eugen Rochko
dad3132046
[Glitch] Fix audio and video items in account gallery in web UI
...
Port 6cc5b822f5
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-07-15 15:48:24 +02:00
Thibaut Girka
3f60b096b5
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- `config/routes.rb`:
Upstream disabled E2EE routes, which we did earlier, but slightly
differently. Took upstream's version.
2020-07-15 15:32:40 +02:00
ThibG
7a23347db5
Merge pull request #1381 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2020-07-10 20:02:28 +02:00
ThibG
3fbcc4871f
[Glitch] Fix block/mute pagination in WebUI
...
Port 38579b9f74
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-07-10 18:49:33 +02:00
Thibaut Girka
ade6526249
Merge branch 'master' into glitch-soc/merge-upstream
2020-07-10 18:49:06 +02:00
ThibG
ddf7cc1ab5
Merge pull request #1380 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2020-07-10 17:29:43 +02:00
Sasha Sorokin
66c0953c33
[Glitch] Improve safety of Blurhash component
...
Port 3ef94c0044
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-07-10 17:08:31 +02:00
ThibG
0520273573
[Glitch] Audio player visualization improvements
...
Port a2abe35e0f
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-07-10 17:07:41 +02:00
ThibG
e248399220
[Glitch] Freeze scroll position when a dropdown menu is open in the TL
...
Port 6fda3cbbeb
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-07-10 17:05:44 +02:00
Sasha Sorokin
042c32ea3b
[Glitch] Replace repetitive blurhash code with component ( #14267 )
...
Port 61c07c3731
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-07-10 16:59:53 +02:00
Thibaut Girka
5054462759
Merge branch 'master' into glitch-soc/merge-upstream
2020-07-10 16:51:51 +02:00
Thibaut Girka
d42a23fdbe
Fix clicking the audio player also opening toots in detailed view
2020-07-10 10:28:05 +02:00
Thibaut Girka
0fe5deae89
Change styling of account note editing buttons
...
Co-Authored-By: Mélanie Chauvel (ariasuni) <perso@hack-libre.org>
2020-07-09 12:19:43 +02:00
ThibG
54e62f8500
Merge pull request #1378 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2020-07-08 16:25:03 +02:00
ThibG
11446be6d1
[Glitch] Fix new accent color not refreshing when changing thumbnail for audio uploads
...
Port 0d2135a461
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-07-08 15:26:28 +02:00
ThibG
b27eecdbfc
[Glitch] Fix WebUI crash on sensitive preview card with no preview thumbnail
...
Port d308a863fb
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-07-08 15:26:02 +02:00
ThibG
a513997367
[Glitch] Fix WebUI crash on sensitive preview card with no preview thumbnail
...
Port 2581715491
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-07-08 15:25:31 +02:00
Thibaut Girka
de938023ab
Merge branch 'master' into glitch-soc/merge-upstream
2020-07-08 15:23:41 +02:00
Thibaut Girka
c41da2e962
Fix streaming server only working for streams allowing local-only toots
2020-07-07 20:31:45 +02:00
ThibG
4acb7efb4b
Merge pull request #1372 from ThibG/glitch-soc/fixes/local-only-public-option
...
Add option to show local-only toots in public timeline
2020-07-07 19:58:12 +02:00
Thibaut Girka
64b6c20676
Change styling and layout of account notes UI
2020-07-07 19:25:42 +02:00
Thibaut Girka
a9b13804e2
Change account note placeholder name since the design has diverged upstream
2020-07-07 19:25:42 +02:00
Thibaut Girka
170b38c3f4
Fix being unable to add account notes
2020-07-07 19:25:42 +02:00
Sasha Sorokin
a3ac322ded
[Glitch] Replace shortNumberFormat with <ShortNumber>
...
Port cb2adaaf9d
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-07-07 19:25:06 +02:00
ThibG
c4e1b82caf
Merge pull request #1373 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2020-07-07 16:21:42 +02:00
Eugen Rochko
6c7ac1b48f
[Glitch] Add ability to choose media thumbnail in web UI
...
Port 06fc6a9cd4
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-07-07 15:58:49 +02:00
ThibG
8b17d47e12
[Glitch] Fix hashtag column options styling
...
Port a783bdf4ad
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-07-07 15:58:49 +02:00
Thibaut Girka
e9ad99bc93
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- `package.json`:
Not really a conflict, just some glitch-soc-specific dependency
too close to an upstream-updated one.
2020-07-07 15:58:45 +02:00
Thibaut Girka
13db302f6e
Fix vanilla flavour too
2020-07-06 21:13:04 +02:00
Thibaut Girka
d973e11061
Add UI option to show local-only toots in public timeline
2020-07-06 21:12:06 +02:00
ThibG
94e09d309c
Merge pull request #1371 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2020-07-05 22:55:09 +02:00
Eugen Rochko
69cddc3909
[Glitch] Add color extraction for audio thumbnails
...
Port 99f3a55540
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-07-05 20:18:51 +02:00
Eugen Rochko
ad73e05f46
[Glitch] Fix audio modals not using blurhash and poster
...
Port 162adf61f2
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-07-05 20:18:51 +02:00
Thibaut Girka
2d8be0a6e1
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- `.env.production.sample`:
Upstream changed it completely.
Changed ours to merge upstream's new structure, but
keeping most of the information.
2020-07-05 19:35:56 +02:00
Eugen Rochko
9b3677d509
[Glitch] Add customizable thumbnails for audio and video attachments
...
Port 64aac30733
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-07-02 17:31:09 +02:00
Eugen Rochko
8999eea707
[Glitch] Fix various issues around OpenGraph representation of media
...
Port audio player changes from 662a49dc3f
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-07-02 17:31:09 +02:00
Thibaut Girka
e6dc2fd8eb
Revert "Revert "Remove unused dependency on wavesurfer.js ( #14136 )""
...
This reverts commit dc99608bcf
.
2020-07-02 17:31:09 +02:00
Eugen Rochko
06309129be
[Glitch] Fix audio/video/images/cards not reacting to window resizes in web UI
...
Port bb9ca8a587
to glitch-soc
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-07-02 17:31:09 +02:00
Eugen Rochko
1c58420831
[Glitch] Change volume control and download buttons in web UI
...
Port 419ad6248b
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-07-02 17:31:09 +02:00
ThibG
1ad79d11f3
[Glitch] Fix audio player not working when media files are hosted on a different domain
...
Port aaf91abffa
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-07-02 17:31:09 +02:00
Eugen Rochko
ad978ab1d4
[Glitch] Change design of audio players in web UI
...
Port 75a2b8f815
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-07-02 17:31:09 +02:00
ThibG
e62d574ead
Merge pull request #1370 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2020-07-02 16:36:21 +02:00
Takeshi Umeda
1c8eb9bcf7
[Glitch] Fix the conditions for incomplete remote content
...
Port 7548a474a5
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-07-02 13:58:50 +02:00
Thibaut Girka
9d127e15ff
Merge branch 'master' into glitch-soc/merge-upstream
2020-07-02 13:56:02 +02:00
ThibG
665eb1affe
Merge pull request #1369 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2020-07-01 21:51:16 +02:00
Ariel
f60c78ff3e
[Glitch] Fix cursor type in statuses
...
Port e9ea960773
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-07-01 20:18:07 +02:00
ThibG
24508bb837
[Glitch] Fix lock icon not being shown when locking account in profile settings
...
Port 4babf5b8b5
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-07-01 20:13:51 +02:00
Thibaut Girka
45deca65b3
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/packs/public.js`:
Conflict because part of that file has been split to
`app/javascript/core/settings.js`. Ported those changes
there.
2020-07-01 19:23:14 +02:00
Thibaut Girka
39a0622de7
Add support for li attribute to li element
2020-07-01 01:02:27 +02:00
Thibaut Girka
f186e0c91c
Add support for “start” and “reversed” attributes to ol element
...
Fixes #1367
2020-07-01 01:02:27 +02:00
ThibG
814d3f343f
Merge pull request #1366 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2020-07-01 00:18:49 +02:00
Thibaut Girka
3d7ce178dd
Use allow/deny-list instead of white/black-list in .env.production.sample
...
.env.production.sample has been nuked upstream, but we decided to keep it,
so change it to reflect latest changes in environment variable names.
(The link still refers to “whitelist_mode” because the documentation hasn't
been updated yet)
2020-06-30 23:32:02 +02:00
ThibG
511edccf61
[Glitch] Add user notes on accounts
...
Port 65506bac3f
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-06-30 23:32:02 +02:00
trwnh
50f5254568
[Glitch] Fix padding on account header
...
Port d1c6dd2d27
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-06-30 23:10:44 +02:00
ThibG
befe8c72dd
[Glitch] Fix read marker state not being udpated internally
...
Port fa4876a1b9
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-06-30 23:09:39 +02:00
ThibG
934bacd05f
[Glitch] Change sensitive preview cards to not blur text
...
Port a1ad2ad951
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-06-30 23:08:24 +02:00
Thibaut Girka
9c3b9d5ab9
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- `.env.production.sample`:
Upstream deleted it, I decided to keep it.
- `package.json`:
Upstream updated a dependency textually too close to wavesurfer.js
which has been deleted from upstream but is kept in glitch-soc for now.
2020-06-30 23:00:20 +02:00
ThibG
10ede3eb27
Merge pull request #1364 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2020-06-26 16:36:55 +02:00
Thibaut Girka
de735286cd
Fix public page CSS to match upstream's changes
...
Kind of a port of 418f0a33e9
to glitch-soc
2020-06-26 13:45:40 +02:00
Mélanie Chauvel
4964490bbd
[Glitch] Improve appearence consistency of settings pages
...
Port 08cf81f8c1
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-06-26 13:31:17 +02:00
ThibG
327f6309e4
[Glitch] Fix design issues with sensitive preview cards
...
Port 1d2b0d2121
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-06-26 13:28:52 +02:00
ThibG
9a26d2e127
[Glitch] Fix avatar size in public page detailed status
...
Port 0a56a4a1bc
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-06-26 13:27:39 +02:00
Eugen Rochko
2bb25c7730
[Glitch] Fix various issues around OpenGraph representation of media
...
Port front-end changes (except for audio player) from 662a49dc3f
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-06-26 13:23:56 +02:00
Thibaut Girka
dc99608bcf
Revert "Remove unused dependency on wavesurfer.js ( #14136 )"
...
This reverts commit e9ff61ca07
.
2020-06-26 13:03:39 +02:00
Thibaut Girka
a01674fb2b
Merge branch 'master' into glitch-soc/merge-upstream
2020-06-26 13:02:14 +02:00
ThibG
8f4aff9b6f
Merge pull request #1361 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2020-06-24 17:06:26 +02:00
ThibG
72d193654b
[Glitch] Fix very wide media attachments resulting in too thin a thumbnail
...
Port d469247083
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-06-24 16:01:28 +02:00
Takeshi Umeda
83bc9f68af
[Glitch] Fix modifier key to keep the EmojiPicker on macOS
...
Port 434a6d0b15
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-06-24 15:56:43 +02:00
fuyu
51922d7ffa
[Glitch] Fix unnecessary gap under of video modal
...
Port cb3c6d1780
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-06-24 15:55:53 +02:00
Thibaut Girka
aae60a2366
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- `app/controllers/concerns/sign_in_token_authentication_concern.rb`:
Conflict due to glitch-soc's theming system.
Ported upstream changes.
- `app/controllers/concerns/two_factor_authentication_concern.rb`:
Conflict due to glitch-soc's theming system.
Ported upstream changes.
2020-06-24 15:33:41 +02:00
Thibaut Girka
5d12b63e79
Simplify filtering condition
2020-06-23 16:09:36 +02:00
ash lea
c1377049c6
never filter own posts from timeline
2020-06-23 16:09:36 +02:00
ThibG
c7da2cc5a1
Merge pull request #1358 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2020-06-17 18:28:28 +02:00
Eugen Rochko
9a641a5a0e
[Glitch] Add hints about incomplete remote content to web UI
...
Port 3e9dc4044b
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-06-17 17:48:04 +02:00
ThibG
65a9b788fc
[Glitch] Fix initial audio volume not corresponding to what's displayed
...
Port 755e8c76ab
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-06-17 17:20:14 +02:00
fuyu
45fbba2742
[Glitch] Fixed emoji detection problem to append border
...
Port b1484cf3ce
to glitch-soc
Co-authored-by: ThibG <thib@sitedethib.com>
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-06-17 17:18:42 +02:00
Thibaut Girka
59e92004b3
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- `Gemfile.lock`: not a real conflict, upstream update too close
to a glitch-soc-specific dependency
2020-06-17 17:10:15 +02:00
ThibG
0a5cf075cd
Merge pull request #1356 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2020-06-10 12:12:14 +02:00
Thibaut Girka
b9d75e49c2
Merge branch 'master' into glitch-soc/merge-upstream
2020-06-10 12:10:26 +02:00
Thibaut Girka
34d92e0233
Disable dependabot
2020-06-09 13:09:17 +02:00
ThibG
3287a10fe9
Merge pull request #1350 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2020-06-09 13:00:24 +02:00
Thibaut Girka
e9d7ca7645
[Glitch] Fix WebUI crash when loading account data before page is loaded
2020-06-09 11:55:07 +02:00
Thibaut Girka
b826e504b4
Disable E2EE-related routes
...
Not that I think they are an issue, but the API is likely to change, and
isn't versioned, so I don't want to that be an issue since we also don't
have clear versioning in glitch-soc.
2020-06-09 11:16:42 +02:00
ThibG
00cd919750
[Glitch] Add hotkey for toggling content warning composer field
...
Port 6b6a9d0ea3
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-06-09 11:14:20 +02:00
Thibaut Girka
5e07deefc1
Merge branch 'master' into glitch-soc/merge-upstream
2020-06-09 11:12:53 +02:00
ThibG
304721edc1
[Glitch] Improve rendering of emoji which do not contrast with background
...
Port db319c0fdc
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-06-09 11:07:32 +02:00
Ben Lubar
4657c1a1ca
[Glitch] FIX: filters ignore media descriptions
...
Port c66403b257
to glitch-soc
Co-authored-by: Thibaut Girka <thib@sitedethib.com>
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-06-09 11:02:24 +02:00
ThibG
776aff9656
[Glitch] Hide sensitive preview cards with blurhash
...
Port 8e96510b25
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-06-09 11:01:31 +02:00
Yamagishi Kazutoshi
2da2f7f7c2
[Glitch] Fix ref attr for react-textarea-autozsize
...
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-06-09 10:55:52 +02:00
Thibaut Girka
12c8ac9e14
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- `app/controllers/activitypub/collections_controller.rb`:
Conflict due to glitch-soc having to take care of local-only
pinned toots in that controller.
Took upstream's changes and restored the local-only special
handling.
- `app/controllers/auth/sessions_controller.rb`:
Minor conflicts due to the theming system, applied upstream
changes, adapted the following two files for glitch-soc's
theming system:
- `app/controllers/concerns/sign_in_token_authentication_concern.rb`
- `app/controllers/concerns/two_factor_authentication_concern.rb`
- `app/services/backup_service.rb`:
Minor conflict due to glitch-soc having to handle local-only
toots specially. Applied upstream changes and restored
the local-only special handling.
- `app/views/admin/custom_emojis/index.html.haml`:
Minor conflict due to the theming system.
- `package.json`:
Upstream dependency updated, too close to a glitch-soc-only
dependency in the file.
- `yarn.lock`:
Upstream dependency updated, too close to a glitch-soc-only
dependency in the file.
2020-06-09 10:39:20 +02:00
ThibG
f328f2faa3
Merge pull request #1347 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2020-06-01 19:41:33 +02:00
Christopher Choi
c225ac8b9e
[Glitch] Adjust flash alert contrast for better readability
...
Port b4a8400afd
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-06-01 18:31:45 +02:00
Brian C. Lindner
a8559458c3
[Glitch] Allow Ctrl-click to keep EmojiPicker window open
...
Port 64154c5161
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-06-01 18:31:42 +02:00
Thibaut Girka
89de02f7aa
Merge branch 'master' into glitch-soc/merge-upstream
2020-06-01 18:21:43 +02:00
ariasuni
1f94f4009e
Improve appearance of notification cleaning UI
...
- Use smaller font-size for consistency with the rest of the UI
- Make better use of the horizontal space when available
2020-06-01 12:28:27 +02:00
Thibaut Girka
18f2c39074
Hide local-only pinned toots from public profiles
...
Fixes #1336
This also fixes federating pinned toots when some of them are local-only.
Public profiles will not show public toots, whether you are logged in
or not (this is consistent with local-only toots that are not pinned).
2020-05-31 17:20:15 +02:00
Thibaut Girka
ddcd9fe9f0
Fix backup archive including outgoing-only content warnings
2020-05-30 18:27:00 +02:00
Thibaut Girka
9e04b9d8df
Add support for setting Content Warning for CW-less outgoing toots
2020-05-30 18:27:00 +02:00
Thibaut Girka
041c769182
Move glitch-specific ruby-side locales to their own files
2020-05-30 12:54:17 +02:00
ThibG
491588f6b4
Merge pull request #1341 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2020-05-29 22:13:06 +02:00
ThibG
9707dbee6f
[Glitch] Fix timeline markers in Firefox
...
Port cc650bc023
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-05-29 20:02:30 +02:00
ThibG
9bd30b8dd5
[Glitch] Fix timeline markers not working on Chrome
...
Port 5aff2a6957
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-05-29 20:02:30 +02:00
Thibaut Girka
60b43050cb
Merge branch 'master' into glitch-soc/merge-upstream
2020-05-29 19:27:21 +02:00
Thibaut Girka
e8714530a4
Fix local-only hashtag columns
2020-05-28 15:21:16 +02:00
Thibaut Girka
7a74e46b77
Fix one import being made on mastodon's codebase instead of glitch-soc's
2020-05-28 15:14:12 +02:00
ThibG
39aa6301eb
Merge pull request #1337 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2020-05-28 14:53:36 +02:00
Mélanie Chauvel
0b01492276
[Glitch] Change wording from “Hide media” to “Hide image/images” in Web UI
...
Port 40d81620b0
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-05-28 14:08:05 +02:00
Takeshi Umeda
44ea965557
[Glitch] Fix local streaming of hashtag timelines
...
Port 3a1a21ad57
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-05-28 14:05:21 +02:00
Thibaut Girka
ef6bfaf12e
Merge branch 'master' into glitch-soc/merge-upstream
2020-05-28 13:44:57 +02:00
Ben Lubar
ead09f5ddc
Fix exception when trying to serialize posts with <a> tags in them without hrefs ( #1334 )
...
* fix exception when trying to serialize posts with <a> tags in them without hrefs
* Add tests
Co-authored-by: Thibaut Girka <thib@sitedethib.com>
2020-05-28 12:47:40 +02:00
Thibaut Girka
c8cee24cb3
Fix Cmd-Enter not working to send toot
...
Fixes #1333
2020-05-26 10:15:35 +02:00
Thibaut Girka
b07c1e615b
Fix backup service when user has posted instance-local toots, again
2020-05-21 20:05:46 +02:00
ThibG
4dcabe6f9c
Merge pull request #1331 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2020-05-20 18:38:36 +02:00
Thibaut Girka
27b5143dc4
Merge branch 'master' into glitch-soc/merge-upstream
2020-05-20 18:22:42 +02:00
ThibG
b7e178d2e4
Merge pull request #1329 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2020-05-14 23:30:05 +02:00
Eugen Rochko
2b75728a80
[Glitch] Fix regression in sparkline style in web UI
...
Port c9dcc2d39f
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-05-14 18:50:57 +02:00
Thibaut Girka
f94aebafe5
Merge branch 'master' into glitch-soc/merge-upstream
2020-05-14 18:49:10 +02:00
ThibG
e1d2820234
Merge pull request #1327 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2020-05-13 23:46:09 +02:00
ThibG
d147dd7588
[Glitch] Change “hide/show boosts from …” menu to be hidden when the account is muted
...
Port 92f85bea52
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-05-13 23:17:10 +02:00
ThibG
ef2f98317a
[Glitch] Fix some account avatars on public pages having incorrect size
...
Port 48503384d0
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-05-13 23:17:10 +02:00
ThibG
6a17fa2b99
[Glitch] Fix first poll option not being focused when adding a poll
...
Port af6d356279
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-05-13 23:17:10 +02:00
Thibaut Girka
3baacf6993
Merge branch 'master' into glitch-soc/merge-upstream
2020-05-13 22:11:49 +02:00
Takeshi Umeda
559214c33f
[Glitch] Add remote only to public timeline
...
Port 26b08a3c54
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-05-10 16:19:59 +02:00
ThibG
51508e5061
[Glitch] Fix use of inline CSS in public pages
...
Port c0b849bdfd
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-05-10 16:19:59 +02:00
Thibaut Girka
4a70792b4a
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- `Gemfile.lock`:
Not a real conflict, just a glitch-soc-only dependency too close to a
dependency that got updated upstream. Updated as well.
- `app/models/status.rb`:
Not a real conflict, just a change too close to glitch-soc-changed code
for optionally showing boosts in public timelines.
Applied upstream changes.
- `app/views/layouts/application.html.haml`:
Upstream a new, static CSS file, conflict due to glitch-soc's theming
system, include the file regardless of the theme.
- `config/initializers/content_security_policy.rb`:
Upstream dropped 'unsafe-inline' from the 'style-src' directive, but
both files are very different. Removed 'unsafe-inline' as well.
2020-05-10 16:19:56 +02:00
Thibaut Girka
c6ff4c634c
Fix crash when invalid addresses are linked in HTML or Markdown toots
2020-05-09 16:01:00 +02:00
ThibG
75b0fa8b76
Merge pull request #1324 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2020-05-03 23:29:41 +02:00
ThibG
89fcd68b75
[Glitch] Fix admin-facing uses of inline CSS
...
Port b8ba977497
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-05-03 21:47:58 +02:00
ThibG
7ea8b07b93
[Glitch] Fix page incorrectly scrolling when bringing up dropdown menus
...
Port 77ec0875ea
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-05-03 21:47:11 +02:00
ThibG
9e5a216878
[Glitch] Fix end-user-facing uses of inline CSS
...
Port 0e362b7678
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-05-03 21:44:43 +02:00
ThibG
4a5f93c25f
[Glitch] Refactor/cleanup TIMELINE_DELETE-related code
...
Port ad9c7aefe6
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-05-03 21:42:13 +02:00
ThibG
502a0365df
[Glitch] Fix messed up z-index when NoScript blocks media/previews
...
Port 04eb599864
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-05-03 21:41:15 +02:00
Thibaut Girka
a22e6a3683
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- `app/controllers/statuses_controller.rb`:
Upstream disabled the embed controller for reblogs.
Not a real conflict, but glitch-soc has an extra line to deal
with its theming system.
Ported upstream changes.
- `app/javascript/packs/public.js`:
Upstream made changes to get rid of most inline CSS, this changes
javascript for public pages, which in glitch are split between
different files. Ported those changes.
- `app/models/status.rb`:
Upstream changed the block check in `Status#permitted_for` to
include domain-block checks. Not a real conflict with glitch-soc,
but our scope is slightly different, as our scope for
unauthenticated access do not include instance-local toots.
Ported upstream changes.
- `app/serializers/rest/instance_serializer.rb`:
Not a real conflict, upstream added a new field to the instance
serializer, the conflict is one line above since we added more of
that.
Ported upstream changes.
- `app/views/settings/profiles/show.html.haml`:
Upstream got rid of most inline CSS and moved hidden elements
to data attributes in the process, in fields were we have
different values.
Ported upstream changes while keeping our glitch-specific
values.
- `app/views/statuses/_simple_status.html.haml`:
Upstream got rid of inline CSS on an HAML line we treat
differently, stripping empty text nodes.
Ported upstream changes to the style attribute, keeping
the empty text node stripping behavior.
2020-05-03 21:23:49 +02:00
ThibG
9c61dadc0d
Merge pull request #1321 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2020-04-25 17:50:22 +02:00
ThibG
9d41a410a3
[Glitch] Fix uninformative error message when uploading unsupported image files
...
Port be637146f3
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-04-25 15:29:01 +02:00
ThibG
572e89e563
[Glitch] Fix expanded video player issues
...
Port c955f98d36
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-04-25 15:28:16 +02:00
Irie Aoi
0f4a8a6487
[Glitch] Set max-width and max-height to gif video
...
Port c5c8f68031
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-04-25 15:26:42 +02:00
ThibG
ce33822e2c
[Glitch] Fix and refactor keyboard navigation in dropdown menus
...
Port 80182eda62
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-04-25 15:24:02 +02:00
Thibaut Girka
8b2823b7b6
Merge branch 'master' into glitch-soc/merge-upstream
2020-04-25 15:19:32 +02:00
ThibG
60f8a63a76
Merge pull request #1320 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2020-04-20 18:25:18 +02:00
D Anzorge
221ea4787f
[Glitch] Update Twemoji to 12.1.5
...
Port emoji_map.json changes from 29f5353f8b
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-04-20 16:54:01 +02:00
Takeshi Umeda
7ceeb97f3d
[Glitch] Add local only to hashtag timeline
...
Port front-end changes from 2c7128c7f0
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-04-20 16:52:56 +02:00
Thibaut Girka
63dc7cfa90
Merge branch 'master' into glitch-soc/merge-upstream
2020-04-20 16:45:40 +02:00
ThibG
d5530827c9
Merge pull request #1319 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2020-04-18 16:22:31 +02:00
ThibG
bf9da1e734
[Glitch] Fix uploaded image orientation in some browsers
...
Port a1ce9cbb67
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-04-18 15:48:15 +02:00
Thibaut Girka
0cbc24e3b6
Merge branch 'master' into glitch-soc/merge-upstream
2020-04-18 15:47:32 +02:00
ThibG
62e65dca11
Merge pull request #1318 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2020-04-17 22:36:48 +02:00
ThibG
81ef26b67d
[Glitch] Fix not being able to vote
...
Port e12a5635da
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-04-17 22:04:10 +02:00
Thibaut Girka
7ee65ba15e
Merge branch 'master' into glitch-soc/merge-upstream
2020-04-17 22:02:55 +02:00
Gurgen Hayrapetyan
4849752a9c
[Glitch] Fix Poll fetchPoll action not being debounced.
...
Port ab8d7c0680
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-04-17 20:20:06 +02:00
Thibaut Girka
81e49ba5c6
Merge branch 'master' into glitch-soc/merge-upstream
2020-04-17 20:16:24 +02:00
ThibG
5fdd5eef5a
Merge pull request #1317 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2020-04-15 18:24:41 +02:00
Thibaut Girka
66ad30db48
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- `package.json`:
No real conflict, upstream updated a dependency which is
textually adjacent to a glitch-soc-specific dependency.
Updated it.
- `yarn.lock`:
No real conflict, upstream updated a dependency which is
textually adjacent to a glitch-soc-specific dependency.
Updated it.
2020-04-15 17:07:49 +02:00
ThibG
615073df33
Merge pull request #1316 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2020-04-12 17:58:25 +02:00
ThibG
a08a2130f0
[Glitch] Fix WebUI pagination of following, followers, follow requests, blocks and mutes lists
...
Port ec31b1b752
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-04-12 17:01:41 +02:00
Thibaut Girka
fdd0beefa7
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- `README.md`:
We have a different README than upstream, discarded upstream changes
and kept ours.
2020-04-12 16:50:27 +02:00
Thibaut Girka
51bbf0b68d
Clean up some dead code
2020-04-10 14:47:06 +02:00
Thibaut Girka
5d2cdeb225
Fix deprecated use of createBrowserHistory
2020-04-09 17:03:05 +02:00
ThibG
c47be5bd86
Merge pull request #1312 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2020-04-06 21:44:34 +02:00
Thibaut Girka
9101254d0a
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/packs/public.js`:
Upstream modified code that we split between multiple files due
to glitch-soc's theming system.
Ported those changes.
2020-04-05 18:32:06 +02:00
ThibG
6e426267a7
Merge pull request #1311 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2020-04-05 00:16:23 +02:00
Thibaut Girka
ec6464f8d0
Fix admin audit log crash due to glitch-soc theming changes
2020-04-04 23:15:08 +02:00
ThibG
fd7a37c371
[Glitch] Add explanation as to why unlocked accounts may have follow requests
...
Port d3ff06a320
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-04-04 21:59:49 +02:00
Eugen Rochko
7d5b43d8bb
[Glitch] Add ability to filter audit log in admin UI
...
Port f65568f1d4
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-04-04 21:53:31 +02:00
Thibaut Girka
8fef96cbf5
Merge branch 'master' into glitch-soc/merge-upstream
2020-04-04 21:47:37 +02:00
ThibG
5c5317041f
Merge pull request #1310 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2020-04-02 22:17:29 +02:00
Sasha Sorokin
b367dd713e
[Glitch] Improve polls: option lengths & redesign
...
Port 37b3985bfa
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-04-02 20:52:53 +02:00
Mélanie Chauvel (ariasuni)
2e337d850f
[Glitch] Improve toot clicking areas
...
Port part of 1fb92037e4
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-04-02 20:49:43 +02:00
ThibG
9175ebf20c
[Glitch] Fix content warning being unnecessarily cleared when enabling/disabling CW
...
Port cf1fa73347
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-04-02 20:45:46 +02:00
Mélanie Chauvel (ariasuni)
dcf841545d
[Glitch] Fix wrong color for ellipsis in boost confirmation dialog in Web UI
...
Port be2f1597cf
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-04-02 20:45:03 +02:00
ThibG
3eede6f64b
[Glitch] Fix 404 and 410 API errors being silently discarded in WebUI
...
Port front-end changes from 0d117c106a
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-04-02 20:39:44 +02:00
Thibaut Girka
f3eff922a3
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/mastodon/features/compose/components/poll_form.js`:
Upstream bumped poll option character limit, but we already had
a higher one, kept ours.
- `app/validators/poll_validator.rb`:
Upstream bumped poll option character limit, but we already had
a higher one, kept ours.
- `config/initializers/content_security_policy.rb`:
Upstream added a rule, the way we compute ours is different, but
that added rule has been ported.
- `package.json`:
No real conflict, dependency update. Performed the same update.
- `yarn.lock`:
No real conflict, dependency update. Performed the same update.
2020-04-02 20:32:00 +02:00
ThibG
a192b193bd
Merge pull request #1308 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2020-03-28 15:19:05 +01:00
Thibaut Girka
d98fabf2ee
Fix crash when posting with a CW but no text nor media
2020-03-27 22:28:39 +01:00
ThibG
faa56643b8
[Glitch] Fix frontend crash when deleting announcements
...
Port 858d0dd168
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-03-27 22:06:42 +01:00
ThibG
60338b2bee
[Glitch] Change poll option hover/active styling to be less confusing
...
Port beb80adb51
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-03-27 22:06:06 +01:00
Thibaut Girka
7b435fd9bf
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- `app/services/post_status_service.rb`:
CW/sensitive logic fixed upstream, but different in glitch-soc.
Ported the changes accordingly.
2020-03-27 21:54:44 +01:00
Thibaut Girka
02f1c04fab
Make sanitizer *not* add no-referrer etc. in local markdown toots if the link is “safe”
2020-03-24 12:07:47 +01:00
Thibaut Girka
2c510ee00a
Fix glitch-soc marking every link in toots as a tag
...
Fixes #1281
2020-03-24 12:07:47 +01:00
ThibG
d101438b9d
Merge pull request #1305 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2020-03-22 17:59:47 +01:00
Daniel Sockwell
9da4bd098c
[Glitch] Fix frontend crash when deleting announcements
...
Port 8758221e73
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-03-22 16:31:01 +01:00
ThibG
0ff78befc6
[Glitch] Fix regression in “Edit media” modal in web UI
...
Port 90f3a00062
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-03-22 16:30:19 +01:00
mayaeh
912f4a2eba
[Glitch] Change the string "hidden" to "blocked" in WebUI
...
Port 310d729745
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-03-22 16:29:51 +01:00
Eugen Rochko
295dadc9f0
[Glitch] Change local media attachments to perform heavy processing asynchronously
...
Port front-end part of 9660aa4543
to glitch-soc
[API] This makes use of a new media posting API (/api/v2/media), supporting
background processing of uploaded files. For Pleroma's purposes, this could
be handled the same as /api/v1/media since afaik Pleroma doesn't do any
transcoding.
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-03-22 16:26:26 +01:00
Thibaut Girka
9abb227250
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- `README.md`:
Our README.md files are completely different. Discarded upstream changes.
- `app/javascript/core/admin.js`:
Updating rails-ujs, no real conflict, but a comment to close to changed
code. Various glitch-soc-only files have been updated to match those changes,
though.
- `package.json`:
No real conflict, just an additional dependency in glitch-soc that was too
close to something updated upstream. Took upstream's changes.
2020-03-22 16:10:44 +01:00
Thibaut Girka
7115b0b8c9
Fix missing media description dialog when sending toots with keyboard shortcuts
2020-03-14 14:59:14 +01:00
Thibaut Girka
531658d6cf
Fix posting privacy on secondary button with missing description confirmation dialog
2020-03-14 12:33:50 +01:00
Thibaut Girka
e53622442c
Fix privacy icon being displayed twice in glitch-soc Web UI
...
Fixes #1298
2020-03-11 23:25:15 +01:00
ThibG
840b17e344
Merge pull request #1297 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2020-03-08 22:09:53 +01:00
ThibG
9c29229587
[Glitch] Add support for links to statuses in announcements to be opened in web UI
...
Port aa67036b41
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-03-08 20:46:15 +01:00
Mélanie Chauvel (ariasuni)
669cf49c54
[Glitch] Change the tooltip "Toggle visibility" to "Hide media" in web UI
...
Port 5e4b649655
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-03-08 20:45:36 +01:00
Bèr Kessels
fc53d9cc76
[Glitch] Code style improvements in JavaScript
...
Port fd76955f39
to glitch-soc
* JS-linter: fix trailing comma's
* Configure eslinter to ignore this onchange error.
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-03-08 20:43:53 +01:00
Mélanie Chauvel (ariasuni)
35d2189ac8
[Glitch] Change description of privacy levels to be more intuitive in web UI
...
Port 4063f9f278
to glitch-soc
Co-authored-by: Thibaut Girka <thib@sitedethib.com>
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-03-08 20:37:13 +01:00
Mélanie Chauvel (ariasuni)
bdb06f50ec
[Glitch] Fix text area above/right of emoji picker being accidentally clickable in web UI
...
Port 2e18b1a2a2
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-03-08 20:19:08 +01:00
ThibG
3c96a0c21d
[Glitch] Fix too large announcements not being scrollable in web UI
...
Port 503eab1c1f
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-03-08 20:16:43 +01:00
koyu
6211eff739
[Glitch] Change GIF label to be displayed even when autoplay is enabled in web UI
...
Port e69a3f54a1
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-03-08 20:15:11 +01:00
ThibG
c8f36a71ea
[Glitch] Change the string "Hide everything from …" to "Block domain …" in web UI
...
Port 39453de232
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-03-08 20:14:20 +01:00
Mélanie Chauvel (ariasuni)
eae96cb204
[Glitch] Add tooltips to audio/video player buttons
...
Port 036ba3f510
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-03-08 19:59:42 +01:00
Thibaut Girka
c790ecb14d
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- `app/controllers/api/v1/statuses_controller.rb`:
Conflict due to upstream adding a new parameter (with_rate_limit),
too close to glitch-soc's own additional parameter (content_type).
Added upstream's parameter.
- `app/services/post_status_service.rb`:
Conflict due to upstream adding a new parameter (rate_limit),
too close to glitch-soc's own additional parameter (content_type).
Added upstream's parameter.
- `app/views/settings/preferences/appearance/show.html.haml`:
Conflict due to us not exposing theme settings here (as we have
a different flavour/skin menu).
Took upstream change, while still not exposing theme settings.
- `config/webpack/shared.js`:
Coding style fixes for a part we have rewritten.
Discarded upstream changes.
2020-03-08 19:38:53 +01:00
Thibaut Girka
13ef4d5fb0
Update puma from 4.3.2 to 4.3.3
...
Fixes #1294
This fixes cookies and devise authentication being broken as a result of
upgrading to puma 4.3.2, see https://github.com/puma/puma/issues/2132
2020-03-01 20:54:02 +01:00
Thibaut Girka
553a16c6f8
Update JS dependencies
2020-02-29 22:32:33 +01:00
Thibaut Girka
b0a7cb71be
Update glitch-soc-specific dependencies
...
- drop html2text which has been unused in a while
- update redcarpet
2020-02-29 22:32:33 +01:00
ThibG
907ebcfd43
Merge pull request #1291 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2020-02-29 12:50:44 +01:00
Thibaut Girka
427ef4948a
Merge branch 'master' into glitch-soc/merge-upstream
2020-02-29 12:20:54 +01:00
ThibG
e1d29f7d9f
Merge pull request #1290 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2020-02-27 12:38:17 +01:00
Thibaut Girka
51d326f852
Merge branch 'master' into glitch-soc/merge-upstream
2020-02-27 12:37:15 +01:00
ThibG
9ee8e1add9
Merge pull request #1289 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2020-02-25 18:05:52 +01:00
ThibG
2f2b48b227
[Glitch] Fix `/web` redirecting to `/web/web` in web UI
...
Port 0f07218e53
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-02-25 14:30:43 +01:00
Thibaut Girka
85933bc9ff
Merge branch 'master' into glitch-soc/merge-upstream
2020-02-25 14:28:13 +01:00
Thibaut Girka
0d41fef506
Document alt+enter
2020-02-22 23:07:29 +01:00
ThibG
6680983032
Merge pull request #1287 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2020-02-20 00:52:50 +01:00
Thibaut Girka
bc4de2f661
[Glitch] Add source-mapped stacktrace to error message in web UI
...
Port ff3a11d01d
to glitch-soc
2020-02-19 23:31:15 +01:00
ThibG
c9166a5943
[Glitch] Fix old browsers crashing because of missing `finally` polyfill in web UI
...
Port 1314bba68a
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-02-19 23:10:37 +01:00
Thibaut Girka
e037002401
Merge branch 'master' into glitch-soc/merge-upstream
2020-02-19 23:04:18 +01:00
Thibaut Girka
955f838f9d
Fix clicking on the “TOOT” button send bogus visibility parameter
2020-02-16 00:10:45 +01:00
Thibaut Girka
40798cba41
Fix alt+enter changing visibility setting without sending toot when toot is empty
2020-02-14 22:38:24 +01:00
Thibaut Girka
0cbd6d696b
Add test for health_check endpoint
2020-02-10 20:04:41 +01:00
Thibaut Girka
2edf317efc
Fix ActiveRecord::Migration.check_pending! failing because of duplicate migrations
2020-02-10 20:04:41 +01:00
Thibaut Girka
3d7fd4a2df
Fix boosting private toots in detailed view
2020-02-09 22:15:49 +01:00
ThibG
d3aaa08730
Merge pull request #1280 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2020-02-09 12:56:12 +01:00
Thibaut Girka
432033743c
Fix tests
...
Well, kinda, it's actually a bug from glitch-soc, but we will have to address it separately.
2020-02-09 12:32:33 +01:00
Eugen Rochko
5f61065e74
[Glitch] Fix unread indicator on announcements not being aligned with text in web UI
...
Port 90f04ea064
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-02-09 12:30:29 +01:00
ThibG
e443874024
[Glitch] Fix native share button not being displayed for unlisted toots
...
Port 02236332ba
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-02-09 12:29:51 +01:00
Thibaut Girka
dae5e446fe
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- `Gemfile`:
We updated httplog in a separate commit.
Took upstream's change which updated it further.
- `Gemfile.lock`:
We updated httplog in a separate commit.
Took upstream's change which updated it further.
- `app/lib/sanitize_config.rb`:
Upstream added better unsupported link stripping,
while we had different sanitizing configs.
Took only upstream's link stripping code.
- `config/locales/simple_form.pl.yml`:
Strings unused in glitch-soc had been removed from
glitch-soc, reintroduced them even if they are not
useful, to reduce the risk of later merge conflicts.
2020-02-09 12:15:55 +01:00
Lynne
a2cfe3daaa
update gemfile.lock for httplog 1.4.1
2020-02-09 09:49:28 +01:00
Lynne
05064757d9
update gemfile to reflect yanked httplog 1.4.0
2020-02-09 09:49:28 +01:00
ThibG
96ec90b986
Merge pull request #1278 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2020-02-06 22:48:26 +01:00
ThibG
fe9a124f5a
[Glitch] Fix dates (without time) being rendered as datetimes in public pages
...
Port c31d61d7f2
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-02-06 21:41:50 +01:00
fuyu
b9aa57d5bf
[Glitch] Don't display toggle reveal button in video modal when full screen
...
Port 5711899c59
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-02-06 21:39:26 +01:00
Thibaut Girka
1a54b9b99e
Merge branch 'master' into glitch-soc/merge-upstream
2020-02-06 21:36:38 +01:00
Thibaut Girka
ccaefd139d
Add environment variable to specify extra data hosts
...
Fixes #1276
2020-02-06 12:15:15 +01:00
Thibaut Girka
885e9227c6
Fix poll compose form being broken on single-column layout
2020-02-03 11:56:31 +01:00
ThibG
94cdbc4982
Merge pull request #1274 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2020-02-03 10:27:07 +01:00
ThibG
3dcb279da3
[Glitch] Change how unread announcements are handled
...
Port 3adc722d1c
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-02-03 09:31:32 +01:00
Sasha Sorokin
dd6149ca0b
[Glitch] Add "Show thread" button to public profiles
...
Port 50cd73e5d7
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-02-03 09:30:13 +01:00
Eugen Rochko
9dc1f7d299
[Glitch] Fix mascot being too large, and a code style issue
...
Port bba0269d97
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-02-03 09:27:51 +01:00
Thibaut Girka
369201a425
Merge branch 'master' into glitch-soc/merge-upstream
2020-02-03 09:22:58 +01:00
Thibaut Girka
4cd2d13bd2
When submitting markers, use last displayed notification, not last received one
2020-02-01 19:53:01 +01:00
Thibaut Girka
e135b293fa
Fetch last read notification id to update unread notification count on load
2020-02-01 19:53:01 +01:00
Thibaut Girka
cf5b769857
Add support for xmpp: and magnet: URIs to misleading link detection code
2020-01-28 20:25:56 +01:00
ThibG
abe2cc489b
Merge pull request #1272 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2020-01-28 19:38:37 +01:00
Eugen Rochko
8bb5d1abaa
[Glitch] Fix design of announcements in admin UI
...
Port 305abc9e05
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-01-28 19:17:47 +01:00
Eugen Rochko
ed5fb51168
[Glitch] Change announcements to be collapsed on page load in web UI
...
Port 0fcc4b1c56
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-01-28 19:17:06 +01:00
Thibaut Girka
44744e3ce1
Merge branch 'master' into glitch-soc/merge-upstream
2020-01-28 19:15:03 +01:00
ThibG
67b8af34b3
Merge pull request #1271 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2020-01-27 17:26:53 +01:00
Eugen Rochko
cf230d551f
[Glitch] Change number animations direction based on decrease or increase
...
Port 10e209d8e0
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-01-27 16:06:03 +01:00
Eugen Rochko
b0139dcf5e
[Glitch] Add animations to announcement reactions
...
Port dd4eec6bf6
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-01-27 16:05:37 +01:00
ThibG
41d0869d7f
[Glitch] Change last_status_at to be a date, not datetime
...
Port 42d2a915e4
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-01-27 16:03:24 +01:00
Eugen Rochko
187a822074
[Glitch] Fix link colors in announcements
...
Port 2f8c3c17ee
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-01-27 16:01:46 +01:00
Eugen Rochko
e36d0a98cc
[Glitch] Add streaming API updates for announcements being modified or deleted
...
Port b9d74d4076
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-01-27 16:01:06 +01:00
ThibG
8a8936725e
[Glitch] Fix status overflowing in report dialog
...
Port 389e3f6094
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-01-27 15:59:25 +01:00
Thibaut Girka
c56a504d11
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- `app/serializers/rest/account_serializer.rb`:
Upstream added code too close to glitch-soc-specific followers-hiding code.
Ported upstream changes.
2020-01-27 15:46:50 +01:00
Thibaut Girka
8924743349
Refactor notifications cleaning mode
2020-01-26 14:55:03 +01:00
ThibG
3591621edc
Merge pull request #1268 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2020-01-25 20:31:22 +01:00
ThibG
5e4d1f699e
[Glitch] Fix “new items glow” being displayed above settings and announcements
...
Port 90b13ffd00
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-01-25 20:05:36 +01:00
ThibG
98d5ab6be9
[Glitch] Fix spurious error and incorrect state change when adding a reaction twice
...
Port c06d2ff437
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-01-25 19:53:04 +01:00
Thibaut Girka
3d9310bf3f
Merge branch 'master' into glitch-soc/merge-upstream
2020-01-25 19:46:24 +01:00
ThibG
5bd752081f
Merge pull request #1267 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2020-01-25 19:07:32 +01:00
ThibG
6ce72f1fee
[Glitch] Improve announcements design
...
Port 48c55b6392
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-01-25 16:57:03 +01:00
Thibaut Girka
27ddcddcd3
Merge branch 'master' into glitch-soc/merge-upstream
2020-01-25 16:50:24 +01:00
ThibG
340cb4a04c
Merge pull request #1266 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2020-01-25 12:23:47 +01:00
Eugen Rochko
4e1efacfac
[Glitch] Add limit of 8 different reaction types per announcement
...
Port f816da9c64
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-01-25 10:36:27 +01:00
Eugen Rochko
f1e4738f81
[Glitch] Add number animations
...
Port 76f1ed834e
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-01-25 10:36:27 +01:00
Eugen Rochko
3c4bd03949
[Glitch] Change font size of announcements to be the same as statuses
...
Port b89e6cfe70
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-01-25 10:21:13 +01:00
Sasha Sorokin
2bde217ea5
[Glitch] Fix unlocalized dropdown button title
...
Port 1268e3b572
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-01-25 10:20:05 +01:00
Thibaut Girka
1f8563c256
Rename DropdownMenu's ariaLabel to title, to reduce unnecessary changes with upstream
2020-01-25 10:17:13 +01:00
Ben Lubar
05351cbffb
[Glitch] minor server-sent events fixes
...
Port front-end changes from 0dfba0884e
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-01-25 10:13:56 +01:00
Thibaut Girka
61f699c0e9
Merge branch 'master' into glitch-soc/merge-upstream
2020-01-25 10:04:41 +01:00
ThibG
0be67df4f0
Merge pull request #1265 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2020-01-24 17:28:22 +01:00
Thibaut Girka
bdc1581556
Fix emoji button styling in glitch-soc
2020-01-24 16:45:29 +01:00
Eugen Rochko
376e524278
[Glitch] Add announcements
...
Port front-end changes from f52c988e12
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-01-24 16:45:29 +01:00
ThibG
4f51fe03c9
[Glitch] Add “account timeline” filter category
...
Port JS changes from 43daeccccb
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-01-24 15:27:15 +01:00
ThibG
de76a8969e
[Glitch] Fix unfollow confirmations in account directory
...
Port ec3ee67564
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-01-24 15:25:48 +01:00
Ben Lubar
4417e9e1fd
[Glitch] Add transparent support for EventSource streaming.
...
Port 619da5a4dc
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-01-24 15:25:19 +01:00
Thibaut Girka
9adeaf2bfc
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- `app/controllers/statuses_controller.rb`:
Minor conflict due to theming system
2020-01-24 14:37:06 +01:00
ThibG
a8c109baca
Merge pull request #1264 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2020-01-20 19:20:40 +01:00
Thibaut Girka
dc2ab6e646
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/packs/public.js`:
Upstream removed an unused function in code that has
been refactored a bit. Removed that function in the corresponding
places.
2020-01-20 18:31:11 +01:00
Thibaut Girka
eeb8753adc
Add glitch-soc front-end support for many upstream translations
2020-01-20 16:43:18 +01:00
Eugen Rochko
008063d562
[Glitch] Change reported media attachments to always be hidden in admin UI
...
Port 1ded3bb752
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-01-20 15:30:45 +01:00
Thibaut Girka
45709d6987
Merge branch 'master' into glitch-soc/master
...
Conflicts:
- `README.md`:
We have different README files. Discarded upstream changes.
- `app/views/layouts/admin.html.haml`:
Conflict due to glitch-soc theming system.
Adapted upstream changes.
- `app/views/layouts/embedded.html.haml`:
Conflict due to glitch-soc theming system.
Adapted upstream changes.
- `yarn.lock`:
No real conflict, glitch-specific dependency too close to
an updated one. Adapted upstream change.
2020-01-20 15:00:22 +01:00
ThibG
ddcf78d8d3
Merge pull request #1263 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2020-01-13 16:07:40 +01:00
Thibaut Girka
83f8bf48d9
Merge branch 'master' into glitch-soc/merge-upstream
2020-01-13 13:14:35 +01:00
Sasha Sorokin
7ab12b7654
[Glitch] Correct margins for heading actions
...
Port SCSS changes from 5dcca33c56
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-01-12 16:05:09 +01:00
Sasha Sorokin
32191267a5
[Glitch] Use heading actions and placeholders in settings
...
Port SCSS changes from 36426ed4ad
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-01-12 16:04:42 +01:00
Thibaut Girka
980c004f06
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- `Gemfile.lock`:
No real conflict, glitch-soc-only dependency (redcarpet) too close to an
upstream one (rdf-normalize)
- `README.md`:
we have different READMEs, discarded upstream's changes
- `app/views/admin/custom_emojis/index.html.haml`:
No real conflict, different context because of glitch-soc theming
- `lib/mastodon/statuses_cli.rb`:
Upstream added code to keep bookmarked statuses, we were already doing so
with slightly different code. Discarded upstream's changes.
- `package.json`:
No real conflict, glitch-soc-only dependency (favico.js) too close to
an upstream one
2020-01-12 15:57:34 +01:00
Thibaut Girka
180f138394
Make prepending “re: ” to CWs on reply optional
2020-01-07 19:05:31 +01:00
ThibG
9871466958
Merge pull request #1261 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2020-01-07 16:47:02 +01:00
ThibG
5636c94fe9
[Glitch] Fix reuse of detailed status components
...
Port 12a9813a0c
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-01-07 16:30:53 +01:00
Thibaut Girka
578553ba05
Merge branch 'master' into glitch-soc/merge-upstream
2020-01-07 16:28:59 +01:00
ThibG
bcfd6e3bb4
Merge pull request #1259 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2020-01-05 13:51:50 +01:00
Takeshi Umeda
83359fef2b
[Glitch] Fix shortNumberFormat to within 3 chars without units
...
Port 0e8c0287d0
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-01-04 23:04:52 +01:00
Thibaut Girka
01eaeab56d
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- `app/controllers/application_controller.rb`:
Conflict due to theming system.
- `app/controllers/oauth/authorizations_controller.rb`:
Conflict due to theming system.
2020-01-04 23:04:42 +01:00
ThibG
22daf24600
Merge pull request #1257 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-12-28 19:10:27 +01:00
Thibaut Girka
ad29279214
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- `README.md`
- `package.json`
2019-12-28 17:48:40 +01:00
ThibG
f064cd4fb8
Merge pull request #1255 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-12-19 16:07:21 +01:00
ThibG
dace054c06
[Glitch] Fix manual scrolling issue on Firefox/Windows
...
Port dc0750abc3
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-12-19 14:43:47 +01:00
Thibaut Girka
e79fca176b
Fix issue because of theming system
2019-12-19 14:42:16 +01:00
Sasha Sorokin
7d2b1dc094
[Glitch] Improve report page structure
...
Port 34aa5c7cb2
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-12-19 14:37:12 +01:00
Thibaut Girka
ab5ff638f2
Merge branch 'master' into glitch-soc/master
...
Conflicts:
- `config/locales/en.yml`
No real conflict, upstream added a translatable string “too close” to
one specific to glitch-soc
- `lib/mastodon/statuses_cli.rb`
Fixes made upstream, while changed in glitch-soc to keep bookmarked statuses
- `package.json`
No real conflict, additional dependency in glitch-soc
2019-12-19 13:52:54 +01:00
Thibaut Girka
66ab1f83b0
Fix various issues caused by wrong `unread` key being updated
2019-12-17 15:55:10 +01:00
Thibaut Girka
6a1b4c3452
Fix edit filter link in filtered “Show why” dialog
2019-12-12 16:32:47 +01:00
ThibG
c1befd3909
Merge pull request #1252 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-12-12 16:10:58 +01:00
Thibaut Girka
be4849c083
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/controllers/application_controller.rb
Minor conflict due to glitch-soc's theming system
2019-12-12 15:40:06 +01:00
ThibG
246addd5b3
Merge pull request #1251 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-12-08 21:27:36 +01:00
Thibaut Girka
49027ee948
Fix erroneous inclusion of upstream code
2019-12-07 15:53:04 +01:00
Hinaloe
d4c22d48df
[Glitch] Highlight border when focusing poll-form footer
...
Port eb551c480d
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-12-07 15:48:26 +01:00
Takeshi Umeda
510e527663
[Glitch] Add basic support for group actors
...
Port f43f1e0184
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-12-07 15:48:26 +01:00
ThibG
c6ba870f00
[Glitch] Fix poll options not being selectable via keyboard
...
Port c05ed8a625
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-12-07 15:48:26 +01:00
ThibG
1e1293e3c8
[Glitch] Add follow_request notification type
...
Port 911cc14481
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-12-07 15:48:26 +01:00
Shlee
176f1da267
[Glitch] upgrade/replace websocket.js to @gamestdio/websocket v2
...
Port f92ed32df4
to glitch-soc
Co-authored-by: hina <hina@hinaloe.net>
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-12-07 12:54:27 +01:00
Thibaut Girka
abcba5c198
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- package.json
Not really a conflict, caused by an additional dependency in glitch-soc.
- yarn.lock
Not really a conflict, caused by an additional dependency in glitch-soc.
2019-12-07 12:28:59 +01:00
ThibG
7d59e25fbd
Merge pull request #1250 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-12-01 13:13:28 +01:00
Eugen Rochko
fae7e0cace
[Glitch] Fix conversations not having an unread indicator in web UI
...
Fix ed73376f1c
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-12-01 12:21:55 +01:00
ThibG
2f8c4c588b
[Glitch] Fix lost focus when modals open/close
...
Port 35b142a7ad
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-12-01 12:19:06 +01:00
Thibaut Girka
99f1f48741
Merge branch 'master' into glitch-soc/merge-upstream
2019-12-01 12:12:42 +01:00
ThibG
7f6315841c
Merge pull request #1249 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-11-30 18:13:53 +01:00
Sasha Sorokin
b509b8812a
[Glitch] Fix counter sizing
...
Port b532ead798
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-11-30 17:52:12 +01:00
ThibG
776352d329
[Glitch] Add hotkey for opening media files
...
Port a690b3e470
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-11-30 17:52:12 +01:00
ThibG
949b37faba
[Glitch] Fix pending upload count not being decremented on error
...
Port 667708f5b0
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-11-30 17:37:16 +01:00
ThibG
7ce7575549
[Glitch] Fix OCR with delete & redraft
...
Port e7a7f88df7
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-11-30 17:36:49 +01:00
Thibaut Girka
2b7158427f
Merge branch 'master' into glitch-soc/merge-upstream
2019-11-30 17:29:44 +01:00
Thibaut Girka
93b8aec7b7
Link move target account
2019-11-27 17:37:01 +01:00
Thibaut Girka
93cb162d4a
Show acct of target account
2019-11-27 17:37:01 +01:00
Thibaut Girka
014c2cad21
Add moved account warning
2019-11-27 17:37:01 +01:00
Thibaut Girka
b25665d2e8
Do not consider moved accounts as non-functional
...
This might be somewhat controversial, but putting a redirection up
makes the account unusable, which works against use cases such as
using the moved account as backup in case the new one temporarily fails
(sure, the redirection can be temporarily removed, but it is a hassle)
2019-11-27 17:37:01 +01:00
ThibG
2448568d34
Merge pull request #1247 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-11-24 00:36:35 +01:00
ThibG
271b2e68f3
[Glitch] Fix blur behind closed registration message
...
Port SCSS changes from 42b3b019e0
to glitch flavour
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-11-23 19:08:46 +01:00
ThibG
962f485423
[Glitch] Change media description label to be context-sensitive
...
Port e86234b1e9
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-11-23 19:07:23 +01:00
Thibaut Girka
c0f7e21685
Merge branch 'master' into glitch-soc/merge-upstream
2019-11-23 19:03:01 +01:00
ThibG
55f5e81a9d
Merge pull request #1246 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-11-21 10:01:26 +01:00
Thibaut Girka
e87cc59811
Fix weird edge case in load_schema
2019-11-20 19:19:57 +01:00
Thibaut Girka
6b999411fc
Revert CircleCI and some webpack changes to match upstream
2019-11-20 18:05:24 +01:00
Thibaut Girka
d52e27f3db
Merge branch 'master' into glitch-soc/merge-upstream
2019-11-20 17:57:17 +01:00
ThibG
64225f4ac2
[Glitch] Fix unread toot indicator not honoring onlyMedia in public and community timelines
...
Port 0d6da8892a
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-11-20 17:56:35 +01:00
Thibaut Girka
1064a9d827
Override Migrator.new instead of Migrator#initialize, it's easier to understand
2019-11-20 17:31:22 +01:00
Thibaut Girka
33c2a7e23c
Add documentation about the migration hack
2019-11-20 17:18:00 +01:00
Thibaut Girka
6475525f31
Monkey-patch Rails' migrator to ignore duplicate migrations across Mastodon and glitch-soc
2019-11-20 17:03:25 +01:00
Thibaut Girka
ff67385cfb
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- README.md
discarded upstream changes
- app/controllers/api/v1/bookmarks_controller.rb
finally merged upstream, some code style fixes
and slightly changed pagination code
- app/controllers/application_controller.rb
changed upstream to always return HTML error pages
slight conflict caused by theming code
- app/models/bookmark.rb
finally merged upstream, no real conflict
- spec/controllers/api/v1/bookmarks_controller_spec.rb
finally merged upstream, slightly changed pagination code
2019-11-20 15:36:09 +01:00
ThibG
707c4918b2
Merge pull request #1243 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-11-07 21:15:22 +01:00
Thibaut Girka
04125c9c0d
Fix build with new sass-loader
2019-11-07 14:56:09 +01:00
Thibaut Girka
2c6d8ebf02
[Glitch] Minor improvements to poll composing UI
...
Port 7cdb8c10e9
to glitch-soc
2019-11-07 14:43:07 +01:00
ThibG
44acac0dcd
[Glitch] Fix WebUI allowing to upload more items than the limit
...
Port 66684c489c
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-11-07 14:31:53 +01:00
Thibaut Girka
83774367d2
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/mastodon/features/compose/components/poll_form.js`
conflict because of the poll option limit being different than upstream's
2019-11-07 13:43:56 +01:00
ThibG
dd2ec970db
Merge pull request #1242 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-11-07 13:41:56 +01:00
Thibaut Girka
f63dad5294
Change CircleCI config to build assets with NODE_ENV=test
...
This should avoid minimization and other expensive webpack
transformations which aren't useful for running tests.
2019-11-07 13:27:36 +01:00
Thibaut Girka
42dff261d6
Disable minimization in test environment
2019-11-07 13:16:10 +01:00
Thibaut Girka
84a27a08df
[Glitch] Fix notification message for own poll
...
Port a4301b5202
and be93318c05
to glitch-soc
2019-11-06 15:06:53 +01:00
Nolan Lawson
ec567337dc
[Glitch] fix: support KaiOS arrow navigation on public pages
...
Port 1e232e455c
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-11-06 14:59:57 +01:00
ThibG
734181c3bf
[Glitch] Fix filtered out items being counted as pending items
...
Port 3db3c10762
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-11-06 14:55:12 +01:00
Gabriel Rubens
d76ab55608
[Glitch] Use inert polyfill
...
Port 3cc9ff872f
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-11-06 14:52:22 +01:00
ThibG
ea55f70f97
[Glitch] Add support for submitting media description with ctrl+enter
...
Port 7488a9e154
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-11-06 14:50:54 +01:00
Hinaloe
f940c5a1fb
[Glitch] dont crash with null-ref
...
Port 8568018935
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-11-06 14:50:27 +01:00
Takeshi Umeda
f2fc7246e1
[Glitch] Fix an issue where polls with 'expires_at' not set expired
...
Port 5b46467474
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-11-06 14:49:43 +01:00
Thibaut Girka
0ae7d84273
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- `package.json`
2019-11-06 14:38:28 +01:00
ThibG
00793a86bc
Merge pull request #1240 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-10-28 16:25:55 +01:00
Thibaut Girka
046cd05a83
Fix download button icon color
2019-10-28 11:41:26 +01:00
ThibG
2ed48037ea
[Glitch] Replace fav icon animation with CSS
...
Port 3a929dbedd
to glitch-soc
And extend that to collapse button
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-10-27 21:10:24 +01:00
Nima Boscarino
bde35e7878
[Glitch] Add download button to audio and video players
...
Port 9b36f62df6
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-10-27 15:41:22 +01:00
Nima Boscarino
ebe34ed529
[Glitch] Unliking a post updates like count on front end
...
Port a9530e29a2
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-10-27 14:44:27 +01:00
ThibG
957eb4241a
[Glitch] Fix volume slider in chromium 🤷
...
Port bcf694dce7
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-10-27 14:42:44 +01:00
umonaca
dd810a9405
[Glitch] Improve swipe experience
...
Port f4be89e24d
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-10-27 14:41:37 +01:00
Hinaloe
9840e1ad75
[Glitch] don't show outline of full-screen video
...
Port 547a5bac9d
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-10-27 14:38:49 +01:00
ThibG
a4dc0d2c27
[Glitch] Fix batch actions being hidden from mobile view
...
Port SCSS changes from aa884e0484
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-10-27 14:37:17 +01:00
BSKY
59946f9231
[Glitch] Add noopener and/or noreferrer
...
Port fccf83e1f2
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-10-27 14:36:25 +01:00
dependabot-preview[bot]
4a0281d8c4
[Glitch] Bump react-select from 2.4.4 to 3.0.5
...
Port 183fc9d3cb
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-10-27 12:25:15 +01:00
Thibaut Girka
41a98b6543
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- README.md
- app/helpers/statuses_helper.rb
Upstream moved account helpers to their own file, we had extra
helpers there, moved too.
- app/lib/sanitize_config.rb
- app/models/user.rb
- app/serializers/initial_state_serializer.rb
- config/locales/simple_form.en.yml
- spec/lib/sanitize_config_spec.rb
2019-10-27 12:14:01 +01:00
Thibaut Girka
18c07738a6
Fix media components being cropped
2019-10-26 17:51:22 +02:00
Thibaut Girka
318362758b
Hide overflowing characters from reply indicator too
2019-10-26 17:51:22 +02:00
Thibaut Girka
a24b954baa
Avoid toot text bleeding out of the content div
2019-10-26 17:51:22 +02:00
Thibaut Girka
984fce613e
Change filter logic to keep filtered toots, but not mark them as unread
...
Keeping them in the TL fixes the front-end not being able to properly keep
track of pagination. Furthermore, filtered toots are not counted as unread
content, whether they are dropped or not.
2019-10-24 22:09:55 +02:00
Thibaut Girka
069e0520c9
Fix notification filters not applying to poll options
2019-10-17 11:43:58 +02:00
Thibaut Girka
003bb6ca1a
Refactor timeline filtering code
2019-10-17 11:43:58 +02:00
Thibaut Girka
b4046dc026
Drop filtered messages if the filter is “irreversible”
...
… instead of adding them to the timelines and then not showing them.
This fixes timelines showing new items when the only new items are
“irreversibly” filtered toots. This may be an edge case in Mastodon/glitch-soc,
but it is not in Pleroma, which does no filtering server-side whatsoever.
2019-10-17 11:43:58 +02:00
ThibG
fbe1de114f
Merge pull request #1236 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-10-11 22:58:31 +02:00
Thibaut Girka
10f1478498
Merge branch 'master' into glitch-soc/merge-upstream
2019-10-11 22:41:21 +02:00
ThibG
c2112c7781
[Glitch] Fix crash when switching back/from mobile layout
...
Port 91582937f3
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-10-11 22:40:52 +02:00
ThibG
ef925f31a6
Merge pull request #1233 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-10-11 22:28:11 +02:00
Eugen Rochko
877e8c9d79
[Glitch] Fix media editing modal changing dimensions when image loads
...
Port 6ebd74f4fa
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-10-10 21:00:13 +02:00
Eugen Rochko
4ee167d89b
[Glitch] Remove `lang` attribute from individual statuses
...
Port 538db85d3c
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-10-10 21:00:13 +02:00
trwnh
bd1eaad816
[Glitch] Add missing back button header for invalid account
...
Port 95f21ab87f
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-10-10 21:00:13 +02:00
Eugen Rochko
9ba67c6045
[Glitch] Fix performance of home feed regeneration
...
Port front-end changes from f665901e3c
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-10-10 21:00:13 +02:00
Thibaut Girka
b3dd0d276d
Increase poll option length limit to 100 chars, number of options to 5
2019-10-10 20:13:59 +02:00
Thibaut Girka
61631f4751
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- README.md
- app/javascript/styles/mastodon/components.scss
conflicts caused by image URLs being different
- app/models/status.rb
as_home_timeline removed, kept glitch-soc-only as_direct_timeline
- app/views/statuses/_simple_status.html.haml
- config/locales/en.yml
some strings were changed upstream
- spec/models/status_spec.rb
as_home_timeline removed, kept glitch-soc-only as_direct_timeline
2019-10-10 17:26:08 +02:00
Thibaut Girka
bc0399d54d
Ensure pack is set when rendering OTP prompt
...
Fixes #1230
2019-10-10 17:08:00 +02:00
ThibG
d2f7b8685c
Merge pull request #1229 from ThibG/glitch-soc/features/upstream-scroll-behavior
...
Merge upstream changes to scroll behavior in single column
2019-10-07 12:02:20 +02:00
Thibaut Girka
0fbe36e3fb
Partially revert scrollbar handling on mobile, since its width-based and wrong
...
Have to investigate as to whether it was actually needed on mobile, doesn't
seem to be the case from Firefox's Responsive Design Mode
2019-10-06 00:32:06 +02:00
Thibaut Girka
fe6864a73a
Apply scroll changes to Bookmark column
2019-10-06 00:32:06 +02:00
Eugen Rochko
bd54ee294a
[Glitch] Add refresh button to list of rebloggers/favouriters in web UI
...
Port b0323d0888
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-10-06 00:32:06 +02:00
Yamagishi Kazutoshi
7d79e1f31c
[Glitch] Do not add margin light when opening modal on mobile
...
Port 0a49b26793
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-10-06 00:32:06 +02:00
Eugen Rochko
4b181eba13
[Glitch] Fix left side of single column layout being cropped on smaller screens
...
Port 37ccafec8f
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-10-06 00:32:06 +02:00
Eugen Rochko
7fc6213bfe
[Glitch] Fix thread column showing pin button
...
Port 129bc871a0
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-10-06 00:32:06 +02:00
Eugen Rochko
0d42111671
[Glitch] Fix scroll position resetting when opening media modals in web UI
...
Port 50755a47b4
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-10-06 00:32:06 +02:00
Eugen Rochko
e7fd43c27c
[Glitch] Fix loading bar being obscured by other elements in web UI
...
Port 2b4e2616ea
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-10-06 00:32:06 +02:00
Eugen Rochko
90bdbddbfe
[Glitch] Fix scroll to top in single column UI
...
Port 2dee293c4c
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-10-06 00:32:06 +02:00
Eugen Rochko
fdadd520b1
[Glitch] Fix column header scrolling with the page
...
Port 706a48ee1f
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-10-05 22:53:20 +02:00
Eugen Rochko
3edb816eb0
[Glitch] Fix tabs bar scrolling along with content on mobile
...
Port 4cc29eb5ad
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-10-05 22:53:20 +02:00
ThibG
81b6ffa8f1
[Glitch] Fix scrolling in single-column mode on Chrome
...
Port fb1b710e8d
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-10-05 22:53:20 +02:00
Eugen Rochko
9e2e623ebe
[Glitch] Change single-column mode to scroll the whole page
...
Port aa22b38fdb
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-10-05 22:53:20 +02:00
ThibG
3921125e55
Merge pull request #1228 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-10-05 18:04:36 +02:00
Thibaut Girka
bc8543d9af
Fix audio modal closing immediately
2019-10-04 21:07:45 +02:00
Thibaut Girka
1bbba0016a
Merge tag 'v3.0.0' into glitch-soc/merge-upstream
2019-10-04 19:49:43 +02:00
Eugen Rochko
360234d1bf
[Glitch] Fix audio attachments opening in video modal from media tab in web UI
...
Port c9b8ba50f8
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-10-04 19:25:25 +02:00
Jeong Arm
c274774d06
[Glitch] Scroll into search bar when focus
...
Port 66fda37fd0
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-10-04 19:22:11 +02:00
Eugen Rochko
79388a52aa
[Glitch] Fix issues in RTL layout in web UI
...
Port 9184522cb4
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-10-04 19:16:41 +02:00
Eugen Rochko
7ca6153c0c
[Glitch] Fix media editing modal and profile directory in light theme
...
Port f51f99c3c2
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-10-04 19:12:54 +02:00
Jeong Arm
cd2fce0318
[Glitch] Fix drag and drop link to composebox
...
Port 3abe003f59
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-10-03 13:35:17 +02:00
Cutls
685b6e197f
[Glitch] Fix bad word breaking on conversations
...
Port 733a3d20b0
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-10-03 13:34:43 +02:00
ThibG
badf02891a
[Glitch] Fix typo in mute confirmation dialog
...
Port 559da46fd4
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-10-03 13:33:38 +02:00
ThibG
b3c19aa777
[Glitch] Fix custom emoji animation on hover in conversations view
...
Port 26a8c6fd2d
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-10-03 13:30:32 +02:00
ThibG
47f6d636e9
[Glitch] Fix missing propType for conversation delete
...
Port 541269f8bc
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-10-03 13:28:03 +02:00
Eugen Rochko
ff4b95a254
[Glitch] Fix long domain block descriptions breaking table layout
...
Port SCSS changes from c35376132b
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-10-03 13:20:13 +02:00
Eugen Rochko
bc4313369f
[Glitch] Fix delete conversation action not being reflected in web UI
...
Port 6faa98aee2
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-10-03 13:19:03 +02:00
Cutls
37246650d1
[Glitch] Fix and remove ugly css around the conversation component
...
Port 12c4ec0c83
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-10-03 13:18:08 +02:00
Thibaut Girka
a84aedb7a7
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/models/media_attachment.rb
Upstream raised max image size from 8MB to 10MB while our limit is
configurable. Raised the default to 10MB.
2019-10-03 11:10:12 +02:00
Thibaut Girka
857c67f31b
Fix new user confirmation page styling
2019-10-01 13:48:47 +02:00
ThibG
65db9df011
Merge pull request #1224 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-09-30 23:29:55 +02:00
Thibaut Girka
3b855b5c82
Improve styling of DM view in glitch-soc
2019-09-30 17:01:16 +02:00
Thibaut Girka
14f797873d
Fix menu in settings/admin pages
2019-09-30 17:01:16 +02:00
Cutls
ddee0dd382
[Glitch] Fix overflow on conversations
...
Port f31530b74d
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-30 17:01:16 +02:00
Eugen Rochko
13bc2cd4af
[Glitch] Change conversations UI
...
Port bc5678d015
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-30 17:01:16 +02:00
Thibaut Girka
4d6ef02203
Fix using wrong component in ColumnBackButtonSlim
2019-09-30 15:58:29 +02:00
ThibG
e5a50eda4c
[Glitch] Add voters count support
...
Port front-end changes from 3babf8464b
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-30 15:58:29 +02:00
koyu
1bfa9149ee
[Glitch] Change at icon in notification filter to reply-all
...
Port cfe2d1cc4a
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-30 15:58:29 +02:00
ThibG
88481c9653
[Glitch] Add explanation to mute dialog, refactor and clean up mute/block UI
...
Port 9027bfff0c
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-30 15:58:29 +02:00
ThibG
332be562ea
[Glitch] Change vote results to display ex-aequo leading options as leading
...
Port 15b3eeb326
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-30 15:58:29 +02:00
trwnh
ec244f6c88
[Glitch] Fix muted text color not applying to all text
...
Port d51201a75a
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-30 15:58:29 +02:00
Eugen Rochko
a2bf1f9f56
[Glitch] Fix follower/following lists resetting on back-navigation in web UI
...
Port 9683e1dcf8
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-30 15:58:29 +02:00
Eugen Rochko
15973b77d6
[Glitch] Fix public list of domain blocks being too verbose on about page
...
Port SCSS from bd9685f798
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-30 15:58:29 +02:00
ThibG
98cc81c0e2
[Glitch] Fix vote checkmark in poll results
...
Port b0cda7a504
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-30 15:58:29 +02:00
ThibG
8a63d659ac
[Glitch] Change silences to always require approval on follow
...
Port front-end changes from 18b451c0e6
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-30 15:58:29 +02:00
ThibG
0349c4d1cf
[Glitch] Avoid storing audio and video file data in memory
...
Port 860a77d45e
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-30 15:58:29 +02:00
ThibG
74af56b9cd
[Glitch] Use blob URL for Tesseract to avoid CORS issues
...
Port 7baedcb61e
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-30 15:58:29 +02:00
Eugen Rochko
4b7c436ae9
[Glitch] Fix emoji search not showing custom emoji when none are uncategorized
...
Port 0d2b60ab8b
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-30 15:58:29 +02:00
Eugen Rochko
5c9ba9177a
[Glitch] Revert "Change timelines to add new items to pending items when scrolled down #11867 "
...
Port 8c4b5f7cef
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-30 15:58:29 +02:00
ThibG
e25b7feb72
[Glitch] Show user what options they have voted
...
Port front-end changes from b359974d9b
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-30 15:58:29 +02:00
Jeong Arm
2441d07cd5
[Glitch] Fix ugly TOC when title is too long
...
Port 26b810561a
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-30 15:58:29 +02:00
Eugen Rochko
27f922168a
[Glitch] Fix page body not being scrollable in admin layout
...
Port SCSS changes from b9a8b38844
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-30 15:58:29 +02:00
Eugen Rochko
6c8fefb0c9
[Glitch] Fix placeholder colors for inputs not being explicitly defined
...
Port b6df9c1067
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-30 13:57:18 +02:00
Eugen Rochko
dbb8d9308b
[Glitch] Add table of contents to about page
...
Port SCSS changes from d930eb88b6
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-30 13:44:38 +02:00
Eugen Rochko
dd2a303a9b
[Glitch] Add password challenge to 2FA settings, e-mail notifications
...
Port SCSS changes from e1066cd431
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-30 13:43:06 +02:00
Eugen Rochko
40677e1793
[Glitch] Change unconfirmed user login behaviour
...
Port SCSS changes from 964ae8eee5
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-30 13:42:22 +02:00
Thibaut Girka
7fd54178d0
glitch-soc theme engine fixes for the challenges controller
2019-09-30 13:37:13 +02:00
Thibaut Girka
16ff7c5627
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- Gemfile
- Gemfile.lock
- app/controllers/about_controller.rb
- app/controllers/auth/sessions_controller.rb
2019-09-30 12:23:57 +02:00
ThibG
febcdad2e2
Merge pull request #1221 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-09-19 00:22:39 +02:00
nzws✨
2ecc7106d7
[Glitch] Fix eslint error of import/no-extraneous-dependencies
...
Port d0c2c52783
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-18 17:27:51 +02:00
ThibG
b840de580f
[Glitch] Fix “load more” adding older toots/notifications to pending items
...
Port 577706987d
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-18 17:27:51 +02:00
Yamagishi Kazutoshi
844e0fb48c
[Glitch] Check existence of timeline state in community timeline
...
Port 0627252b30
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-18 17:27:51 +02:00
ThibG
8b00cf519e
[Glitch] Change timelines to add new items to pending items when scrolled down
...
Port d256901f60
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-18 17:27:51 +02:00
Eugen Rochko
840c36f320
[Glitch] Fix web UI allowing uploads past status limit via drag & drop
...
Port bdeff5ae15
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-18 17:27:51 +02:00
ThibG
454b5ae3af
[Glitch] Fix poll options checkboxes/radio buttons not being vertically centered
...
Port d41494226d
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-18 17:27:51 +02:00
ThibG
75673cf8e3
[Glitch] Fix “slow mode” issues
...
Port f109867578
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-18 17:27:51 +02:00
ThibG
15a37a967c
[Glitch] Fix expiring polls not being displayed as such in the WebUI
...
Port 524187b653
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-18 17:27:26 +02:00
ThibG
8e699db334
[Glitch] Fix media description button being disabled at 420 characters instead of 1500
...
Port c00ab575b7
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-18 17:27:23 +02:00
Eugen Rochko
823df17e54
[Glitch] Fix profile fields overflowing page width
...
Port cfd4c55c88
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-18 17:27:20 +02:00
Thibaut Girka
0a1d9032f7
Fix build issues due to the “pt” locale being renamed to “pt-PT”
...
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-18 17:27:12 +02:00
Thibaut Girka
5cadb47238
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/controllers/auth/sessions_controller.rb
Minor conflict due to glitch-soc's theming code
2019-09-18 17:25:56 +02:00
Thibaut Girka
ab646fac5f
Fix composer dropdown toggle buttons (threaded mode and local-only) not working
2019-09-18 00:11:03 +02:00
Thibaut Girka
591185344e
Fix boost confirmation modal for description-less media not working
2019-09-17 21:46:36 +02:00
ThibG
221bb05cf8
Merge pull request #1219 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-09-15 14:45:24 +02:00
Thibaut Girka
b83e2df6b5
Fix tests being broken because of different default setting
2019-09-13 20:28:22 +02:00
Eugen Rochko
3665d554c5
[Glitch] Add timeline read markers API
...
Port e445a8af64
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-13 20:28:22 +02:00
Thibaut Girka
5477726f50
Fix upstream changes breaking because of glitch-soc's theming engine
2019-09-13 20:28:22 +02:00
Eugen Rochko
344e52ffbe
[Glitch] Change max length of media descriptions from 420 to 1500 characters
...
Port b6381bdc7d
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-13 18:38:37 +02:00
ThibG
eaf49439d1
[Glitch] Fix display of long poll options
...
Port cf2b708e6b
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-13 18:36:22 +02:00
Eugen Rochko
ef8c311a66
[Glitch] Fix unused CSS
...
Port 45f44ef4d3
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-13 18:36:00 +02:00
Eugen Rochko
c2843c5f62
[Glitch] Add batch actions and categories to admin UI for custom emojis
...
Port SCSS changes from 1110ea1a91
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-13 18:35:20 +02:00
ThibG
ffe8decb73
[Glitch] Add account bio to account admin view
...
Port SCSS changes from ec2a439a22
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-13 18:34:55 +02:00
Eugen Rochko
6809e37f8e
[Glitch] Add batch approve/reject for pending hashtags in admin UI
...
Port SCSS changes from 261e52268c
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-13 18:34:26 +02:00
Thibaut Girka
74c5b2bd08
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- Gemfile
- app/controllers/api/v1/search_controller.rb
Conflict because we changed the number of default results to be
configurable
- app/lib/settings/scoped_settings.rb
Addition of a new “noindex” site-wide setting,
conflict due to our change of the two other site-wide settings
(default flavour and skin instead of theme)
- spec/controllers/application_controller_spec.rb
Addition of a new “noindex” site-wide setting,
conflict due to our change of the two other site-wide settings
(default flavour and skin instead of theme)
2019-09-13 18:13:43 +02:00
Thibaut Girka
c7f71b974f
Fix flavour screenshot styling in vanilla flavour
2019-09-10 22:38:07 +02:00
Thibaut Girka
0e1291c888
Fix wrong icons from last refactoring
...
Fix regressions from f154d9d6e9
2019-09-10 14:56:08 +02:00
Thibaut Girka
2aa0cdf7e6
Use the `Icon` component instead of directly using `i` tag
2019-09-09 19:00:20 +02:00
Thibaut Girka
f154d9d6e9
Use upstream's Icon component
...
Rework the codebase to avoid unnecessary differences with upstream
2019-09-09 19:00:20 +02:00
Thibaut Girka
f2b307af25
Move “export” before decorators
...
As this is what upstream does.
See also https://github.com/tc39/proposal-decorators/issues/69
2019-09-09 18:36:43 +02:00
Rey Tucker
0014a32c19
glitch: fix webpack build failure in columns_area.js ( #1212 )
...
Fixes #1212 by copying what works in the mainline flavor.
2019-09-09 09:56:37 +02:00
ThibG
286bf110c3
Merge pull request #1211 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-09-06 12:06:59 +02:00
Eugen Rochko
4434e2eb7f
[Glitch] Fix line breaks in hashtag autosuggestions in web UI
...
Port 7db2c2e2ba
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-05 14:14:42 +02:00
Mostafa Ahangarha
bd0bde1da2
[Glitch] Exclude URLs from text analysis
...
Port e974d4923f
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-05 14:13:03 +02:00
Eugen Rochko
a869572aab
[Glitch] Fix wrong sum of usage in hashtag component in web UI
...
Port a6a63358c3
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-05 14:12:18 +02:00
Eugen Rochko
4907517db4
[Glitch] Fix wrong pluralization in hashtag component in web UI
...
Port 1a00bd9244
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-05 14:11:52 +02:00
Eugen Rochko
ca86858558
[Glitch] Change hashtag component in web UI to show numbers for 2 last days
...
Port d19d86fe2b
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-05 14:02:54 +02:00
Eugen Rochko
b86292af33
[Glitch] Fix uncached media in web UI not being clickable
...
Port 34adc8784a
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-05 14:02:04 +02:00
mayaeh
dea2b234c9
[Glitch] Integrate translation strings for the Profile Directory.
...
Port 1f22b8197c
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-05 13:55:14 +02:00
ThibG
7db6cb93f3
[Glitch] Fix Mastodon logo style on hover on public pages' footer
...
Port 0ea53122f2
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-05 13:53:23 +02:00
ThibG
96b9d3333d
[Glitch] Fix height of dashboard counters
...
Port 6493f4ffae
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-05 13:52:53 +02:00
ThibG
2f952f6d04
[Glitch] Fix custom emoji animation on hover in WebUI directory bios
...
Port 34eac5a1ec
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-05 13:52:07 +02:00
Eugen Rochko
23c513846a
[Glitch] Add "not available" label on unknown media attachments
...
Port d344289431
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-05 13:06:41 +02:00
Thibaut Girka
5088eb8388
Merge branch 'master' into glitch-soc/merge-upstream
2019-09-05 11:36:41 +02:00
Thibaut Girka
0128509605
Fix loading more items in account following/followers
2019-09-04 17:58:31 +02:00
Eugen Rochko
ce182efd68
[Glitch] Add header to trends section and change refresh rate to 15 minutes
...
Port 4ef8d8b77c
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-02 10:57:44 +02:00
ThibG
12c188f533
[Glitch] Restore hashtag suggestions from local tag history
...
Port 5ab1e0e738
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-02 10:57:44 +02:00
ThibG
e1810eed8e
[Glitch] Fix trending hashtags being fetched every 36 seconds instead of every hour ( #11631 )
...
Port d857d0d14d
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-02 10:57:44 +02:00
Thibaut Girka
b30a7f5120
Fix trending hashtags spacing in single-column mode
2019-09-02 10:57:44 +02:00
Eugen Rochko
34eff39936
[Glitch] Add trends to public pages sidebar
...
Port c6b4b923e6
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-02 10:57:44 +02:00
Eugen Rochko
717f3998c0
[Glitch] Fix hashtag autosuggestions line breaks for long suggestions
...
Port cd660d374a
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-02 10:57:44 +02:00
Sasha Sorokin
771b01e785
[Glitch] Fix trending counter width
...
Port a5a5a0adec
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-02 10:57:44 +02:00
Eugen Rochko
8b630f7e54
[Glitch] Add trends UI with admin and user settings
...
Port 9072fe5ab6
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-02 10:57:44 +02:00
Eugen Rochko
3c70fb9146
[Glitch] Fix emoji autosuggestions
...
Port 784c88e16d
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-02 10:57:44 +02:00
Thibaut Girka
be8b0e8d06
Refactor SCSS to better match upstream
2019-09-02 10:57:44 +02:00
Eugen Rochko
3380e96449
[Glitch] Add autosuggestions for hashtags
...
Port cfb2ed7823
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-02 10:57:44 +02:00
ThibG
147e90f35d
Merge pull request #1209 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-08-31 19:44:47 +02:00
Thibaut Girka
ef270ed0df
Properly hide follower count in profile directory
2019-08-31 18:23:24 +02:00
Thibaut Girka
3619e904da
Fix auto-added media icons when a CW is set but no content text
2019-08-31 18:23:24 +02:00
Thibaut Girka
e519b47da6
Update backend links and fix hardcoded ones
2019-08-31 18:23:24 +02:00
Thibaut Girka
682cfbb829
Fix imports importing modules from vanilla flavour instead of glitch
2019-08-31 18:23:24 +02:00
Eugen Rochko
cd46099e49
[Glitch] Change layout of public profile directory to be the same as in web UI
...
Port 9871904172
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-08-31 18:23:24 +02:00
Eugen Rochko
7fe2120dd5
[Glitch] Add profile directory to web UI
...
Port cb447b28c4
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-08-31 18:23:23 +02:00
ThibG
759448c24c
[Glitch] Change detailed status child ordering to sort self-replies on top
...
Port 6914482d0a
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-08-30 13:45:46 +02:00
Thibaut Girka
9044a2b051
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/views/directories/index.html.haml
Upstream has redesigned the profile directory, and we
had a glitch-soc-specific change to hide follower counts.
Ported that change to the new design.
2019-08-30 13:38:41 +02:00
ThibG
2848c08953
Merge pull request #1208 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-08-30 00:18:08 +02:00
Thibaut Girka
969d043851
Merge branch 'master' into glitch-soc/merge-upstream
2019-08-29 20:53:51 +02:00
Thibaut Girka
f3ac4a4411
Fix clicking on the new audioplayer opening the toot in detailed view
2019-08-29 17:32:22 +02:00
ThibG
6ee2501991
[Glitch] Change window resize handler to switch to/from mobile layout as soon as needed
...
Port bd4099d976
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-08-29 17:32:22 +02:00
Eugen Rochko
b90bd31cfd
[Glitch] Fix more visual issues with the audio player
...
Port 2e99e3cab3
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-08-29 17:32:22 +02:00
Eugen Rochko
84d4d75c91
[Glitch] Fix public page crash due to audio player, fix unpause in audio player
...
Port e72bac7576
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-08-29 17:32:22 +02:00
Eugen Rochko
3aeaf9b897
[Glitch] Add audio player
...
Port 4190e31626
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-08-29 17:32:22 +02:00
ThibG
04de74c992
[Glitch] Add special alert for throttled requests
...
Port 81f864d4da
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-08-29 17:32:22 +02:00
ThibG
f11e9d5524
[Glitch] Add confirmation modal when logging out from the web app
...
Port fd3d45d38f
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-08-29 17:32:22 +02:00
Thibaut Girka
7c22e32562
Remove sign out link from getting started columns, as it is already in the footer
2019-08-29 14:56:40 +02:00
Thibaut Girka
48b8a1f414
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/models/status.rb
- app/services/remove_status_service.rb
- db/schema.rb
All conflicts were due to the addition of a `deleted_at` attribute
to Statuses and reworked database indexes.
2019-08-29 12:07:50 +02:00
Thibaut Girka
79725f659d
Fix crashes from favico.js crashing the entire web app
2019-08-29 12:03:05 +02:00
Thibaut Girka
956c1cf82a
Refactor the Columns Area code to be closer to upstream
2019-08-29 12:02:20 +02:00
Thibaut Girka
3282bbe454
Add option to rewrite mentions to mentioned user's username or acct
...
Fixes #666
2019-08-29 11:59:29 +02:00
ThibG
284a1562fb
Fix typo
2019-08-20 21:44:09 +02:00
Haelwenn (lanodan) Monnier
317fa43d9a
Add support for <sup> formatting element
...
This is based of 3e095cab83
Related: https://git.pleroma.social/pleroma/pleroma/issues/1191
2019-08-20 21:44:09 +02:00
ThibG
da7e0d4f55
Merge pull request #1200 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-08-20 21:33:57 +02:00
ThibG
f1528ea3c4
[Glitch] Fix handling of audio files in account media gallery
...
Port b48c7ee059
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-08-20 20:38:42 +02:00
Thibaut Girka
81d2d71094
Merge branch 'master' into glitch-soc/merge-upstream
2019-08-20 20:30:44 +02:00
ThibG
bce46f2057
Merge pull request #1199 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-08-20 12:09:11 +02:00
Thibaut Girka
fae9e34484
Add button to edit media description from missing description confirmation dialog
2019-08-20 11:33:35 +02:00
Thibaut Girka
dff4ccd7e9
Remove code for giving focus to first media without description
...
Since the textarea is in a modal, now…
2019-08-20 10:55:03 +02:00
Thibaut Girka
df150da435
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- config/initializers/content_security_policy.rb
(took our version)
2019-08-20 10:33:24 +02:00
Thibaut Girka
1d40325e7c
Fix composer options colors in glitch-soc light theme
2019-08-19 22:18:43 +02:00
Thibaut Girka
9e17f9e95a
Fix connect-src policy for Tesseract
2019-08-19 22:02:35 +02:00
Thibaut Girka
f00a0f35ee
Use public pack in about controller to handle blockpage JS
2019-08-19 21:56:25 +02:00
Thibaut Girka
a334cbcb20
Move character counter to the options box to match upstream styling
2019-08-19 21:56:25 +02:00
Thibaut Girka
ed4317b549
[Glitch] Fix hidden statuses losing focus
...
Port 0d13a9cd13
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-08-19 21:56:25 +02:00
ThibG
ab0961fe9a
[Glitch] Improve focal point modal on mobile
...
Port 2ca6b2bb6c
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-08-19 21:56:25 +02:00
ThibG
fcd2244015
[Glitch] Allow clicking behind preview
...
Port d37126fd03
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-08-19 21:56:25 +02:00
Eugen Rochko
91d968bf72
[Glitch] Fix edit media modal on small screens, touch events
...
Port 1bea318197
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-08-19 21:56:25 +02:00
Eugen Rochko
5c35c9c409
[Glitch] Fix tesseract.js being part of the common chunk
...
Port dfe6059889
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-08-19 21:56:25 +02:00
Eugen Rochko
41c7fec796
[Glitch] Add OCR tool to media editing modal
...
Port 28636f43e4
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-08-19 21:56:25 +02:00
Thibaut Girka
066034c62e
Refactor character counter to match upstream
2019-08-19 21:56:25 +02:00
Eugen Rochko
ab019800f8
[Glitch] Add media editing modal
...
Port 23f7afa562
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-08-19 21:56:25 +02:00
Eugen Rochko
f8e7c69861
[Glitch] Add explanation to featured hashtags page and profile
...
Port SCSS changes from b348c9b0db
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-08-19 21:56:25 +02:00
ThibG
5971ea7466
[Glitch] Add public blocks to /about/blocks
...
Port SCSS changes from 9b6a5ed109
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-08-19 21:56:25 +02:00
ThibG
4e9794f533
[Glitch] Fix client-side resizing of image uploads
...
Port f178a01c11
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-08-19 21:49:39 +02:00
Eugen Rochko
26b249ad2d
[Glitch] Fix short number formatting for numbers above million in web UI
...
Port 0e9668051e
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-08-19 21:49:39 +02:00
Thibaut Girka
1488be7d96
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/controllers/home_controller.rb
- app/controllers/shares_controller.rb
- app/javascript/packs/public.js
- app/models/status.rb
- app/serializers/initial_state_serializer.rb
- app/views/home/index.html.haml
- app/views/layouts/public.html.haml
- app/views/public_timelines/show.html.haml
- app/views/shares/show.html.haml
- app/views/tags/show.html.haml
- config/initializers/content_security_policy.rb
- config/locales/en.yml
- config/webpack/shared.js
- package.json
2019-08-19 21:49:35 +02:00
Thibaut Girka
b859eb0017
Honor `system_emoji_font` in the Emoji Picker
2019-08-12 23:01:37 +02:00
Thibaut Girka
597ea5687a
Add option to disable emoji replacements
...
Fixes #647
The option is found in `/settings` (because that was easier to write it this
way) but only affects the glitch-soc front-end.
2019-08-12 23:01:37 +02:00
ThibG
cf421bafdf
Merge pull request #1196 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-08-12 23:01:19 +02:00
Thibaut Girka
cfca28bc87
Merge branch 'master' into glitch-soc/merge-upstream
2019-08-12 18:01:21 +02:00
Eugen Rochko
42588ed460
[Glitch] Fix "cancel follow request" button having unreadable text in web UI
...
Port e823b49214
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-08-12 16:49:12 +02:00
Thibaut Girka
c4ae7aab6f
Merge branch 'master' into glitch-soc/merge-upstream
2019-08-12 16:24:22 +02:00
ThibG
aa485d6f05
Merge pull request #1194 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-08-08 09:25:00 +02:00
Thibaut Girka
9b8edbea5b
Fix domain block edition in glitch-soc
2019-08-08 09:14:20 +02:00
Thibaut Girka
ebc0521ba8
Merge branch 'master' into glitch-soc/merge-upstream
2019-08-08 08:44:33 +02:00
ThibG
86cfa2ea6c
Merge pull request #1193 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-08-07 20:04:22 +02:00
Eugen Rochko
e8ad0a8006
[Glitch] Fix hashtag links always being lowercase
...
Port 5e35aa8280
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-08-07 15:35:44 +02:00
ThibG
e8e980cdac
[Glitch] Improve focus handling with dropdown menus
...
Port 396b8cdd0f
to glitch-soc
2019-08-07 15:11:59 +02:00
Thibaut Girka
95fc39a1e6
Merge branch 'master' into glitch-soc/merge-upstream
2019-08-07 15:07:04 +02:00
Thibaut Girka
04534604c6
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/models/user.rb
- app/serializers/initial_state_serializer.rb
- app/views/admin/dashboard/index.html.haml
- config/locales/simple_form.en.yml
2019-08-07 13:56:48 +02:00
ThibG
8400ddca71
Merge pull request #1191 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-08-06 17:25:54 +02:00
Thibaut Girka
d10f6036cf
Implement keyboard navigation in glitch-soc composer
2019-08-06 16:36:18 +02:00
Thibaut Girka
6d2b0fa3f0
Refactor composer Dropdown's component a bit to make it closer to upstream
2019-08-06 15:09:30 +02:00
ThibG
381dbb6569
[Glitch] Fix image uploads being perfectly white when canvas read access is blocked
...
Port 111a0628fc
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-08-06 15:09:30 +02:00
ThibG
a4b15e2cf0
[Glitch] Port changes to IconButton
...
Port changes to IconButton from 27a0d02d0d
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-08-06 15:09:30 +02:00
ThibG
fe1de4e49b
[Glitch] Improve dropdown menu keyboard navigation
...
Port a12f1a0baf
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-08-06 15:09:30 +02:00
ThibG
6afdb6c2b6
[Glitch] Trap tab in modals
...
Port 5c73746b69
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-08-06 15:09:30 +02:00
Thibaut Girka
cad2e6eb7a
Merge branch 'master' into glitch-soc/merge-upstream
2019-08-06 13:16:53 +02:00
Thibaut Girka
3ea7a334d8
Fix up try/catch block in invalid URL handling
2019-08-06 13:09:49 +02:00
Thibaut Girka
cbd75fe128
Remove href attribute of invalid links instead of crashing
2019-08-06 12:32:06 +02:00
ThibG
0aee74d78a
Merge pull request #1187 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-08-05 17:58:39 +02:00
Thibaut Girka
68eb58b805
Fix color of dropdown icons
2019-08-05 14:25:48 +02:00
ThibG
f02ffce249
[Glitch] Change icon button styles to make hover/focus states more obvious
...
Port c8fd823327
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-08-05 14:20:21 +02:00
ThibG
8b57d704dc
[Glitch] Disable list title validation button when list title is empty
...
Port 089c641020
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-08-05 13:22:27 +02:00
Thibaut Girka
e50554391a
Merge branch 'master' into glitch-soc/merge-upstream
2019-08-05 13:13:28 +02:00
Thibaut Girka
ff0ceb28b3
Remove link rewriting option as it is easily bypassable
2019-08-04 22:25:56 +02:00
Thibaut Girka
76b80a1511
Perform case-insensitive comparison for international domain names
...
Note: this uses `toLowerCase()` instead of doing proper case folding
2019-08-04 22:25:56 +02:00
Thibaut Girka
43b137e1f9
Perform case-insensitive comparison of non-International domain names
2019-08-04 22:25:56 +02:00
Thibaut Girka
a0b6f1665a
Make link target domain tag just a bit smaller
2019-08-04 22:25:56 +02:00
Thibaut Girka
c01de0f721
Ensure link rewriting setting changes are immediately applied
2019-08-04 22:25:56 +02:00
Thibaut Girka
6600da0f7b
Handle Mastodon-generated links for targets starting with “www.” properly
2019-08-04 22:25:56 +02:00
Thibaut Girka
df866a464d
Add options to highlight misleading links in statuses
...
Fixes #1162
2019-08-04 22:25:56 +02:00
Thibaut Girka
49a28e69a5
Move decodeIDNA to app/javascript/flavours/glitch/util
2019-08-04 22:25:56 +02:00
ThibG
4ecfa8f298
Merge pull request #1183 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-07-30 15:40:28 +02:00
ThibG
d8097ecd2f
[Glitch] Fix crash when expanding search results for hashtags
...
Port 78144f4c79
to glitch-soc
2019-07-30 12:31:02 +02:00
Thibaut Girka
24968d20a0
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/controllers/directories_controller.rb
- package.json
- yarn.lock
2019-07-30 12:22:33 +02:00
ThibG
f48c7689d2
Merge pull request #1179 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-07-29 23:37:14 +02:00
Thibaut Girka
a4a81c5434
Fix crash in /web/lists
...
Fixes #1181
2019-07-29 00:34:39 +02:00
Eugen Rochko
51411267fd
[Glitch] Add search results pagination to web UI ( #11409 )
...
Port 8a4674f2c3
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-07-28 17:10:52 +02:00
ThibG
7f147acea6
[Glitch] Change contrast of status links that are not mentions nor hashtags
...
Port 10e78ecf57
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-07-28 16:47:36 +02:00
Eugen Rochko
31fc3be0a4
[Glitch] Change account domain block to clear out notifications and follows
...
Port 4eeff26533
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-07-28 16:45:36 +02:00
Thibaut Girka
bca3825c17
Merge branch 'master' into glitch-soc/merge-upstream
2019-07-28 16:28:05 +02:00
Thibaut Girka
91da921dbb
Fix links in status media having their title rewritten
2019-07-24 21:46:09 +02:00
ThibG
88e79c179a
Merge pull request #1176 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-07-24 16:53:25 +02:00
Thibaut Girka
2d35e4460a
Merge branch 'master' into glitch-soc/merge-upstream
2019-07-24 16:23:53 +02:00
Thomas Citharel
e3a551cbd1
Fix tootctl statuses remove
...
A ending parenthesis was missing in the bookmark special line.
2019-07-24 15:55:39 +02:00
ThibG
08325db62b
Merge pull request #1174 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-07-23 17:21:55 +02:00
Thibaut Girka
48c68eafb7
Handle animated emoji on mouse hover in CWs and poll options
2019-07-23 16:24:21 +02:00
ThibG
c1231a846a
[Glitch] Play animated custom emoji on hover
...
Port 7de8c51873
to glitch-soc
2019-07-23 16:24:21 +02:00
Thibaut Girka
621590b4ab
Refactor DisplayName component to make it closer to upstream
2019-07-23 10:51:12 +02:00
Thibaut Girka
cd8763b600
[Glitch] Display custom emoji in bio field names
...
Port 4bd58b7f2d
to glitch-soc
2019-07-23 10:51:12 +02:00
Thibaut Girka
8a89a2b0f4
Revert some refactoring in order to make codebase closer to upstream
2019-07-23 10:51:12 +02:00
Thibaut Girka
444796b69b
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/controllers/application_controller.rb
- app/controllers/auth/confirmations_controller.rb
- app/controllers/auth/sessions_controller.rb
- app/controllers/settings/deletes_controller.rb
- app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb
2019-07-23 10:51:07 +02:00
Thibaut Girka
6db5669818
Clean up redundant shouldUpdateScroll definitions
2019-07-21 20:57:42 +02:00
Eugen Rochko
e58af04287
[Glitch] Fix mutes, blocks, domain blocks and follow requests not paginating
...
Port ea7ad59af2
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-07-21 20:57:42 +02:00
ThibG
bd7b1538f1
[Glitch] Fix followers and followings on account profiles
...
Partial fix from 55abff8af7
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-07-21 20:57:42 +02:00
Jakub Mendyk
c614abb95d
[Glitch] Fix followers/follows layout issues from #8418
...
Port ceed1ebe5b
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-07-21 20:57:42 +02:00
Thibaut Girka
b294b5956b
Add empty column message to bookmarks column
2019-07-21 20:57:42 +02:00
Jakub Mendyk
e9f88f4005
[Glitch] Add messages informing that collections are empty
...
Port 5129f6f2aa
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-07-21 20:57:42 +02:00
ThibG
f1597e1ab9
Merge pull request #1158 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-07-21 00:53:28 +02:00
Lady Lumb
19c3a941e8
Added max search results var to sample env
...
Added and documented MAX_SEARCH_RESULTS to the .env.production.sample file
2019-07-20 16:39:48 +02:00
Lady Lumb
0ed0c77266
Add env variable to control search limit
...
Changed the default search limit to allow a variable called MAX_SEARCH_RESULTS in the .env.production file to change the maximum search results limit.
2019-07-20 16:39:48 +02:00
Thibaut Girka
055450bc02
Merge branch 'master' into glitch-soc/merge-upstream
2019-07-19 23:37:41 +02:00
Thibaut Girka
86d4461948
Fix HTML entities being encoded as hashtag links…
2019-07-19 20:15:03 +02:00
Thibaut Girka
249b7c7c12
Fix filtering behaviors
2019-07-19 19:21:20 +02:00
Thibaut Girka
3407ae8683
Fix sanitizer text case for glitch-soc, which preserves lists
2019-07-19 19:16:07 +02:00
ThibG
490cf3aa03
[Glitch] Add ActivityPub actor representing the entire server
...
Port SCSS changes from 730c4053d6
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-07-19 18:35:45 +02:00
Eugen Rochko
bf3ab44e77
Remove Atom feeds and old URLs in the form of `GET /:username/updates/:id`
...
Port SCSS changes from b851456139
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-07-19 18:27:26 +02:00
Thibaut Girka
249991c498
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- Gemfile.lock
- app/controllers/accounts_controller.rb
- app/controllers/admin/dashboard_controller.rb
- app/controllers/follower_accounts_controller.rb
- app/controllers/following_accounts_controller.rb
- app/controllers/remote_follow_controller.rb
- app/controllers/stream_entries_controller.rb
- app/controllers/tags_controller.rb
- app/javascript/packs/public.js
- app/lib/sanitize_config.rb
- app/models/account.rb
- app/models/form/admin_settings.rb
- app/models/media_attachment.rb
- app/models/stream_entry.rb
- app/models/user.rb
- app/serializers/initial_state_serializer.rb
- app/services/batched_remove_status_service.rb
- app/services/post_status_service.rb
- app/services/process_mentions_service.rb
- app/services/reblog_service.rb
- app/services/remove_status_service.rb
- app/views/admin/settings/edit.html.haml
- config/locales/simple_form.pl.yml
- config/settings.yml
- docker-compose.yml
2019-07-19 18:26:49 +02:00
Thibaut Girka
f170e0492f
Fix timestamp display in boost/fav modals in RTL locales
2019-07-18 20:56:20 +02:00
Thibaut Girka
4c28511e4e
Fixups
2019-07-18 20:56:20 +02:00
Thibaut Girka
45cee95b14
Public pages RTL fixes
2019-07-18 20:56:20 +02:00
Thibaut Girka
c1752b238f
Unfiy status__prepend with upstream
2019-07-18 20:56:20 +02:00
Thibaut Girka
b021efdefe
RTL fixes
2019-07-18 20:56:20 +02:00
Thibaut Girka
964c78c118
Fix some SCSS for RTL behavior
2019-07-18 20:56:20 +02:00
Thibaut Girka
4199f7fd87
Minor fixup
2019-07-18 20:56:20 +02:00
Eugen Rochko
b743308928
[Glitch] Fix RTL layout of status display names
...
Port d723f2a0a8
to glitch-soc
2019-07-18 20:56:20 +02:00
Masoud Abkenar
bcaea5a9e9
[Glitch] RTL: fix settings button margins in column headers
...
Port ef11347281
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-07-18 20:56:20 +02:00
Thibaut Girka
fabfa90e6c
Make width breakpoint for removing margins consistent and match upstream
...
Fixes #1136
2019-07-18 20:55:38 +02:00
Thibaut Girka
20520e6158
When cleaning up remote statuses, keep bookmarked ones
2019-07-18 13:34:54 +02:00
Thibaut Girka
6ff285d948
Fix *another* typo and crash in StatusIcons
2019-07-18 09:54:59 +02:00
Thibaut Girka
a2df11ebaf
Fix typo and crash in StatusIcons
2019-07-18 09:42:22 +02:00
Thibaut Girka
46687a3cbd
Shorten status icon tooltip text
2019-07-17 21:35:34 +02:00
Thibaut Girka
572009cf56
Add status icon for local-only toots
2019-07-17 21:35:34 +02:00
Thibaut Girka
7db7cb31b1
Add tooltips to status icons
2019-07-17 21:35:34 +02:00
ThibG
e9cc17bbea
Merge pull request #1164 from ThibG/glitch-soc/cherry-pick-upstream
...
Cherry-pick changes from upstream
2019-07-17 16:56:10 +02:00
Eugen Rochko
e91bf82083
[Glitch] Add option to disable real-time updates in web UI
...
Port 729723f857
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-07-16 16:51:08 +02:00
Daigo 3 Dango
c8a47595fb
Make puma bind address configurable with BIND env var ( #11326 )
2019-07-16 16:12:01 +02:00
Eugen Rochko
729723f857
Add option to disable real-time updates in web UI ( #9984 )
...
Fix #9031
Fix #7913
2019-07-16 16:11:50 +02:00
dependabot-preview[bot]
3598305460
Bump eslint-plugin-jsx-a11y from 6.2.1 to 6.2.3 ( #11314 )
...
Bumps [eslint-plugin-jsx-a11y](https://github.com/evcohen/eslint-plugin-jsx-a11y ) from 6.2.1 to 6.2.3.
- [Release notes](https://github.com/evcohen/eslint-plugin-jsx-a11y/releases )
- [Changelog](https://github.com/evcohen/eslint-plugin-jsx-a11y/blob/master/CHANGELOG.md )
- [Commits](https://github.com/evcohen/eslint-plugin-jsx-a11y/compare/v6.2.1...v6.2.3 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-07-16 16:10:20 +02:00
dependabot-preview[bot]
bb7f3e4112
Bump webpack from 4.34.0 to 4.35.3 ( #11309 )
...
Bumps [webpack](https://github.com/webpack/webpack ) from 4.34.0 to 4.35.3.
- [Release notes](https://github.com/webpack/webpack/releases )
- [Commits](https://github.com/webpack/webpack/compare/v4.34.0...v4.35.3 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-07-16 16:10:20 +02:00
dependabot-preview[bot]
22f1ec1b1e
Bump lodash from 4.17.13 to 4.17.14 ( #11312 )
...
Bumps [lodash](https://github.com/lodash/lodash ) from 4.17.13 to 4.17.14.
- [Release notes](https://github.com/lodash/lodash/releases )
- [Commits](https://github.com/lodash/lodash/compare/4.17.13...4.17.14 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-07-16 16:10:20 +02:00
dependabot-preview[bot]
3a1e124f5a
Bump @babel/runtime from 7.4.5 to 7.5.4 ( #11315 )
...
Bumps [@babel/runtime](https://github.com/babel/babel ) from 7.4.5 to 7.5.4.
- [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.5...v7.5.4 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-07-16 16:10:19 +02:00
dependabot-preview[bot]
f0d288619c
Bump eslint-plugin-import from 2.17.3 to 2.18.0 ( #11310 )
...
Bumps [eslint-plugin-import](https://github.com/benmosher/eslint-plugin-import ) from 2.17.3 to 2.18.0.
- [Release notes](https://github.com/benmosher/eslint-plugin-import/releases )
- [Changelog](https://github.com/benmosher/eslint-plugin-import/blob/master/CHANGELOG.md )
- [Commits](https://github.com/benmosher/eslint-plugin-import/compare/v2.17.3...v2.18.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-07-16 16:10:19 +02:00
Eugen Rochko
be053560e9
Change default interface of web and streaming from 0.0.0.0 to 127.0.0.1 ( #11302 )
2019-07-16 16:10:19 +02:00
ThibG
5ccd011cc3
Merge pull request #1161 from ThibG/glitch-soc/cherry-pick-upstream
...
Cherry pick changes from upstream
2019-07-15 01:04:31 +02:00
PatOnTheBack
3ad8c9ea61
Bump handlebars from 4.1.0 to 4.1.2 ( #11293 )
...
Bumps [handlebars](https://github.com/wycats/handlebars.js ) from 4.1.0 to 4.1.2.
- [Release notes](https://github.com/wycats/handlebars.js/releases )
- [Changelog](https://github.com/wycats/handlebars.js/blob/master/release-notes.md )
- [Commits](https://github.com/wycats/handlebars.js/compare/v4.1.0...v4.1.2 )
Signed-off-by: dependabot[bot] <support@github.com>
2019-07-15 00:48:50 +02:00
dependabot-preview[bot]
18d2eeeb38
Bump rubocop-rails from 2.0.1 to 2.2.0 ( #11257 )
...
Bumps [rubocop-rails](https://github.com/rubocop-hq/rubocop-rails ) from 2.0.1 to 2.2.0.
- [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.0.1...v2.2.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-07-15 00:48:50 +02:00
han@highemelry
0442fcdbc8
Change the retry limit in error of web push notification ( #11292 )
...
- Change the maximum count of retry for web push notification (Default -> 5).
- In case of high load of subscribe server, the retries will be repeated many times.
- Because the retries occupy the default queue, maximum retry count should be reduced.
2019-07-15 00:48:50 +02:00
ThibG
99c1f0811b
Fix BlockService trying to reject incorrect follow request ( #11288 )
...
Fixes #11148
2019-07-15 00:48:50 +02:00
dependabot-preview[bot]
9521cacd40
[Security] Bump lodash from 4.17.11 to 4.17.13 ( #11287 )
...
Bumps [lodash](https://github.com/lodash/lodash ) from 4.17.11 to 4.17.13. **This update includes security fixes.**
- [Release notes](https://github.com/lodash/lodash/releases )
- [Commits](https://github.com/lodash/lodash/compare/4.17.11...4.17.13 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-07-15 00:48:50 +02:00
ThibG
9f67e3b9cc
Fix Status.remote scope matching *all* statuses ( #11265 )
2019-07-15 00:48:50 +02:00
dependabot-preview[bot]
c40d47b8e0
Bump faker from 1.9.3 to 1.9.6 ( #11259 )
...
Bumps [faker](https://github.com/stympy/faker ) from 1.9.3 to 1.9.6.
- [Release notes](https://github.com/stympy/faker/releases )
- [Changelog](https://github.com/stympy/faker/blob/master/CHANGELOG.md )
- [Commits](https://github.com/stympy/faker/compare/v1.9.3...1.9.6 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-07-15 00:48:50 +02:00
dependabot-preview[bot]
2f441876c7
Bump simplecov from 0.16.1 to 0.17.0 ( #11260 )
...
Bumps [simplecov](https://github.com/colszowka/simplecov ) from 0.16.1 to 0.17.0.
- [Release notes](https://github.com/colszowka/simplecov/releases )
- [Changelog](https://github.com/colszowka/simplecov/blob/master/CHANGELOG.md )
- [Commits](https://github.com/colszowka/simplecov/compare/v0.16.1...v0.17.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-07-15 00:48:50 +02:00
dependabot-preview[bot]
23978df143
Bump aws-sdk-s3 from 1.43.0 to 1.45.0 ( #11262 )
...
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby ) from 1.43.0 to 1.45.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.43.0...v1.45.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-07-15 00:48:50 +02:00
dependabot-preview[bot]
4ea8f2189c
Bump tzinfo-data from 1.2019.1 to 1.2019.2 ( #11258 )
...
Bumps [tzinfo-data](https://github.com/tzinfo/tzinfo-data ) from 1.2019.1 to 1.2019.2.
- [Release notes](https://github.com/tzinfo/tzinfo-data/releases )
- [Commits](https://github.com/tzinfo/tzinfo-data/compare/v1.2019.1...v1.2019.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-07-15 00:48:50 +02:00
dependabot-preview[bot]
16340cb6ef
Bump eslint-plugin-react from 7.12.1 to 7.14.2 ( #11253 )
...
Bumps [eslint-plugin-react](https://github.com/yannickcr/eslint-plugin-react ) from 7.12.1 to 7.14.2.
- [Release notes](https://github.com/yannickcr/eslint-plugin-react/releases )
- [Changelog](https://github.com/yannickcr/eslint-plugin-react/blob/master/CHANGELOG.md )
- [Commits](https://github.com/yannickcr/eslint-plugin-react/compare/v7.12.1...v7.14.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-07-15 00:48:50 +02:00
dependabot-preview[bot]
9699506dc4
Bump @babel/plugin-proposal-class-properties from 7.4.4 to 7.5.0 ( #11254 )
...
Bumps [@babel/plugin-proposal-class-properties](https://github.com/babel/babel ) from 7.4.4 to 7.5.0.
- [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.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-07-15 00:48:50 +02:00
dependabot-preview[bot]
ed43922483
Bump compression-webpack-plugin from 2.0.0 to 3.0.0 ( #11224 )
...
Bumps [compression-webpack-plugin](https://github.com/webpack-contrib/compression-webpack-plugin ) from 2.0.0 to 3.0.0.
- [Release notes](https://github.com/webpack-contrib/compression-webpack-plugin/releases )
- [Changelog](https://github.com/webpack-contrib/compression-webpack-plugin/blob/master/CHANGELOG.md )
- [Commits](https://github.com/webpack-contrib/compression-webpack-plugin/compare/v2.0.0...v3.0.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-07-15 00:48:50 +02:00
dependabot-preview[bot]
2fa85ead32
Bump intl-relativeformat from 2.2.0 to 6.4.2 ( #11255 )
...
Bumps [intl-relativeformat](https://github.com/formatjs/formatjs ) from 2.2.0 to 6.4.2.
- [Release notes](https://github.com/formatjs/formatjs/releases )
- [Commits](https://github.com/formatjs/formatjs/compare/intl-relativeformat@2.2.0...intl-relativeformat@6.4.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-07-15 00:48:50 +02:00
dependabot-preview[bot]
ea0c09e4fb
Bump react-redux from 6.0.1 to 7.1.0 ( #11256 )
...
Bumps [react-redux](https://github.com/reduxjs/react-redux ) from 6.0.1 to 7.1.0.
- [Release notes](https://github.com/reduxjs/react-redux/releases )
- [Changelog](https://github.com/reduxjs/react-redux/blob/master/CHANGELOG.md )
- [Commits](https://github.com/reduxjs/react-redux/compare/v6.0.1...v7.1.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-07-15 00:48:50 +02:00
ThibG
bd77fd6ff3
Fix BackupService crashing when an attachment is missing ( #11241 )
...
* Fix BackupService crashing when an attachment is missing
For various reasons such as admin error or out-of-sync media and
database backups, it might be possible for local attachments to be lost.
This commit allows the BackupService to continue its work even if some media
file is missing.
* Change error message
2019-07-15 00:48:49 +02:00
Georg Gadinger
b073008282
Update fuubar dependency to 2.4.1 ( #11248 )
...
See also: thekompanee/fuubar#111
2019-07-15 00:48:49 +02:00
Thibaut Girka
1b074d2a50
Add link to edit each listed filter
2019-07-15 00:48:28 +02:00
Thibaut Girka
f7fa11c4cd
Make some strings translatable
2019-07-15 00:48:28 +02:00
Thibaut Girka
fc8577cf2b
Minor refactoring
2019-07-15 00:48:28 +02:00
Thibaut Girka
707b8d7d75
Move the “Show why” button inline
2019-07-15 00:48:28 +02:00
Thibaut Girka
85f3bc1ab3
Implement feature to add filtered phrases to content warnings
2019-07-15 00:48:28 +02:00
Thibaut Girka
42b59b730b
Implement option to completely hide filtered toots
2019-07-15 00:48:28 +02:00
Thibaut Girka
16b79a6237
Add options to configure filtering behavior
2019-07-15 00:48:28 +02:00
Thibaut Girka
bde7a415b9
Add a way to know why a status has been filtered, and show it anyway
2019-07-15 00:48:28 +02:00
Thibaut Girka
e9fac2def9
Do not keep polls pre-filled in thread mode
2019-07-15 00:41:09 +02:00
Thibaut Girka
e0bfa685c6
Fix error boundary CSS
2019-07-15 00:28:31 +02:00
Thibaut Girka
0baaee495f
Fix report dialog crashing when a toot gets deleted
...
Fixes #1155
2019-07-10 19:53:31 +02:00
ThibG
fce885f271
Merge pull request #1152 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-07-07 22:26:10 +02:00
Thibaut Girka
5ff9970c8d
Re-add route for direct timeline
2019-07-07 14:12:41 +02:00
ThibG
64f3bc77ac
[Glitch] Only scroll to the compose form if it's not horizontally in the viewport
...
Port c07cca4727
to glitch-soc
2019-07-07 14:03:12 +02:00
ThibG
a0b614f10a
Fix support for HTTP proxies ( #11245 )
...
* Disable incorrect check for hidden services in Socket
Hidden services can only be accessed with an HTTP proxy, in which
case the host seen by the Socket class will be the proxy, not the
target host.
Hidden services are already filtered in `Request#initialize`.
* Use our Socket class to connect to HTTP proxies
Avoid the timeout logic being bypassed
* Add support for IP addresses in Request::Socket
* Refactor a bit, no need to keep the DNS resolver around
2019-07-07 13:53:09 +02:00
Thibaut Girka
7039dca12c
Merge commit 'c07cca4727041ea5a5721acbc603d4bfb45a15a6' into glitch-soc/merge-upstream
...
Unlike upstream, kept the direct timeline endpoint, as it is still of use in
glitch-soc.
2019-07-07 13:49:31 +02:00
Thibaut Girka
e5f4d83e60
Allow serializing local-only toots in backup service
...
Fixes #1153
2019-07-05 21:50:19 +02:00
ThibG
47c30be8d8
[Glitch] Memoize ancestorIds and descendantIds in detailed status view
...
Port 99924f282f
to glitch-soc
2019-07-04 16:26:17 +02:00
ThibG
894d82a325
[Glitch] When deleting & redrafting a poll, fill in closest expires_in
...
Port dc88d226e1
to glitch-soc
2019-07-04 16:24:48 +02:00
Thibaut Girka
6ab84c12a7
Merge branch 'master' into glitch-soc/merge-upstream
2019-07-04 16:21:39 +02:00
Thibaut Girka
c94966891a
Minor cleanup and maybe minor performance improvements
2019-07-01 19:31:21 +02:00
Thibaut Girka
9d6b46fe34
Minor optimization regarding regexp filtering in timelines
2019-07-01 19:31:21 +02:00
Thibaut Girka
c49f7d5d16
Use strict equality rather than Immutable.is as the compared props are values
2019-07-01 19:31:10 +02:00
Thibaut Girka
82a76f03a4
Assume children of visible IntersectionObserverArticle always change
...
This fixes multiple issues, while adding few computations
2019-07-01 19:31:10 +02:00
Thibaut Girka
c0b5ee315d
Revert to using upstream's optimisations
...
This *does* break things, as `shouldComponentUpdate` assume the
children to never change!
2019-07-01 19:31:10 +02:00
Thibaut Girka
0ef6a114e7
Fix error boundary DOM
2019-07-01 19:30:59 +02:00
Thibaut Girka
82cd138c89
Fix some React warnings
2019-07-01 19:30:59 +02:00
ThibG
687680f241
Merge pull request #1148 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-07-01 19:30:46 +02:00
Thibaut Girka
b6e9b7d1cd
[Glitch] When sending a toot, ensure a CW is only set if the CW field is visible
...
Partial port of ccc7fe3e1d
to glitch-soc
It doesn't ensure the field isn't changed, just that it isn't submitted if
the field isn't visible. Ensuring the field isn't changed would require
reworking the “always show CW field” feature.
2019-06-30 14:35:03 +02:00
ThibG
cbb41e2dad
[Glitch] Optimize makeGetStatus
...
Port f895bf1984
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-06-30 11:06:04 +02:00
ThibG
46829e009e
[Glitch] Use ScrollToOptions for smooth scrolling if supported
...
Port 84ff393842
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-06-30 11:01:01 +02:00
Thibaut Girka
c5495a448c
Merge branch 'master' into glitch-soc/merge-upstream
2019-06-30 10:59:45 +02:00
ThibG
98c2d2aa46
Merge pull request #1146 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-06-28 22:35:54 +02:00
Eugen Rochko
662252c8f7
[Glitch] Add categories for custom emojis
...
Port front-end changes from e64e6a03dd
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-06-28 21:42:37 +02:00
ThibG
4d964398de
[Glitch] Fix swiping columns on mobile sometimes failing
...
Port 072158ee97
to glitch-soc
2019-06-28 21:38:34 +02:00
Thibaut Girka
3922b518f7
Merge branch 'master' into glitch-soc/merge-upstream
2019-06-28 21:36:50 +02:00
ThibG
f7c0e326ab
Merge pull request #1145 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-06-28 19:11:06 +02:00
ThibG
43698e08ca
[Glitch] Add message telling FTS is disabled when no toot can be found because of this
...
Port ca8944728f
to glitch-soc
2019-06-28 18:54:56 +02:00
Thibaut Girka
c8ba75b963
Merge branch 'master' into glitch-soc/merge-upstream
2019-06-28 12:11:45 +02:00
Thibaut Girka
6ad870a410
Change search components classes and styling to match upstream
2019-06-28 11:13:41 +02:00
Thibaut Girka
ca17bae904
Use a redis-cached feed for the DM timeline
2019-06-27 16:44:12 +02:00
ThibG
2f95adc06f
Merge pull request #1142 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-06-27 16:43:55 +02:00
Thibaut Girka
6ab7051b48
Merge branch 'master' into glitch-soc/merge-upstream
2019-06-27 15:48:23 +02:00
ThibG
4175f13155
[Glitch] Add option to disable blurhash previews
...
Port 3086c645fd
to glitch-soc
2019-06-26 23:19:26 +02:00
PatOnTheBack
383136d9bb
[Glitch] Removed extra pipes from regex.
...
Port 5b20284f6f
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-06-26 23:19:26 +02:00
ThibG
5c3171e8ea
[Glitch] Apply filters to poll options in WebUI
...
Port 47ef4a6c7a
to glitch-soc
2019-06-26 23:19:26 +02:00
Thibaut Girka
aaec64a500
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/controllers/settings/preferences_controller.rb
- app/lib/user_settings_decorator.rb
- app/models/user.rb
- config/locales/simple_form.en.yml
2019-06-26 23:19:22 +02:00
Thibaut Girka
9ef25877df
Scroll to compose form rather than reply indicator on focus
2019-06-26 10:46:11 +02:00
ThibG
ed10ae2693
Merge pull request #1138 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-06-25 22:43:33 +02:00
Thibaut Girka
81bf43cfdd
Change .env.production.sample to specify that MAX_VIDEO_SIZE also applies to audio files
2019-06-24 16:27:10 +02:00
Thibaut Girka
598cdc9542
Use a different icon for audio attachments
2019-06-24 16:16:16 +02:00
Eugen Rochko
d7eb580053
[Glitch] Add media description as title to links of unknown media attachments
...
Port front-end changes from 49ebda4d49
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-06-24 16:00:42 +02:00
Eugen Rochko
967456b6a9
[Glitch] Add audio uploads
...
Port front-end changes from f7f23b4a19
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-06-24 16:00:42 +02:00
Thibaut Girka
ddd875ad99
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/models/media_attachment.rb
Upstream added audio attachment support
- app/serializers/initial_state_serializer.rb
Upstream added audio attachment support and how mimetypes are returned
- app/serializers/rest/instance_serializer.rb
Upstream added a few fields
- config/application.rb
Upstream added a different paperclip transcoder
2019-06-24 15:02:59 +02:00
Thibaut Girka
38d2882447
Fix NavigationBar styling
2019-06-20 19:19:46 +02:00
Thibaut Girka
bb9459774d
Add NavigationBar to getting started column in single-column mode
...
Fixes #1131
2019-06-20 19:19:46 +02:00
ThibG
f717d7a92d
Merge pull request #1134 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-06-20 19:19:30 +02:00
ThibG
3771a993b7
[Glitch] Completely hide toots matched by “irreversible” filters even if they got to the client
2019-06-19 19:16:13 +02:00
Thibaut Girka
032a669622
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/views/admin/settings/edit.html.haml
Conflict on theme VS flavour/skin handling.
Keep our version.
2019-06-19 18:49:25 +02:00
Thibaut Girka
356e9150df
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/lib/sanitize_config.rb
Keep our version, we support the tags upstream transforms.
- package.json
- yarn.lock
2019-06-19 18:36:16 +02:00
Thibaut Girka
f4b008906d
Change preferences link in local settings modal from sliders to cog for consistency
2019-06-19 15:19:23 +02:00
Thibaut Girka
ed2f0f6152
Fix bottom margin of lists in toots
2019-06-19 15:19:03 +02:00
Thibaut Girka
a06e7bc3fb
Change plaintext icon in composer options
2019-06-19 07:03:17 +02:00
Thibaut Girka
5ea45351a0
Fix rendering of emoji in public pages
2019-06-18 20:14:08 +02:00
Thibaut Girka
48ec6abaca
Fix streaming server crashing when updating filters
2019-06-18 16:50:04 +02:00
Thibaut Girka
f57a0f89a8
Fix styling of poll options on public pages in glitch flavour
2019-06-16 21:33:27 +02:00
ThibG
118701b548
Merge pull request #1121 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-06-16 21:25:37 +02:00
Thibaut Girka
5717f75340
Merge branch 'master' into glitch-soc/merge-upstream
2019-06-16 21:09:19 +02:00
Thibaut Girka
d3aaacb6d4
Do not scroll in the compose panel on single-column
2019-06-16 19:13:22 +02:00
Thibaut Girka
a29ab6f1bd
Fix composer buttons overflowing the composer box in single-column
2019-06-16 15:55:55 +02:00
Eugen Rochko
b6f76d1306
[Glitch] Change full logo to use primary text color of the given theme
...
Port 20dda5cca0
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-06-15 18:49:44 +02:00
Thibaut Girka
e433386545
Fix replying not automatically switching to compose form on mobile
2019-06-14 20:37:54 +02:00
ThibG
c0e5f32d13
Merge pull request #1111 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-06-13 23:53:21 +02:00
Thibaut Girka
0fd7a8b63d
Include necessary JS in auth pages
2019-06-13 22:38:22 +02:00
ThibG
7b68e1725c
[Glitch] List attachments in boost modal
...
Port dd45c63921
to glitch-soc
2019-06-13 22:28:51 +02:00
Thibaut Girka
60adda7e59
Merge branch 'master' into glitch-soc/merge-upstream
2019-06-13 22:23:20 +02:00
ThibG
80849812d2
[Glitch] Fix ordering of keyboard access between CW field, textarea and emoji picker
...
Port b4d67fe57a
to glitch-soc
2019-06-13 22:15:31 +02:00
ThibG
d1edbfaed3
[Glitch] Only show profile directory link when it's enabled
...
Port 1b4dcc3f78
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-06-13 22:15:31 +02:00
ThibG
983cbd558d
[Glitch] Fix border-bottom of active tab bars
...
Port faafc3ae25
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-06-13 22:15:31 +02:00
Thibaut Girka
0f41be5581
Fix notification badge
2019-06-13 22:15:31 +02:00
Thibaut Girka
0ccc06b87f
Fix multiple-column padding
2019-06-13 22:15:31 +02:00
Thibaut Girka
a773d02946
Add hints to make local settings about layout more explicit
2019-06-13 22:15:31 +02:00
Thibaut Girka
44b1a39682
Replace link to favourites with link to bookmarks
2019-06-13 22:15:31 +02:00
Thibaut Girka
9400ec43cc
Fix navigation panel
2019-06-13 22:15:31 +02:00
Thibaut Girka
127ead34c4
Restore navigation bar position glitch-soc setting
2019-06-13 22:15:31 +02:00
Thibaut Girka
b191861e15
Use forceSingleColumn only in automatic layout mode
2019-06-13 22:15:31 +02:00
Thibaut Girka
47307e6c13
Default to multiple column mode if backend doesn't have appropriate seting
2019-06-13 22:15:31 +02:00
Thibaut Girka
b222d1ae26
Fix and refactor SCSS
2019-06-13 22:15:31 +02:00
Thibaut Girka
7fd8797d20
Add app settings link to single-column mode
2019-06-13 22:15:31 +02:00
Eugen Rochko
1b130f964f
[Glitch] Fix position of search icon
...
Port 9add88a920
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-06-13 22:15:31 +02:00
Eugen Rochko
362f3973be
[Glitch] Fix some React warnings
...
Port cc8f6b3cda
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-06-13 22:15:31 +02:00
Eugen Rochko
3485acefed
[Glitch] Fix margins on profile metadata in single column mode
...
Port ed19f33440
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-06-13 22:15:31 +02:00
Wenceslao Páez Chávez
867d1233c7
[Glitch] Fix overlap of emoji button on search popup
...
Port fe3bf3b0fc
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-06-13 22:15:31 +02:00
Takeshi Umeda
8f924eb961
[Glitch] Fix emoji picker being always displayed
...
Port c402c291f4
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-06-13 22:15:31 +02:00
Eugen Rochko
a5398c3df8
[Glitch] Add profile directory link to single column navigation panel
...
Port 6077eca240
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-06-13 22:15:31 +02:00
Takeshi Umeda
1329308bc7
[Glitch] Improvement variable height in single column layout
...
Port d93b82af87
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-06-13 22:15:31 +02:00
Hanage999
02d6187894
[Glitch] Center 2-columns layout without side effect
...
Port 7c1ca0c37b
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-06-13 22:15:31 +02:00
Eugen Rochko
763735f92e
[Glitch] Refactor footers in web UI into a single component
...
Port 451e5980b6
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-06-13 22:15:31 +02:00
abcang
9bb4f796db
[Glitch] Display notifications count on a new single column
...
Port 3593b85423
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-06-13 22:15:31 +02:00
Hanage999
c095eed121
[Glitch] Fix wrong redirect from getting started to home in advanced Web UI
...
Port 4a818ac2de
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-06-13 22:15:31 +02:00
Eugen Rochko
ff88387a4a
[Glitch] Improvements to the single column layout
...
Port 0e445ebb13
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-06-13 22:15:31 +02:00
Eugen Rochko
d99a661f08
[Glitch] Add responsive panels to the single-column layout
...
Port 1e5532e693
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-06-13 22:15:31 +02:00
Eugen Rochko
0bd9f23e6d
[Glitch] Various improvements to single column layout
...
Port 84dc21d55d
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-06-13 22:15:31 +02:00
Eugen Rochko
610b4b44c4
[Glitch] Add single-column mode
...
Port 9ddeb30f90
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-06-13 22:15:31 +02:00
Thibaut Girka
fe5c4f976c
Fix clicking on the elefriend
2019-06-13 13:49:05 +02:00
Thibaut Girka
32bdff09c1
Properly handle unboosting statuses from detailed view
...
Fixes #1106
2019-06-12 10:12:51 +02:00
ThibG
cde30407c6
Merge pull request #1105 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-06-11 22:18:41 +02:00
Eugen Rochko
82899b3d2e
[Glitch] Fix list not being automatically unpinned when it returns 404 in web UI
...
Port 92b572e2a3
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-06-11 21:57:32 +02:00
Thibaut Girka
7065ba5930
Merge branch 'master' into glitch-soc/merge-upstream
2019-06-11 21:55:00 +02:00
ThibG
c64eef1206
Merge pull request #1102 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-06-10 23:01:56 +02:00
Thibaut Girka
7778de467c
Merge branch 'master' into glitch-soc/merge-upstream
2019-06-10 20:09:05 +02:00
Eugen Rochko
fc6d27daf3
[Glitch] Fix RTL layout not being RTL within the columns area
...
Port 25f93f4097
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-06-10 18:59:59 +02:00
Eugen Rochko
59d214e54b
[Glitch] Change preferences page into appearance, notifications, and other
...
Port SCSS changes from 1db4117030
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-06-10 18:59:59 +02:00
Thibaut Girka
1b0ff4cd69
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/controllers/settings/notifications_controller.rb
- app/javascript/packs/public.js
- app/views/settings/preferences/show.html.haml
- app/views/stream_entries/_simple_status.html.haml
- config/locales/simple_form.en.yml
- config/locales/simple_form.pl.yml
- config/navigation.rb
- config/routes.rb
2019-06-10 18:59:53 +02:00
Thibaut Girka
b45f555a0c
Minor cleanup
2019-06-10 16:24:09 +02:00
Thibaut Girka
b551d8aa53
Fix unboost confirmation dialog not showing up on detailed statuses
2019-06-10 16:24:09 +02:00
Thibaut Girka
ccfb48d3eb
Add option to display a warning before boosting toots lacking media descriptions
2019-06-10 16:24:09 +02:00
Thibaut Girka
d61a6271c6
Add DM conversations mode similar to upstream
2019-06-10 16:23:42 +02:00
Thibaut Girka
e16c8fbc7a
Fix old migrations failing because of new version of `strong_migrations`
...
Fixes #1099
2019-06-09 22:32:12 +02:00
ThibG
11c28abcfe
Merge pull request #1097 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-06-07 22:15:44 +02:00
Eugen Rochko
aec3fa35fd
[Glitch] Fix not being able to directly switch between list timelines in web UI
...
Port 5bfd802c57
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-06-07 17:39:46 +02:00
ThibG
417989ae34
[Glitch] Fix “mark as sensitive” not being used in delete & redraft
...
Port 2657765d2a
to glitch-soc
2019-06-07 17:39:46 +02:00
Jeong Arm
b32a62fe95
[Glitch] Scroll to compose form when focus
...
Port 8f3c32e29c
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-06-07 17:39:46 +02:00
Thibaut Girka
01aae33a5f
[Glitch] Fix refreshing featured toots when the new collection is empty
...
Port d34a3a2cc7
to glitch-soc
2019-06-07 17:05:32 +02:00
Thibaut Girka
34b8346e7f
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/controllers/statuses_controller.rb
- app/controllers/stream_entries_controller.rb
2019-06-07 17:00:36 +02:00
Thibaut Girka
8360019896
Fix display of alt-text when a media attachment is not available
2019-06-07 16:39:07 +02:00
ThibG
a03fb7b703
Change e-mail contact for CoC enforcement
2019-06-06 17:42:07 +02:00
Thibaut Girka
a7f6e72b30
Fix CW field automatically getting the focus when it is always enabled
2019-06-06 13:26:42 +02:00
ThibG
ff74aaca7c
Merge pull request #1093 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-06-05 13:28:05 +02:00
Thibaut Girka
02b56c7e1a
Merge remote-tracking branch 'upstream/master' into glitch-soc/merge-upstream
2019-06-04 20:40:19 +02:00
ThibG
58946fef3c
Merge pull request #1079 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-06-04 17:12:25 +02:00
Jeong Arm
8eb7c3304e
[Glitch] Fix profile picture preview
...
Port e13e4b28db
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-06-03 20:20:33 +02:00
Lady Lumb
1d5434d34c
Add audio length var to env sample
...
Added MAX_AUDIO_LENGTH var and documented in .env.production.sample
2019-06-03 16:16:21 +02:00
Thibaut Girka
76918554a6
Merge remote-tracking branch 'upstream/master' into glitch-soc/merge-upstream
...
Conflicts:
- Gemfile.lock
- config/webpack/rules/css.js
- package.json
- yarn.lock
2019-06-03 14:54:30 +02:00
Lady Lumb
35c4ff07f4
Added various vars to env sample
...
Added several vars that are already implemented to the .env.production.sample file.
-Max bio character limit
-Number of profile fields allowed
-Max display name character limit
2019-06-02 15:41:33 +02:00
Lady Lumb
da7bcf29d4
Fixed the very wrong byte to megabyte conversion
2019-06-02 14:38:13 +02:00
Lady Lumb
a7b4e7efdd
Correctly documented max image and video vars
...
Added MAX_IMAGE_SIZE and MAX_VIDEO_SIZE and documented their usage.
2019-06-02 14:38:13 +02:00
Lady Lumb
f9514b08f2
Added env variables for max image and video size.
...
I changed the IMAGE_LIMIT and VIDEO_LIMIT variables to read from the env, or use default if not set in the env, to make it easier to change this on an instance by instance basis and make it persistent across updates.
2019-06-02 14:38:13 +02:00
Thibaut Girka
5b92910664
Fix expanding status from menu modal in glitch-soc
...
Fixes #1085
2019-06-02 14:11:32 +02:00
Thibaut Girka
17fb1c4345
Fix old migrations failing because of new version of `strong_migrations`
2019-05-30 21:20:42 +02:00
ThibG
8ce2a08875
Merge pull request #1076 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-05-30 14:07:45 +02:00
Thibaut Girka
06036081a0
Merge branch 'master' into glitch-soc/merge-upstream
2019-05-30 13:31:01 +02:00
Thibaut Girka
6c0428b7d8
Raise exception when attempting to serialize local-only statuses
2019-05-30 09:04:12 +02:00
slice
22130a0947
Fix incorrect PropType in Glitch AutosuggestInput
2019-05-30 09:04:00 +02:00
slice
e04724296b
Remove isRequired from Glitch ReplyIndicator status
...
This can be null under normal circumstances, which isRequired doesn't
like.
2019-05-30 09:04:00 +02:00
Thibaut Girka
07d4ecfe5e
Truncate long URLs while providing alt text for inline images
2019-05-28 19:33:43 +02:00
Thibaut Girka
18b77224d3
Translate incoming remote img tags by a link
2019-05-28 19:33:43 +02:00
ThibG
2f83ffa1bd
Merge pull request #1073 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-05-28 19:33:15 +02:00
Eugen Rochko
56d8faab18
[Glitch] Use `<use />` to render transparent SVG logo instead of inserting it
...
Port SCSS changes from 8d5dcc9301
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-05-28 17:50:21 +02:00
Thibaut Girka
3d73d76e55
Merge branch 'master' into glitch-soc/merge-upstream
2019-05-28 17:45:06 +02:00
ThibG
1b0ce85e3d
Merge pull request #1072 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-05-27 21:26:03 +02:00
Thibaut Girka
6d60701bfa
Fix video player regressions introduced by blurhash merge
2019-05-27 19:43:15 +02:00
Thibaut Girka
b4d4138cf9
[Glitch] Add keyboard shortcut to hide/show media
...
Port a472190729
and 988342a56c
to glitch-soc
2019-05-27 19:43:15 +02:00
Thibaut Girka
20d01a954e
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/controllers/settings/preferences_controller.rb
- app/lib/user_settings_decorator.rb
- app/models/user.rb
Conflicts due to the addition of a new preference upstream,
“advanced layout”.
2019-05-26 15:41:40 +02:00
りんすき
fdb3952b20
[Glitch] Fix composer route opening when not needed
...
Port c1e77b56a9
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-05-26 13:50:15 +02:00
ThibG
fd0487c04f
Merge pull request #1068 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-05-24 16:30:49 +02:00
Thibaut Girka
7fb76999af
Use Sec-WebSocket-Protocol instead of query string to pass WebSocket token
...
Inspired by https://github.com/kubevirt/kubevirt/issues/1242
2019-05-24 16:08:09 +02:00
Thibaut Girka
652147a3f4
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- streaming/index.js
2019-05-24 15:23:52 +02:00
ThibG
72bf354e97
Merge pull request #1067 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-05-23 22:01:34 +02:00
Thibaut Girka
d6a7d62dc6
Do not share a single Redcarpet::Markdown object across threads
...
There are apparently thread-safety issues: https://github.com/vmg/redcarpet/pull/672
2019-05-23 21:19:44 +02:00
Thibaut Girka
bf988123ba
Merge branch 'master' into glitch-soc/merge-upstream
2019-05-23 21:18:27 +02:00
ThibG
c394d3cb25
Merge pull request #1065 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-05-23 20:49:18 +02:00
nzws
a1143a19c0
[Glitch] Fix stacking order of emoji picker
...
Port 8a378d4c3d
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-05-23 19:16:42 +02:00
Thibaut Girka
c0dc247bce
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/models/account.rb
- app/views/settings/profiles/show.html.haml
- spec/controllers/api/v1/accounts/credentials_controller_spec.rb
Conflicts were due to an increase in account bio length upstream, which
is already covered in glitch-soc through `MAX_BIO_CHARS`.
2019-05-23 19:01:30 +02:00
Thibaut Girka
0744d6e571
Make headers font size proportional
2019-05-23 12:41:38 +02:00
Thibaut Girka
7c609bdab9
Allow rel=tag in status text
...
Fixes tag links in local Markdown or HTML-authored statuses
2019-05-23 12:28:33 +02:00
Thibaut Girka
2332b3f146
Fix local text/html toots not being sanitized
2019-05-21 23:12:43 +02:00
Thibaut Girka
4fbce23992
Refactor contentType selection in glitch composer
2019-05-20 10:27:31 +02:00
Thibaut Girka
2cd7bfac23
Use glitch-soc's poll component instead of upstream's
2019-05-19 23:24:53 +02:00
ThibG
0998e3ade8
Merge pull request #1055 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-05-19 22:07:42 +02:00
Thibaut Girka
08a2af27c3
Merge branch 'master' into glitch-soc/merge-upstream
2019-05-19 21:53:44 +02:00
ThibG
46811f92e4
Merge pull request #1054 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-05-19 21:52:27 +02:00
Thibaut Girka
f509815379
Merge branch 'master' into glitch-soc/merge-upstream
2019-05-19 17:46:31 +02:00
ThibG
4beb8d7788
Merge pull request #1053 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-05-18 10:18:52 +02:00
Thibaut Girka
6e227ecb04
Merge branch 'master' into glitch-soc/merge-upstream
2019-05-18 10:04:32 +02:00
Thibaut Girka
9ca21e93cc
Minor optimization
2019-05-17 23:51:14 +02:00
Thibaut Girka
56245a2a72
Export fallback content type and use it as default in WebUI
2019-05-17 23:51:14 +02:00
Thibaut Girka
dd5bf40b97
Properly escape HTML in code blocks
2019-05-17 23:51:14 +02:00
Thibaut Girka
a6b7c23f6f
Add option for default toot content-type
2019-05-17 23:51:14 +02:00
Thibaut Girka
0be93820f3
Fix autolinking, and newlines in code blocks
...
Autolinking is now performed *after* the Markdown pass, by replacing HTML
tags with zero-width spaces and running the twitter-text extractor as usual,
except it does not auto-link URLs to avoid links in links…
2019-05-17 23:51:14 +02:00
Thibaut Girka
9df1ef87c2
Hide content-type dropdown by default
2019-05-17 23:51:14 +02:00
Haelwenn (lanodan) Monnier
c2fa36bbae
Content-Type Dropdown: use the selected option icon for the menu
...
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-05-17 23:51:14 +02:00
Thibaut Girka
93d98f62a8
Support proper content-type in Delete & Redraft
2019-05-17 23:51:14 +02:00
KokaKiwi
f34a402a94
Add status content type dropdown to compose box.
...
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-05-17 23:51:14 +02:00
Thibaut Girka
14d7ddcb1c
Add API support for setting status content-type
2019-05-17 23:51:14 +02:00
Thibaut Girka
b3e68de4d2
Serialize content-type on Delete & Redraft
2019-05-17 23:51:14 +02:00
Thibaut Girka
d7520f8175
Add support for HTML-formatted toots
2019-05-17 23:51:14 +02:00
Thibaut Girka
94aef563b9
Add support for markdown-formatted toots
2019-05-17 23:51:14 +02:00
Thibaut Girka
bfc509f44a
Add database row to hold status content type
2019-05-17 23:51:14 +02:00
ThibG
c1cf8c1636
Merge pull request #1049 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-05-15 18:44:21 +02:00
Thibaut Girka
6badf2d252
Merge branch 'master' into glitch-soc/merge-upstream
2019-05-15 17:11:40 +02:00
Thibaut Girka
4bab7d7640
Fix rich text style in reply indicator
2019-05-13 17:13:02 +02:00
Thibaut Girka
87d16698c2
Fix rich text styling on public pages
2019-05-13 17:13:02 +02:00
Thibaut Girka
cd534830ad
Fix text color of some formatted elements in notifications
2019-05-12 19:23:32 +02:00
ThibG
f6838a28f6
Merge pull request #1044 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-05-11 22:05:39 +02:00
ThibG
93085c273c
[Glitch] Use raw content if available on Delete & Redraft
...
Port front-end changes from 6d44f2441b
to glitch-soc
2019-05-11 21:46:23 +02:00
Thibaut Girka
2b97d9d780
Merge branch 'master' into glitch-soc/merge-upstream
2019-05-11 18:23:46 +02:00
Thibaut Girka
3ea5c045d7
Use a checkbox for the “Mark media as sensitive” composer button
...
Fixes #1039
2019-05-11 12:35:38 +02:00
ThibG
fe00f7a7e4
Merge pull request #1043 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-05-11 12:35:25 +02:00
Maciek Baron
14d855c429
[Glitch] Improve poll link accessibility
...
Port 0402c52f28
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-05-10 19:05:57 +02:00
nzws
78ff7e3821
[Glitch] Fix some colors of high contrast theme
...
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-05-10 18:59:12 +02:00
Aurélien Reeves
96f0747afe
[Glitch] Add confirm modal for unboosting toots
...
Port fe8a8f779e
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-05-10 18:56:01 +02:00
Thibaut Girka
68629f2773
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/controllers/statuses_controller.rb
minor conflict because of glitch-soc's theming system
- app/controllers/stream_entries_controller.rb
minor conflict because of glitch-soc's theming system
2019-05-10 17:09:12 +02:00
Thibaut Girka
d4d4e84324
Fix media description confirmation modal
...
Fixes #1040
2019-05-10 11:49:00 +02:00
Thibaut Girka
3191c3b349
Fix tabs bar on mobile
...
Fixes #1037
2019-05-08 00:32:53 +02:00
Thibaut Girka
2c767f44bf
Fix front-end crash when a video has a blurhash and is hidden behind a CW
2019-05-07 22:33:37 +02:00
Thibaut Girka
89d2859296
Fix content warning button displaying a link icon when no status card is set
2019-05-05 21:47:05 +02:00
Kirishima21
8383222026
fix pinned columns ’s Media-only button
...
Media-only toggles could not be used on pinned columns.
The commit fixes this problem.
2019-05-05 20:54:21 +02:00
ThibG
e4ca5414a3
Merge pull request #1032 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-05-05 20:53:07 +02:00
Baptiste Gelez
eef8802325
[Glitch] Make sure the instance banner is never cropped
...
Port 21209c2b52
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-05-05 12:29:06 +02:00
Thibaut Girka
832cf92c74
Merge branch 'master' into glitch-soc/merge-upstream
2019-05-05 12:28:10 +02:00
Thibaut Girka
f2cf8144b4
Minor style fixes
2019-05-04 23:05:43 +02:00
Eugen Rochko
9b1ef58c95
[Glitch] Change font weight of sensitive button to 500
...
Port 63b1388fef
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-05-04 20:41:21 +02:00
Eugen Rochko
f59973cc85
[Glitch] Make the "mark media as sensitive" button more obvious in web UI
...
Port 05ef3462ba
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-05-04 20:41:21 +02:00
Thibaut Girka
b1ab4d5ebe
Add visibility icon back in media gallery
2019-05-04 20:06:17 +02:00
Thibaut Girka
cbda1b8b66
Add back description on hover
2019-05-04 20:03:37 +02:00
ThibG
8e221cd22b
[Glitch] Fix transition: all
...
Port 7aa749ab46
to glitch-soc
2019-05-04 19:53:09 +02:00
ThibG
b7f69beebe
[Glitch] Make the cursor icon consistant across media types in account media gallery
2019-05-04 19:16:51 +02:00
Thibaut Girka
52a4284fe5
Merge branch 'master' into glitch-soc/merge-upstream
2019-05-04 19:15:50 +02:00
Eugen Rochko
bc97fd641f
[Glitch] Add button to view context to media modal
...
Port eb63217210
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-05-04 19:10:24 +02:00
Eugen Rochko
209c080280
[Glitch] Fix alignment of items in the account gallery in web UI and load more per page
...
Port 967e419f8f
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-05-04 18:59:11 +02:00
Eugen Rochko
a5da59f140
[Glitch] Change account gallery in web UI
...
Port 3f143606fa
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-05-04 18:54:57 +02:00
Thibaut Girka
373dd1fdf1
Minor CSS fixes
2019-05-04 18:18:15 +02:00
Eugen Rochko
ccf4f3240a
[Glitch] Add blurhash
...
Port front-end changes from fba96c808d
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-05-04 18:07:44 +02:00
ThibG
1149ddd3da
Fix glitch SCSS for links in error messages in admin interface
...
Port SCSS changes from 011b032300
2019-05-04 16:43:08 +02:00
Thibaut Girka
33c80e0783
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/models/media_attachment.rb
2019-05-04 16:37:26 +02:00
Thibaut Girka
2c2f649200
Fix CSP when PAPERCLIP_ROOT_URL is set to a different host
2019-05-04 10:55:56 +02:00
Thibaut Girka
58720aa2bd
Fix CSP when dealing with S3 hosts
2019-05-04 00:47:51 +02:00
Thibaut Girka
9f25ab9792
Fix polls icon not showing in CW button in detailed statuses
2019-05-03 21:55:50 +02:00
Thibaut Girka
7617f78359
Fix crash in onboarding modal
...
Fixes #1027
2019-05-03 19:24:54 +02:00
Thibaut Girka
fcbf557bd2
Add site-wide options to show reblogs and replies in local/public timelines
...
Fixes #1021
2019-05-01 22:33:09 +02:00
Thibaut Girka
cc5a81b7d8
Make hi-color privacy icons opt-in instead of opt-out
2019-05-01 20:23:25 +02:00
Thibaut Girka
ac54292d69
Add high color privacy icons
...
Fixes #1015
2019-05-01 16:38:01 +02:00
Zac
be6ef1947e
changed pinned status count operator
...
changed default pinned count to 5 to preserve default behavior
2019-04-29 20:52:53 +02:00
Zac
5616200ed4
added documentation into .env.production.sample
...
moved max pin count into constant
2019-04-29 20:52:53 +02:00
Zac
a36affb9d6
add env var for max pinned toots
2019-04-29 20:52:53 +02:00
Thibaut Girka
d4c95e6a8a
When selecting a toot via keyboard, ensure it is scrolled into view
...
Fixes detailed status column
2019-04-29 20:28:38 +02:00
Thibaut Girka
3e095cab83
Add support for missing formatting tags
2019-04-29 19:31:09 +02:00
Thibaut Girka
67fb9a8679
Add keyboard shortcut to collapse/uncollapse toots
2019-04-28 20:23:04 +02:00
Thibaut Girka
f3acf8f414
Add hotkey for bookmarking a toot
2019-04-28 20:23:04 +02:00
Thibaut Girka
cd9a284702
Fix regression with textarea's caret position when selecting a suggestion
2019-04-27 21:40:42 +02:00
Thibaut Girka
aa1832ac4d
Hide suggestions by default
...
They will be enabled if the input has focus
2019-04-26 22:38:03 +02:00
Thibaut Girka
fddd8251dd
Attempt to fix CSS
2019-04-26 22:38:03 +02:00
Thibaut Girka
d7e4be285a
Add emoji suggestion to poll options
2019-04-26 22:38:03 +02:00
Thibaut Girka
df52004fe6
Add suggestions in CW field
2019-04-26 22:38:03 +02:00
Thibaut Girka
3a671470ec
Refactor selectComposeSuggestion so that different paths can be updated
2019-04-26 22:38:03 +02:00
Thibaut Girka
1c0402c103
Do not ask to register web intent handler
2019-04-24 23:05:11 +02:00
Thibaut Girka
b13c90f3e3
Fix color of muted statuses content not wrapped in a p tag
2019-04-24 22:40:17 +02:00
Thibaut Girka
e4b65e6349
Redesign blockquote styling
2019-04-24 22:40:17 +02:00
Thibaut Girka
8753e5317f
Better distinguish titles from text
2019-04-24 22:40:17 +02:00
Thibaut Girka
3631c3314a
Remove extra margin in paragraphs inside blockquotes
2019-04-24 22:40:17 +02:00
Thibaut Girka
9b86707b1e
Make bold text bolder
2019-04-24 22:40:17 +02:00
Thibaut Girka
5a8495dabe
Remove margins around `p` tags in lists
2019-04-24 22:40:17 +02:00
Thibaut Girka
ef249a2718
Rename status__text to status__content__text for consistency with upstream
2019-04-24 22:40:17 +02:00
Thibaut Girka
adbb174c9c
Fix status header display in toot mobile menu
2019-04-24 20:21:19 +02:00
Thibaut Girka
ef1504d625
Fix upload progressbar when image resizing is involved
2019-04-24 20:19:23 +02:00
Thibaut Girka
ffab9d626a
Hide media upload form if no media are attached
2019-04-24 19:47:11 +02:00
ThibG
9add18604c
Merge pull request #1007 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-04-24 19:42:33 +02:00
Thibaut Girka
7783ec921b
Merge branch 'master' into glitch-soc/merge-upstream
2019-04-24 15:25:22 +02:00
Thibaut Girka
416aa832e5
Fix file upload
2019-04-24 07:57:28 +02:00
Thibaut Girka
3d722b0c4e
Fix settings modal
2019-04-23 18:31:13 +02:00
Thibaut Girka
08afd6b69c
Do not leak local-only toots to remote mentioned users
2019-04-22 23:37:50 +02:00
Thibaut Girka
2db0506226
Load custom CSS rules after standard ones
...
Fixes #933
Due to glitch-soc's theming system, JS and CSS files are imported in a slightly
different order, and custom CSS rules were loaded *before* everything else.
They will now be loaded *after* everything else, which is a bit different from
upstream but should work better overall.
2019-04-22 23:07:27 +02:00
Thibaut Girka
27e8354914
Add support for lists in statuses
2019-04-22 23:07:14 +02:00
Thibaut Girka
659f972bed
Do not switch to italic for status media buttons
2019-04-22 23:07:14 +02:00
Thibaut Girka
2e3640ecbb
Accept richer text from remote statuses
...
Support abbr, del, pre, blockquote, code, strong, b, em, i, and h1…h5
HTML elements in remote statuses, add corresponding CSS.
2019-04-22 23:07:14 +02:00
ThibG
91a74ea86b
Merge pull request #1002 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-04-22 23:06:54 +02:00
kedama
039e35560c
[Glitch] Fix modal items cannot scroll on touch devices
...
Port d763d39d26
to glitch-soc
2019-04-22 22:57:39 +02:00
Thibaut Girka
a9eaa780f5
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/javascript/mastodon/features/compose/components/compose_form.js
Upstream cleaned up a bit, including on lines in which
we replaced the hardcoded 500 character limit with a maxChar
constant. Applied the changes while keeping maxChar instead of 500.
- app/javascript/packs/public.js
Moved upstream's new animated avatar hover handling in
app/javascript/core/public.js
- app/javascript/styles/fonts/montserrat.scss
Upstream fixed local font name, applied those changes.
- app/javascript/styles/fonts/roboto.scss
Upstream fixed local font name, applied those changes.
- lib/mastodon/version.rb
Upstream made repo URL configurable, did the same, but
default to glitch-soc
2019-04-22 20:40:04 +02:00
Thibaut Girka
c3fa4e8e07
Fix ReferenceError in dropdown
2019-04-22 20:15:47 +02:00
Thibaut Girka
d779ec1f0e
Fix broken reference to handleSubmit
2019-04-22 20:15:47 +02:00
Thibaut Girka
e949861176
Cleanup
2019-04-22 20:15:47 +02:00
Thibaut Girka
faff152ae5
Move ComposerPublisher to Compose
2019-04-22 20:15:47 +02:00
Thibaut Girka
df951c319c
Add OptionsContainer
2019-04-22 20:15:47 +02:00
Thibaut Girka
14028655df
Move composer Dropdown from features/composer to features/compose
2019-04-22 20:15:47 +02:00
Thibaut Girka
4c6221929f
Move ComposerTextareaIcons to TextareaIcons
2019-04-22 20:15:47 +02:00
Thibaut Girka
47faf47ed5
ComposerTextarea → AutosuggestTextarea
2019-04-22 20:15:47 +02:00
Thibaut Girka
a243567a3e
ComposerUploadForm → UploadForm + UploadFormContainer
2019-04-22 20:15:47 +02:00
Thibaut Girka
c5f49a92dc
Move PollForm from features/composer to features/compose
2019-04-22 20:15:47 +02:00
Thibaut Girka
f1a22e33e2
Inline spoiler input
2019-04-22 20:15:47 +02:00
Thibaut Girka
8fd599fb40
ComposerReply → ReplyIndicator
2019-04-22 20:15:47 +02:00
Thibaut Girka
f72af5794d
Refactor Compose*Warning → ContainerWarning
...
Regression: only one warning at a time
2019-04-22 20:15:47 +02:00
Thibaut Girka
1bc4b8a0a5
features/composer/index.js → ComposeForm
2019-04-22 20:15:47 +02:00
Thibaut Girka
281a82d878
DrawerHeader → Header + HeaderContainer
2019-04-22 20:15:47 +02:00
Thibaut Girka
9a2f10fe8b
DrawerAccount → NavigationBar + NavigationContainer
2019-04-22 20:15:47 +02:00
Eugen Rochko
9b9816aba6
[Glitch] Show suggested follows on search screen in mobile layout
...
Port ad510db3a1
to glitch-soc
2019-04-22 20:15:47 +02:00
Thibaut Girka
149aa07409
DrawerResults → SearchResults + SearchResultsContainer
2019-04-22 20:15:47 +02:00
Thibaut Girka
67771e6d65
Rework DrawerResults to make them closer to upstream
2019-04-22 20:15:47 +02:00
Thibaut Girka
ab3e8fc542
Move DrawerSearch to Search + SearchContainer
2019-04-22 20:15:47 +02:00
Thibaut Girka
c92ab35b19
Inline DrawerSearchPopout in DrawerSearch
2019-04-22 20:15:47 +02:00
Thibaut Girka
c19b983986
Refactor a bit DrawerSearch to make it closer to upstream
2019-04-22 20:15:47 +02:00
Thibaut Girka
eed2c9dd44
Rename flavours/glitch/features/drawer to flavours/glitch/features/compose
2019-04-22 20:15:47 +02:00
ThibG
8933e8cb1d
Merge pull request #998 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-04-19 13:41:34 +02:00
Thibaut Girka
8b7b65e995
[Glitch] Allow modal secondary button to shrink and allow wider confirmation modals
...
Port 7f75792bf3
to glitch-soc
2019-04-19 10:48:54 +02:00
Thibaut Girka
268417daf3
Merge branch 'master' into glitch-soc/merge-upstream
2019-04-19 10:44:10 +02:00
Thibaut Girka
546688aa1d
Add forgotten text
2019-04-19 00:57:39 +02:00
Thibaut Girka
93199c9566
Fix keybase indication on dashboard
2019-04-19 00:57:39 +02:00
Thibaut Girka
d83068016b
Allow turning keybase off instance-wide
2019-04-19 00:57:39 +02:00
Thibaut Girka
e3c1472040
Shift+click on column Back button to return to last pinable column
2019-04-17 18:40:40 +02:00
Thibaut Girka
8d57c0e70e
When selecting a toot via keyboard, ensure it is scrolled into view
2019-04-17 10:07:33 +02:00
Thibaut Girka
fbec0edf08
Fix opening/closing gifv sometimes making the timeline scroll
2019-04-16 22:20:23 +02:00
Izalia Mae
f11ad4023c
add env var for max length of audio uploads
2019-04-16 16:07:20 +02:00
ThibG
bb50ec2e66
Merge pull request #987 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-04-11 15:14:31 +02:00
Thibaut Girka
f5b4e9a54a
Merge branch 'master' into glitch-soc/merge-upstream
2019-04-11 15:13:52 +02:00
ThibG
31e4fcb006
Merge pull request #985 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-04-10 22:33:41 +02:00
Thibaut Girka
2f422b708f
Merge branch 'master' into glitch-soc/merge-upstream
2019-04-10 21:19:21 +02:00
Eugen Rochko
92e1950194
[Glitch] Fix glitched out "not found" message for non-existing profiles in web UI
...
Port 56f29c38b6
to glitch-soc
2019-04-10 09:33:47 +02:00
Eugen Rochko
fa4b51a110
[Glitch] Add "why do you want to join" field to invite requests
...
Port SCSS changes from 8b69a66380
to glitch-soc
2019-04-10 09:22:45 +02:00
Thibaut Girka
5085559b15
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/views/admin/pending_accounts/index.html.haml
No real conflict, upstream changes too close to glitch-specific
theming system changes.
- config/navigation.rb
Upstream redesigned the settings navigation, took those changes
and re-inserted the flavours menu.
2019-04-10 09:16:08 +02:00
Thibaut Girka
cb410f80a4
Add column title to “Favourited by” and “Boosted by” columns
2019-04-08 21:59:30 +02:00
ThibG
fc2f7ee871
Merge pull request #983 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-04-08 18:17:22 +02:00
Thibaut Girka
63837a4b78
Fix pending accounts management
2019-04-08 16:40:11 +02:00
ashleyhull-versent
ac071d65de
[Glitch] Duplicate values
...
Port bd365cc38b
to glitch-soc
2019-04-08 16:22:20 +02:00
Eugen Rochko
df42de68e5
[Glitch] Port SCSS changes from "Improve blocked view of profiles"
...
Port public pages SCSS changes from 67b3b62b98
2019-04-08 16:20:46 +02:00
Thibaut Girka
f5f6d23d55
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- config/locales/pl.yml
Conflict caused by new upstream string too close to glitch-specific
“flavour” string. Took both strings.
2019-04-08 15:57:56 +02:00
ThibG
30500dff7c
Merge pull request #981 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-04-04 15:13:18 +02:00
ThibG
be6885eb93
[Glitch] Update poll remaining time just like with status timestamps
...
Port daab45d4ae
to glitch-soc
2019-04-04 14:58:11 +02:00
Thibaut Girka
1682ac5717
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/controllers/following_accounts_controller.rb
Conflicts were due to glitch-soc's theming system.
- app/javascript/packs/public.js
Some code has been change upstream, but it has been
moved to app/javascript/core/settings.js in glitch-soc.
Applied the changes there.
2019-04-04 14:53:52 +02:00
Thibaut Girka
14bad3f472
Do not handle clicks in detailed status content
2019-04-03 19:58:18 +02:00
ThibG
3f5acc1ab3
Merge pull request #978 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-04-01 21:36:36 +02:00
Thibaut Girka
12dae9d583
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/models/form/admin_settings.rb
- config/locales/ja.yml
2019-04-01 21:28:31 +02:00
ThibG
925830d11b
Merge pull request #976 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-03-31 00:37:16 +01:00
Thibaut Girka
b72950fbd3
Fix failing keybase-related test
2019-03-30 18:19:40 +01:00
Eugen Rochko
b9b472d519
[Glitch] Fix transparent avatars showing underlying elements in avatar stack and profile
...
Port 79227d153b
to glitch-soc
2019-03-30 18:19:40 +01:00
Eugen Rochko
59551ece31
[Glitch] Fix search in web UI not setting a limit, restore limit of 10
...
Port 379c3e237f
to glitch-soc, but changing
the 5 limit to 10, since that's what we had previously
2019-03-30 12:56:34 +01:00
Thibaut Girka
4444d8f9b3
Merge branch 'master' into glitch-soc/merge-upstream
2019-03-30 12:36:24 +01:00
Alex Gessner
b6fa500806
[Glitch] squashed identity proof updates
...
Port JS from 69141dca26
to glitch-soc
2019-03-29 10:13:44 +01:00
Thibaut Girka
a74d300b68
Fix background color transition in destructive buttons
2019-03-28 20:45:10 +01:00
ThibG
f4b038f779
[Glitch] Fix opacity of relationship tags
...
Port 58667072d9
to glitch-soc
2019-03-28 19:56:40 +01:00
Thibaut Girka
0318b23395
Fix left border of profile navigation tab
2019-03-28 19:56:40 +01:00
Thibaut Girka
ab39ffb175
Add fa-info-circle to disclaimer
2019-03-28 19:56:40 +01:00
Thibaut Girka
6c58367f36
Fix double border for account disclaimer
2019-03-28 19:56:40 +01:00
slice
6fdd829d8c
[Glitch] Add rel='noopener' to redesigned profile column header avatar link
...
Port 73f5711fb8
to glitch-soc
2019-03-28 19:56:40 +01:00
ThibG
841d2c9f23
[Glitch] Move the account dropdown menubar to the right, make sure it doesn't move
...
Port a91acf79b5
to glitch-soc
2019-03-28 19:56:40 +01:00
Aditoo17
37ad0478ef
[Glitch] Make clicking on avatar open public profile in new tab
...
Port 6f6abc369f
to glitch-soc
2019-03-28 19:56:40 +01:00
mayaeh
cf3f063e10
[Glitch] Fix menu items that don't action
...
Port 186f7bcbb6
to glitch-soc
2019-03-28 19:56:40 +01:00
Eugen Rochko
00f251b8fe
[Glitch] Redesign profile column in web UI to match design on public pages
...
Port a96181f16f
to glitch-soc
2019-03-28 19:56:40 +01:00
Thibaut Girka
abb53fa338
Fix centering on public pages
2019-03-28 19:56:03 +01:00
Thibaut Girka
60fc04756a
Fix padding and centering of display names
2019-03-28 19:56:03 +01:00
Thibaut Girka
58da5e93c0
Port search results styling to glitch-soc
2019-03-28 19:56:03 +01:00
ThibG
fad29fd230
Merge pull request #973 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-03-28 18:45:28 +01:00
Thibaut Girka
ce7d055d3c
Merge branch 'master' into glitch-soc/merge-upstream
2019-03-28 18:35:25 +01:00
ThibG
bb316fafff
Merge pull request #970 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-03-28 15:12:33 +01:00
Thibaut Girka
050efbc126
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/workers/activitypub/distribute_poll_update_worker.rb
- config/locales/pl.yml
2019-03-28 13:01:33 +01:00
ThibG
0418bdd71f
Merge pull request #969 from ThibG/glitch-soc/fixes/revert-emojimart
...
Revert emojimart update
2019-03-27 14:37:44 +01:00
Thibaut Girka
3a2f646cb1
Revert "fix: update to emoji-mart 2.10.0 ( #10281 )"
...
This reverts commit db06b25376
.
2019-03-27 14:04:58 +01:00
Thibaut Girka
355d384d8d
Revert "[Glitch] fix: update to emoji-mart 2.10.0"
...
This reverts commit 49bea8c46b
.
2019-03-27 14:04:52 +01:00
Thibaut Girka
497a958297
Revert "Fix compilation after emoji-picker change"
...
This reverts commit 8ea344fed4
.
2019-03-27 14:04:46 +01:00
ThibG
7535c607f4
Merge pull request #968 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-03-27 14:02:32 +01:00
Thibaut Girka
48230b57d2
Merge branch 'master' into glitch-soc/merge-upstream
2019-03-27 14:01:19 +01:00
ThibG
bdf4f56f9a
Merge pull request #966 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-03-26 19:51:28 +01:00
ThibG
9e80b34a95
[Glitch] Add a “Block & Report” button to the block confirmation dialog
...
Port 6df4a82969
to glitch-soc
2019-03-26 17:44:00 +01:00
Thibaut Girka
fae53e1a39
Merge branch 'master' into glitch-soc/merge-upstream
2019-03-26 17:39:20 +01:00
Hinaloe
872eab5784
[Glitch] Do not set CSRF Token when no csrf header
...
Port 68f2211f00
to glitch-soc
2019-03-26 16:12:46 +01:00
Eugen Rochko
89a0fa3053
[Glitch] Change icons of features on admin dashboard to remove bias
...
Port SCSS changes from e117964325
to glitch-soc
2019-03-26 16:11:30 +01:00
Eugen Rochko
614bd3f8d4
[Glitch] Add `lang` attribute to statuses in web UI
...
Port JS changes from e6cfa7ab89
to glitch-soc
2019-03-26 16:09:59 +01:00
ThibG
d680c61993
[Glitch] Do not empty timeline of blocked users on block
...
Port 94aceb85ad
to glitch-soc
2019-03-26 16:07:47 +01:00
Thibaut Girka
b9f314bba7
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- config/locales/es.yml
- config/locales/pl.yml
- config/locales/pt-BR.yml
2019-03-26 16:02:54 +01:00
Eugen Rochko
648cf8bfd5
[Glitch] Add custom closed registrations message to landing page when set
...
Port SCSS changes from 55a9658ad8
to glitch-soc
2019-03-26 16:01:59 +01:00
Thibaut Girka
fcce135d27
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/controllers/admin/settings_controller.rb
- app/models/form/admin_settings.rb
Conflicts caused by upstream refactoring, while we have
flavours and skins, with the flavour_and_skin pseudo-setting.
2019-03-26 16:01:59 +01:00
ThibG
9f56511860
Merge pull request #965 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-03-22 20:22:18 +01:00
Thibaut Girka
edd5441112
Merge branch 'master' into glitch-soc/merge-upstream
2019-03-22 13:05:17 +01:00
ThibG
bde9196b70
Merge pull request #964 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-03-20 20:13:22 +01:00
ThibG
8b5b686f08
[Glitch] Add support for custom emojis in poll options
...
Fixes #956
Port 80f0910e21
to glitch-soc
2019-03-20 17:34:32 +01:00
Thibaut Girka
cbf1d711ba
Merge branch 'master' into glitch-soc/merge-upstream
2019-03-20 17:32:39 +01:00
ThibG
803c350ef5
[Glitch] Reduce padding around logo on landing page
...
Port 158c31b9df
to glitch-soc
2019-03-20 14:54:52 +01:00
Eugen Rochko
4d01d9c46f
[Glitch] Add Keybase integration
...
Port SCSS changes from 9c4cbdbafb
to glitch-soc
2019-03-20 14:54:19 +01:00
Eugen Rochko
2a93c88015
[Glitch] Disable real-time updates on public pages to improve readability
...
Port 42c581c458
to glitch-soc
2019-03-20 14:51:25 +01:00
Thibaut Girka
1d6152f440
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- config/locales/en.yml
Conflict caused by the glitch-soc-specific “flavour” string being too close
to the newly introduced “identity_proofs” string. Just included both.
2019-03-20 13:54:00 +01:00
ThibG
b9a998f201
Merge pull request #963 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-03-18 19:54:23 +01:00
Eugen Rochko
841b920af5
[Glitch] Fix relationship manager on narrow screens
...
Port 7130d6e512
to glitch-soc
2019-03-18 18:07:03 +01:00
ThibG
200cd3b5a7
[Glitch] Save quick filter settings when selecting a different filter
...
Port 7477db7268
to glitch-soc
2019-03-18 18:06:26 +01:00
Thibaut Girka
291012ec0c
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/controllers/accounts_controller.rb
- app/controllers/follower_accounts_controller.rb
- app/controllers/statuses_controller.rb
All conflicts caused by the additional `use_pack` used for glitch-soc's theming
system.
2019-03-18 18:03:27 +01:00
ThibG
6e3a4bcbc7
Merge pull request #962 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-03-16 22:59:47 +01:00
Thibaut Girka
8ea344fed4
Fix compilation after emoji-picker change
2019-03-16 21:40:50 +01:00
Nolan Lawson
49bea8c46b
[Glitch] fix: update to emoji-mart 2.10.0
...
Port db06b25376
to glitch-soc
2019-03-16 21:39:13 +01:00
Eugen Rochko
e900b03e38
[Glitch] Fix scrollbar styles on compose textarea, small bugs
...
Port 6a3f08661f
to glitch-soc
2019-03-16 21:07:50 +01:00
Thibaut Girka
4aa6aba6ee
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/services/remove_status_service.rb
Conflict because we still handle the direct timeline.
Took upstream changes, with that one extra function call.
- config/locales/ca.yml
Conflict because theme names were updated.
Decided to *keep* the theme names even if they are useless
to avoid future conflicts.
- config/locales/oc.yml
Decided to *keep* the theme names even if they are useless
to avoid future conflicts.
- config/locales/pl.yml
Decided to *keep* the theme names even if they are useless
to avoid future conflicts.
2019-03-16 20:59:33 +01:00
ThibG
6af2300454
Merge pull request #961 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-03-16 17:10:27 +01:00
Thibaut Girka
0fbe90e2d3
Fix settings/flavours
...
Update theming system to use new paths for media files
2019-03-16 16:21:20 +01:00
Eugen Rochko
47c8707f01
[Glitch] Add relationship manager UI
...
Port SCSS changes from 1c113fd72d
to glitch-soc
2019-03-16 14:36:29 +01:00
Thibaut Girka
8e5d72dba8
Fix relationships controller/view wrt. glitch-soc theming engine
2019-03-16 14:26:14 +01:00
Thibaut Girka
3960a9d605
Do not try to parse gif files as CSS or JS
2019-03-16 14:23:50 +01:00
Thibaut Girka
4df3b7cb06
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/controllers/settings/follower_domains_controller.rb
Removed upstream. Did the same here. Maybe we should not have?
- config/locales/en.yml
Upstream removed the “Authorized followers” page and associated
translations. This is too close in the file to our glitch-soc-specific
“flavour” string. No actual conflict.
- config/locales/ja.yml
Same as above.
- config/locales/pl.yml
Same as above.
- config/navigation.rb
No real conflict. New route added too close to the glitch-soc-specific
“flavours” one.
- config/webpack/configuration.js
Upstream refactored the webpack(er) configuration quite a bit.
Tried to keep up.
- config/webpack/loaders/babel.js
Upstream refactored the webpack(er) configuration quite a bit.
Tried to keep up.
The contents of this file have been moved to package.json.
- config/webpack/shared.js
Upstream refactored the webpack(er) configuration quite a bit.
Tried to keep up.
- config/webpacker.yml
Upstream refactored the webpack(er) configuration quite a bit.
Tried to keep up.
- jest.config.js
The contents of this file have been moved to package.json.
- package.json
Upstream refactored the webpack(er) configuration quite a bit.
Tried to keep up.
- yarn.lock
Upstream refactored the webpack(er) configuration quite a bit.
Tried to keep up.
2019-03-16 14:14:20 +01:00
ThibG
c2fa0f7c40
Merge pull request #960 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-03-14 22:11:56 +01:00
Thibaut Girka
09ac5e7528
Merge branch 'master' into glitch-soc/merge-upstream
2019-03-14 20:11:17 +01:00
Eugen Rochko
338f1327e9
[Glitch] Admission-based registrations mode
...
Port SCSS changes from 51e154f5e8
to glitch-soc
2019-03-14 17:54:44 +01:00
Eugen Rochko
d8b43f4bd6
[Glitch] Improve invites list with click-to-copy inputs
...
Port 6e3936aa6f
to glitch-soc
2019-03-14 17:44:39 +01:00
Thibaut Girka
07eb31eeac
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/views/admin/settings/edit.html.haml:
Conflict due to how the theming settings change.
2019-03-14 17:17:20 +01:00
ThibG
fa75324059
Merge pull request #958 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-03-13 23:44:37 +01:00
ThibG
931ecc8824
[Glitch] Add UI for enabling/disabling poll notifications
2019-03-13 22:21:52 +01:00
Thibaut Girka
5ffdc5426e
Merge branch 'master' into glitch-soc/merge-upstream
2019-03-13 21:35:43 +01:00
ThibG
3005e473a0
Merge pull request #957 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-03-13 16:55:07 +01:00
Eugen Rochko
387f253f31
[Glitch] Add muted style for polls in web UI
...
Port 5b50c2cbaa
to glitch-soc
2019-03-13 16:02:36 +01:00
Eugen Rochko
458db4333a
[Glitch] Fix public timeline page not paginating correctly
...
Port da45b8b4c9
to glitch-soc
2019-03-13 15:56:51 +01:00
Eugen Rochko
bbb9ff0e84
[Glitch] Redesign landing page
...
Port 65fffeac3f
to glitch-soc
2019-03-13 15:53:00 +01:00
Thibaut Girka
02062aab55
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/controllers/about_controller.rb
- app/controllers/tags_controller.rb
- app/views/about/show.html.haml
- spec/views/about/show.html.haml_spec.rb
2019-03-13 15:16:02 +01:00
ThibG
c2857c976c
Merge pull request #955 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-03-11 17:52:18 +01:00
Thibaut Girka
f3e7634156
Merge branch 'master' into glitch-soc/merge-upstream
2019-03-11 17:31:02 +01:00
Thibaut Girka
a1c6e6de1b
Remove leftover console.log
2019-03-11 14:39:45 +01:00
Thibaut Girka
4849eb8e7f
Make clicking on the account and status column headers scroll to top
2019-03-11 14:19:16 +01:00
ThibG
45e4c90a23
Merge pull request #953 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-03-11 13:23:54 +01:00
Thibaut Girka
9c620fc5c8
[Glitch] Add support for poll ending notifications
...
Port front-end parts of 3a92885a86
to glitch-soc
2019-03-11 13:08:21 +01:00
Thibaut Girka
7d026aa079
Do not leak instance-local polls to remote followers
2019-03-11 13:08:20 +01:00
ash lea
f534f4869e
add local setting to auto reveal media behind cw
2019-03-11 12:14:45 +01:00
Kirishima21
1bf035fb67
fix poll fotter layout
...
画面の幅が充分でないときに
表示外にまでボタンが拡大されてしまわないように修正。
2019-03-11 12:09:30 +01:00
Thibaut Girka
89bee860cd
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/services/post_status_service.rb
Small conflict due to handling of instance-local toots.
A subsequent change is required to ensure instance-local polls are not leaked
through Update.
2019-03-11 11:23:50 +01:00
ThibG
3cef04610c
Merge pull request #950 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-03-10 20:43:54 +01:00
Thibaut Girka
dfe7322922
Merge branch 'master' into glitch-soc/merge-upstream
2019-03-10 16:48:44 +01:00
ThibG
42cc93e892
Merge pull request #947 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-03-08 20:43:51 +01:00
Thibaut Girka
93daa97fc3
Fix min/max duration poll limits being inverted
2019-03-08 20:43:18 +01:00
Thibaut Girka
674fe32f97
Merge branch 'master' into glitch-soc/merge-upstream
2019-03-08 20:15:57 +01:00
ThibG
29a09858f6
Merge pull request #945 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-03-08 01:47:36 +01:00
Eugen Rochko
ca45198ccb
[Glitch] Fix NaN in Poll component
...
Port 75cb93676b
to glitch-soc
2019-03-08 01:01:19 +01:00
Eugen Rochko
6fe48dd050
[Glitch] Fix public timelines being broken by new toots when they are not mounted
...
Port be1c634b2b
to glitch-soc
2019-03-08 01:00:14 +01:00
Thibaut Girka
5528719bc9
Merge branch 'master' into glitch-soc/merge-upstream
2019-03-08 00:57:13 +01:00
ThibG
38e9c66f34
Merge pull request #944 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-03-07 13:45:43 +01:00
Thibaut Girka
9c5e7805cc
Merge branch 'master' into glitch-soc/merge-upstream
2019-03-07 13:24:30 +01:00
Thibaut Girka
84c807a0dc
Allow setting whether this is a single choice poll or multiple choices one
2019-03-06 23:56:53 +01:00
Thibaut Girka
cb6e351f4d
Disable file upload when there is a poll
2019-03-06 23:56:53 +01:00
Thibaut Girka
235be596bc
Use server-provided poll limits instead of hardcoded ones
...
Also does not enable polls if no limits are provided by the server
2019-03-06 23:56:53 +01:00
Thibaut Girka
3b1390dc78
Serialize poll limits in instance serializer and initial state
2019-03-06 23:56:53 +01:00
Thibaut Girka
8fe86cebaa
[Glitch] Port polls creation UI from upstream
2019-03-06 23:56:53 +01:00
Thibaut Girka
3e5a0bc825
Fix AddLockVersionToPolls migration
2019-03-06 23:56:43 +01:00
ThibG
da8ce25fa1
Merge pull request #942 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-03-06 22:59:07 +01:00
ThibG
6e295beab2
[Glitch] Disable the underlying button element when an ItemButton is disabled
...
Port b3668a79ec
to glitch-soc
2019-03-06 22:40:17 +01:00
Thibaut Girka
cf4fd8bcfe
Merge branch 'master' into glitch-soc/merge-upstream
2019-03-06 22:39:22 +01:00
Thibaut Girka
1bb23100b1
Add an icon to highlight polls behind a Content Warning
2019-03-06 13:01:27 +01:00
ThibG
fefacb7b7a
Merge pull request #939 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-03-06 12:20:17 +01:00
Eugen Rochko
94a0149ff3
Fix poll options not rendering text after vote/refresh
...
Port fd128b9c7a
to glitch-soc
2019-03-06 11:44:27 +01:00
Eugen Rochko
94f1a751bf
Avoid line breaks in poll options
...
Port 57643557b6
to glitch-soc
2019-03-06 11:43:14 +01:00
Eugen Rochko
7f32d675b0
Render unicode emoji in polls using emoji pack
...
Port 4407f07014
to glitch-soc
2019-03-06 11:42:25 +01:00
Thibaut Girka
4806232997
Merge branch 'master' into glitch-soc/merge-upstream
2019-03-06 11:29:06 +01:00
Thibaut Girka
e80fabfd84
Fix toots opening in dynamic column when trying to interact with them
...
This fixes inline preview cards and polls, preventing them from opening
the toot in detailed view when clicking on an interactive element.
2019-03-06 00:20:43 +01:00
ThibG
bd3567b3f8
Merge pull request #938 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-03-06 00:20:30 +01:00
Thibaut Girka
f108c6a042
Merge branch 'master' into glitch-soc/merge-upstream
2019-03-06 00:03:46 +01:00
Thibaut Girka
ff827c1f38
[Glitch] Perform deep comparison for card data when receiving new props
...
Prevents embedded players from resetting when interacting with the toot
2019-03-05 23:22:29 +01:00
ThibG
772b4ba24c
Merge pull request #935 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-03-05 22:20:58 +01:00
Thibaut Girka
866496ac16
Merge branch 'master' into glitch-soc/merge-upstream
2019-03-05 21:40:28 +01:00
Eugen Rochko
ba6ca3cd69
Fix various issues in polls
...
Port front-end changes from a198add83b
to glitch-soc
2019-03-05 21:35:03 +01:00
ThibG
7f27ee35a8
Display closed polls as such
...
Port cda6ece760
to glitch-soc
2019-03-05 21:35:03 +01:00
ThibG
530151466e
Fixes to the polls UI
...
Port 4ced609497
to glitch-soc
2019-03-05 21:35:03 +01:00
Eugen Rochko
f14eda23e9
Fix web UI crash on page load when detailed status has a poll
...
Port 5dfa433698
to glitch-soc
2019-03-05 21:35:03 +01:00
ThibG
2156765448
Insert polls in redux stores before statuses so it avoids crashes
...
Port 26c56d0c10
to glitch-soc
2019-03-05 21:35:03 +01:00
Eugen Rochko
8d70a8a19b
Add polls
...
Port front-end parts of 230a012f00
to glitch-soc
2019-03-05 21:35:03 +01:00
Thibaut Girka
0d19fcc2fb
Port upstream refactoring of reducers and actions
...
Also includes 9e45b051cf
2019-03-05 21:35:03 +01:00
Eugen Rochko
cce1c3252f
Fix home timeline perpetually reloading when empty
...
Port 3e0ed36e8e
to glitch-soc
2019-03-05 19:30:11 +01:00
Thibaut Girka
f513317ba2
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/models/status.rb
- db/schema.rb
Both conflicts are caused by us having extra database columns.
2019-03-05 19:23:16 +01:00
Mélanie Chauvel (ariasuni)
2a4ce7458a
[Glitch] Fix errors found by eslint
...
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-03-01 14:01:51 +01:00
Mélanie Chauvel (ariasuni)
282ac61500
[Glitch] Make the column header of profile view look like the others, too
...
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-03-01 14:01:51 +01:00
Mélanie Chauvel (ariasuni)
12a0dd71be
[Glitch] Make the column header of toot/thread view look like the others
...
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-03-01 14:01:51 +01:00
ThibG
b969b150e8
Merge pull request #932 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-02-28 22:02:36 +01:00
Thibaut Girka
2267eee356
Merge branch 'master' into glitch-soc/merge-upstream
2019-02-28 21:35:53 +01:00
Thibaut Girka
76ed481aa7
Port public page mastodon-light fixes from upstream
2019-02-27 16:24:57 +01:00
ThibG
ff2270cd06
Merge pull request #930 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-02-26 21:40:28 +01:00
Eugen Rochko
1e06ca1c0a
Fix web UI not removing notifications after block ( #10108 )
...
Regression from #7311
2019-02-26 19:33:59 +01:00
abcang
7209a8b32f
Keep notification when muting_notifications is true ( #7311 )
...
* Keep notification when muting_notifications is true
* Retrun mute object
* Fix test
2019-02-26 19:33:42 +01:00
Thibaut Girka
0158937fc2
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- Dockerfile
Took upstream version and reverted f13ebd02c9
.
Hopefuly it's not needed anymore.
- app/controllers/api/v1/search_controller.rb
The conflict was due to us raising the number of results returned.
Upstream raised it further, so took it.
- config/locales/de.yml
Took upstream changes to theme translation strings.
- config/locales/gl.yml
Took upstream changes to theme translation strings.
- config/locales/nl.yml
Took upstream changes to theme translation strings.
- config/locales/sk.yml
Took upstream changes to theme translation strings.
2019-02-26 17:04:44 +01:00
Thibaut Girka
d82de360c1
Fix non-numeric account identifiers leading to /web/accounts/NaN
...
I'm not sure what purpose these “+” served?!
2019-02-22 17:52:21 +01:00
ThibG
787449c12f
Merge pull request #925 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-02-19 22:42:22 +01:00
Thibaut Girka
ff0576cc2b
Merge branch 'master' into glitch-soc/merge-upstream
2019-02-19 20:18:40 +01:00
Thibaut Girka
896beb16c5
[Glitch] Internationalize unexpected error message
...
Port 4e71b104e6
to glitch-soc,
fixing a crash in the process
2019-02-18 19:49:06 +01:00
Eugen Rochko
be9352266c
Fix hashtag column not subscribing to stream on mount ( #10040 )
...
Fix #9895
2019-02-18 18:16:35 +01:00
Thibaut Girka
d974988541
Fix video player width not being updated to fit container width
2019-02-18 10:44:37 +01:00
ThibG
1aa87a1967
Merge pull request #920 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-02-17 16:00:24 +01:00
Thibaut Girka
f6a4493a58
Merge branch 'master' into glitch-soc/merge-upstream
2019-02-17 15:43:12 +01:00
Thibaut Girka
ec18359c3d
Fix CW fold/unfold in remote interaction dialog
2019-02-17 15:40:49 +01:00
Ben Lubar
fa9635c741
Allow multi-line image descriptions. (Glitch)
2019-02-17 15:19:12 +01:00
ThibG
a2b4b82f0f
Merge pull request #918 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-02-17 15:13:17 +01:00
Thibaut Girka
e31fc2b458
[Glitch] Fix crash on public hashtag pages when streaming fails
...
Port 041ff5fa9a
to glitch-soc
2019-02-17 14:28:25 +01:00
Thibaut Girka
cac75e01b8
Fix static error page to use the correct pack
2019-02-17 13:34:40 +01:00
Thibaut Girka
91c9cb6022
[Glitch] Change buttons on timeline preview to open the interaction dialog
...
Port 71e28ba399
to glitch-soc
2019-02-17 12:39:44 +01:00
Thibaut Girka
9a47f2cbdf
Port upstream's javascript to the error page
2019-02-17 12:27:01 +01:00
Thibaut Girka
369a475a70
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/serializers/rest/instance_serializer.rb
- app/views/layouts/error.html.haml
- public/oops.png
Took our version (same as upstream but without the things that only
make sense in an animation).
Additional changes:
- app/javascript/flavours/vanilla/theme.yml
Include upstream's javascript in error pages.
2019-02-17 12:26:55 +01:00
ThibG
ab9082b332
Merge pull request #916 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-02-16 13:43:23 +01:00
Eugen Rochko
59fa38a4f6
Fix style regressions on landing page ( #10030 )
2019-02-15 18:22:06 +01:00
Thibaut Girka
a151c5566a
[Glitch] Fix hashtags select styling in default and high contrast skins
...
Port 169b9d4428
to glitch-soc
2019-02-15 18:21:00 +01:00
Eugen Rochko
4dcb04b888
Fix color of static page links in high contrast theme ( #10028 )
2019-02-15 18:10:26 +01:00
Thibaut Girka
06cc04fd23
Merge branch 'master' into glitch-soc/merge-upstream
2019-02-15 18:02:45 +01:00
Thibaut Girka
2769b54466
[Glitch] Fix occasional crash in detailed toot view
...
Port f9a338b473
to glitch-soc
2019-02-15 17:34:15 +01:00
ThibG
435a367c10
Merge pull request #914 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-02-13 16:19:15 +01:00
Thibaut Girka
614ea184bb
[Glitch] Add "copy link" item to status action bars
...
Port 3cfadd875c
to glitch-soc
2019-02-13 07:29:57 +01:00
Thibaut Girka
e230b176fb
[Glitch] Don't focus spoiler input when disabled spoiler
...
Inspired by 0e513ff862
2019-02-12 21:16:02 +01:00
Thibaut Girka
0e34e91661
Merge branch 'master' into glitch-soc/merge-upstream
2019-02-12 20:32:48 +01:00
ThibG
a3ba28eb17
Merge pull request #913 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-02-12 20:29:55 +01:00
Thibaut Girka
b89e003c4d
Handle deletion of filtered toots
2019-02-10 22:54:25 +01:00
Thibaut Girka
7c0728c776
Minor fix to timeline jump avoiding behavior
2019-02-10 22:54:25 +01:00
Thibaut Girka
dfe1d548a5
Adjust scroll when statuses above the current scroll position are deleted
2019-02-10 22:54:25 +01:00
Thibaut Girka
0b91322762
Adjust scroll if previewCard appeared
2019-02-10 22:54:25 +01:00
Thibaut Girka
049c9a3b97
Avoid two-step rendering of statuses as much as possible
...
Cache width shared by Video player, MediaGallery and Cards at the
ScrollableList level, pass it down through StatusList and Notifications.
2019-02-10 22:54:25 +01:00
Thibaut Girka
68f3d003d6
Refactor intersection observer article code
2019-02-10 22:54:25 +01:00
Thibaut Girka
e49e54a5ff
Cleanup redundant markup for hidden statuses
2019-02-10 22:54:25 +01:00
Thibaut Girka
405ef5ad37
Hide items rendered out-of-frame (once they have been rendered at least once)
2019-02-10 22:54:25 +01:00
Thibaut Girka
b47a53f902
[Glitch] Rename from instance to server.
...
Port 46e806cd2f
to glitch-soc
2019-02-10 22:19:26 +01:00
Thibaut Girka
14a1bb703a
[Glitch] Fix not showing custom emojis in share page emoji picker
...
Port e02a13f64e
to glitch-soc
2019-02-10 21:54:43 +01:00
Thibaut Girka
b7fbcb21b3
[Glitch] Add featured hashtags to profiles
...
Port SCSS changes from 364f2ff9aa
2019-02-10 21:50:42 +01:00
Thibaut Girka
7ed2aeb6e9
[Glitch] Allow multiple files upload through web UI, including drag & drop
...
Port 750c67660d
to glitch-soc
2019-02-10 21:44:14 +01:00
Thibaut Girka
a963ea67dd
[Glitch] Add missing rejection handling for Promises
...
Port missing parts from 2c51bc0ca5
to glitch-soc
2019-02-10 21:44:14 +01:00
Thibaut Girka
6b2eefc7bf
[Glitch] Add WebP support
...
Port 5092d17f29
to glitch-soc
2019-02-10 21:13:17 +01:00
Thibaut Girka
bf94a43496
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/controllers/oauth/authorized_applications_controller.rb
Two changes too close to each other
- app/controllers/settings/sessions_controller.rb
- app/lib/user_settings_decorator.rb
Two changes too close to each other
- app/models/media_attachment.rb
New changes too close to glitch-soc only changes.
- app/models/user.rb
Two changes too close to each other.
- app/services/remove_status_service.rb
Kept direct timeline code which had been removed upstream.
- app/views/settings/preferences/show.html.haml
Two changes too close to each other.
- config/locales/en.yml
Introduction of a new string too close to glitch-soc-only's “flavour”
- config/locales/ja.yml
Introduction of a new string too close to glitch-soc-only's “flavour”
- config/locales/pl.yml
Introduction of a new string too close to glitch-soc-only's “flavour”
- config/locales/simple_form.en.yml
Introduction of a new string too close to glitch-soc-only's “skin”
- config/locales/simple_form.pl.yml
Introduction of a new string too close to glitch-soc-only's “skin”
- config/settings.yml
Reverted upstream's decision of enabling posting application by default.
2019-02-10 21:10:09 +01:00
Thibaut Girka
1a70fca168
Fix CW unfolding not triggering re-layout in public hashtag page
2019-02-06 15:32:48 +01:00
Thibaut Girka
3ce34ce7a2
Fix unfolding CWs on public hashtag page
...
Fixes #909
2019-02-06 14:37:57 +01:00
Thibaut Girka
c9d261753a
Remove redundant “options” from “Compose box options”
...
Thanks @ariasuni.
2019-02-03 01:02:39 +01:00
Marek Ľach
a0a8203a0b
Minor description corrections
2019-02-03 00:30:34 +01:00
ThibG
1cd7b15532
Merge pull request #904 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-02-01 18:24:36 +01:00
Eugen Rochko
663593b508
Fix link color in high-contrast theme, add underlines ( #9949 )
...
Improve sorting of default themes in the dropdown
2019-02-01 16:23:13 +01:00
Thibaut Girka
2e93f87c9f
[Glitch] Replace unlock-alt icon with unlock
...
Port 6513f6c953
to glitch-soc
2019-02-01 16:15:44 +01:00
Thibaut Girka
e87bd6d94a
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- README.md
Kept our version
- app/javascript/mastodon/features/compose/components/compose_form.js
Two changes too close to each other, took both changes
2019-02-01 16:12:20 +01:00
Thibaut Girka
f611da4899
Do not mark toots as sensitive if they don't have any media attached
2019-02-01 15:55:28 +01:00
Thibaut Girka
762e4fdf55
Fix hashtag processing when sending toots
...
This fixes crashes in pleroma when writing toots with a content warning,
since pleroma inserts a “nsfw” hashtag that isn't part of the toot's text.
2019-02-01 12:37:28 +01:00
ThibG
48d00ac0d9
Merge pull request #901 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-01-28 21:40:38 +01:00
Thibaut Girka
42713b9710
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- README.md: kept our version
2019-01-28 21:14:47 +01:00
ThibG
e488faaa4a
Merge pull request #900 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-01-27 22:24:29 +01:00
Thibaut Girka
f35d790480
[Glitch] Fix initial value of volume slider in video player and handle volume changes
...
Port a53dcaa298
to glitch-soc
2019-01-27 22:02:59 +01:00
Thibaut Girka
72bab194ad
Merge branch 'master' into glitch-soc/merge-upstream
2019-01-27 21:57:55 +01:00
ThibG
f1adce7f6d
Merge pull request #899 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-01-27 14:23:24 +01:00
Thibaut Girka
7251bc3853
Merge branch 'master' into glitch-soc/merge-upstream
2019-01-27 13:57:25 +01:00
Thibaut Girka
f938800ef4
Revert to storing application info, and display it to the author via API
2019-01-27 13:56:41 +01:00
Thibaut Girka
05415fa5d3
Make storing and displaying application used to toot opt-in
2019-01-27 13:56:41 +01:00
ThibG
64cb9b6913
Merge pull request #897 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-01-26 18:47:48 +01:00
Thibaut Girka
80d954ec10
Merge branch 'master' into glitch-soc/merge-upstream
2019-01-26 18:32:49 +01:00
ThibG
270bf7778d
Merge pull request #896 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-01-25 22:42:21 +01:00
trwnh
8ef0498f1c
Fix Firefox scrollbar color regression in #9210 ( #9908 )
...
In #9210 the track color was changed to transparent for no apparent reason. This PR restores the previous color selections implemented in #8653 while keeping the updated property name. Per https://github.com/tootsuite/mastodon/pull/9210#issuecomment-441788776 there is no particular reason for the color change in #9210 .
2019-01-25 11:48:27 +01:00
Jeong Arm
77394156dd
Apply style for .landing-page strong ( #9892 )
2019-01-25 11:48:02 +01:00
Thibaut Girka
04e2c67389
Merge branch 'master' into glitch-soc/merge-upstream
2019-01-25 11:37:49 +01:00
ThibG
afec6b43eb
Merge pull request #893 from ThibG/glitch-soc/fixes/dm-column-crash
...
Fix crash in Direct Messages column settings
2019-01-23 18:53:36 +01:00
Thibaut Girka
c30da25c5f
Fix crash in Direct Messages column settings
...
Fixes #892
2019-01-23 18:29:18 +01:00
ThibG
6f53c4fc79
Merge pull request #889 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes (v2.7.0)
2019-01-21 11:35:31 +01:00
Thibaut Girka
9dfbcf941e
Merge branch 'master' into glitch-soc/merge-upstream
2019-01-20 16:49:23 +01:00
ThibG
aa362ab73d
Merge pull request #888 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-01-20 13:56:37 +01:00
Thibaut Girka
5145c81620
[Glitch] Fix public hashtag timeline width on mobile, fix scrollbar width compensation
...
Port 3b3a4d8a17
to glitch-soc
2019-01-20 11:56:21 +01:00
Thibaut Girka
e9060b04d4
[Glitch] Hide floating action button on search and getting started pages
...
Port 30af4ee65f
to glitch-soc
2019-01-20 11:54:38 +01:00
tmm576
9b5810b3e9
Allow event defaults on index for text data transfer ( #9840 )
2019-01-20 11:53:22 +01:00
Thibaut Girka
a93cb340bd
[Glitch] Fix new hashtag page's items not being full-width on mobile
...
Port b506ce1197
to glitch-soc
2019-01-20 11:52:06 +01:00
Thibaut Girka
8001a9b97b
[Glitch] Add information about how to opt-in to the directory on the directory
...
Port SCSS changes from a492a9bcd3
to glitch-soc
2019-01-20 11:50:19 +01:00
Mélanie Chauvel (ariasuni)
6dbb10c4b7
Fix slightly cropped font on settings page dropdowns when using system font ( #9839 )
2019-01-20 11:49:27 +01:00
Thibaut Girka
02295257b3
[Glitch] Improve the public hashtag page
...
Port 8b19903559
to glitch-soc
2019-01-20 11:47:17 +01:00
Thibaut Girka
3e8b623975
[Glitch] Redesign public hashtag page to use a masonry layout
...
Port bc642ac24b
to glitch flavour
2019-01-20 11:38:09 +01:00
Thibaut Girka
5e0cf92fd1
Merge branch 'master' into glitch-soc/merge-upstream
...
No conflicts.
2019-01-19 18:28:37 +01:00
ThibG
530d29148c
Merge pull request #887 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-01-16 16:28:38 +01:00
Thibaut Girka
5684cd090c
[Glitch] make draggingOver state off correctly
...
Port d6433b3931
to glitch-soc
2019-01-16 14:50:17 +01:00
Thibaut Girka
92830029ca
[Glitch] Make hashtag search results link to the hashtag URL
...
Port 6cfb357940
to glitch-soc
2019-01-16 14:25:58 +01:00
Thibaut Girka
ad32896a93
[Glitch] Fix hashtag timeline on mobile
...
Port c5b8824a3e
to glitch-soc
2019-01-16 14:24:23 +01:00
Thibaut Girka
dbe311f0e9
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- config/locales/simple_form.pl.yml
2019-01-16 14:20:07 +01:00
ThibG
077639c274
Merge pull request #886 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-01-14 11:48:36 +01:00
Thibaut Girka
4cec7a77c3
[Glitch] Adjust admin UI right panel size
...
Port 9ee9cb549b
to glitch-soc
2019-01-13 20:41:38 +01:00
Thibaut Girka
2c5f0f12ac
[Glitch] change height on narrow view to take 100% of screen
...
Port 1183246043
to glitch-soc
2019-01-13 20:40:46 +01:00
Thibaut Girka
278ff1318f
[Glitch] Add attachment list fallback to public pages
...
Port JS changes from 4fb94c758e
to glitch-soc
2019-01-13 14:42:50 +01:00
Thibaut Girka
eff1c94744
Merge branch 'master' into glitch-soc/merge-upstream
2019-01-13 14:41:06 +01:00
ThibG
2cfa55185a
Merge pull request #885 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-01-11 10:53:58 +01:00
Thibaut Girka
394525e329
[Glitch] Postpone scroll-to-detailed status after react components are loaded
...
Port 70801b850c
to glitch-soc
2019-01-10 21:00:33 +01:00
Thibaut Girka
7cc800d0df
[Glitch] Redesign admin instances area
...
Port SCSS changes from 1c6588accc
2019-01-10 21:00:33 +01:00
Thibaut Girka
e03813cf0a
[Glitch] Stop gifv timeline preview explicitly when open the media gallery
...
Port cf3c0fc38c
to glitch-soc
2019-01-10 21:00:33 +01:00
Thibaut Girka
147f4f9fd2
[Glitch] refactored account.js
...
Port 57c91fbbed
to glitch-soc
2019-01-10 21:00:33 +01:00
Thibaut Girka
ec441e0299
[Glitch] Fix embed play icons regression
...
Port bd5a8c7765
to glitch-soc
2019-01-10 21:00:33 +01:00
Thibaut Girka
2b2584a37b
[Glitch] Display fallback link card thumbnail when none is given
...
Port 1512af2811
to glitch-soc
2019-01-10 21:00:33 +01:00
Thibaut Girka
a2a64ecd3e
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- .eslintrc.yml
Removed, as upstream removed it.
- app/controllers/admin/statuses_controller.rb
Minor code cleanup when porting one of our features.
- app/models/account.rb
Note length validation has changed upstream.
We now use upstream's validation (dropped legacy glitch-soc
account metadata stuff) but with configurable limit.
- app/services/post_status_service.rb
Upstream has added support for scheduled toots, refactoring
the code a bit. Adapted our changes to this refactoring.
- app/views/stream_entries/_detailed_status.html.haml
Not a real conflict, changes too close.
- app/views/stream_entries/_simple_status.html.haml
Not a real conflict, changes too close.
2019-01-10 21:00:30 +01:00
Thibaut Girka
fb0c906c71
Revert "Revert "Add handler for Move activity ( #9629 )""
...
This reverts commit bb96a74637
.
2019-01-10 18:46:17 +01:00
Thibaut Girka
d1da0a1086
Port a few public.js changes from upstream, move some code around
...
glitch-soc's public.js was a bit out of date, and code was put inappropriately
to the common public.js
2019-01-10 18:45:17 +01:00
Thibaut Girka
e8ae77236b
[Glitch] Only consider mouse move in scrolling on item insertion
...
Port cc1f13dfd0
to glitch-soc
2019-01-10 12:09:12 +01:00
Thibaut Girka
825decbf9e
[Glitch] Identify manual scrolling to cancel scroll to top reset on mouse idle
...
Port 2f86fc5e0a
to glitch-soc
2019-01-10 12:09:12 +01:00
Thibaut Girka
19c64a49f7
[Glitch] Cancel list scroll reset after mouse move on wheel scroll
...
Port 9cfd610484
to glitch-soc
2019-01-10 12:09:12 +01:00
Thibaut Girka
21f27e6579
[Glitch] Temporarily hold timeline if mouse moved recently
...
Port 6a1216d2cd
to glitch-soc
2019-01-10 12:09:12 +01:00
Thibaut Girka
3a0b12cbfe
Fix how flavour screenshots are displayed in the vanilla flavour
2019-01-08 20:20:35 +01:00
Thibaut Girka
20fd855830
Update glitch-soc admin page style from upstream
...
Port SCSS changes from e55dce3176
to glitch-soc
2019-01-08 20:20:35 +01:00
ash lea
dc501c4134
add list title editing
2019-01-06 13:03:57 +01:00
Thibaut Girka
7baf15675f
Add local setting to disable swipe-to-change-columns
2019-01-05 21:47:48 +01:00
ThibG
0acd51acdc
Merge pull request #878 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-01-02 20:03:32 +01:00
Thibaut Girka
e77ceb1b29
[Glitch] Update dependencies for Node.js (2018-12-31)
...
Port compatibility changes from 8f5fdab5bf
to glitch-soc
2019-01-02 16:07:33 +01:00
Thibaut Girka
1464620ddb
[Glitch] Improve admin UI for account view
...
Port SCSS changes from 6e49907ecf
to glitch-soc
2019-01-02 15:38:48 +01:00
Thibaut Girka
9b606cb24c
[Glitch] Update emoji codepoint mappings to v11.0
...
Port 2ee779dcd3
to glitch-soc
2019-01-02 15:36:59 +01:00
Thibaut Girka
bb96a74637
Revert "Add handler for Move activity ( #9629 )"
...
This reverts commit 0f938ff29c
.
2019-01-02 15:36:59 +01:00
Thibaut Girka
1b35ca17a9
Fix some image paths in SCSS files
2019-01-02 15:36:59 +01:00
Thibaut Girka
eb481c9049
Fix syntax errors in win95 SCSS file
2019-01-02 15:36:59 +01:00
Thibaut Girka
63d673ea24
Fix CircleCI
2019-01-02 15:36:59 +01:00
Thibaut Girka
571d219bb9
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts manually resolved:
- app/services/post_status_service.rb
- config/locales/simple_form.pl.yml
- config/routes.rb
- config/webpack/loaders/sass.js
- config/webpack/shared.js
- package.json
- yarn.lock
2019-01-02 15:36:53 +01:00
Thibaut Girka
b300948526
Fix crash when clearing uninitialized timeline
...
Fixes #875
2018-12-30 16:56:55 +01:00
Thibaut Girka
d126240129
Immediately go back in browser history upon successfully sending toot
2018-12-30 14:07:57 +01:00
Thibaut Girka
115b1abb6e
Rename hide_followers_count helper to hide_followers_count?
2018-12-28 20:05:47 +01:00
Thibaut Girka
374bae0abe
Do not leak followers count on public pages
...
Fixes #873
2018-12-28 20:05:47 +01:00
Thibaut Girka
f349fe2159
Fix account unsilencing and unsuspension
...
Fix regression from 3c033c4352
2018-12-26 19:13:54 +01:00
ThibG
8a3e4a4883
Merge pull request #871 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2018-12-23 15:23:12 +01:00
Thibaut Girka
cb98e7dbd3
[Glitch] Add moderation warnings
...
Port SCSS changes from 3c033c4352
to glitch-soc
2018-12-23 12:54:09 +01:00
Thibaut Girka
71d683b410
Change instance_presenter_spec to point to glitch-soc instead of tootsuite
2018-12-23 11:45:26 +01:00
Thibaut Girka
82088f0d7d
[Glitch] Remove links to bridge.joinmastodon.org (non-functional)
...
Port bb62827c16
to glitch-soc
2018-12-23 11:43:47 +01:00
Thibaut Girka
c5c4450fdd
Remove file added by error
2018-12-23 11:43:25 +01:00
Thibaut Girka
22dedb676b
[Glitch] Fix unnecessary loadMore calls when the end of a timeline has been reached
...
Port 8389b496ba
to glitch flavour
2018-12-23 11:40:52 +01:00
Thibaut Girka
3e686beaea
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- config/routes.rb
Upstream changed some admin routes, conflict was because of an added :show
action for statuses on our side. Kept it.
2018-12-23 11:28:28 +01:00
Thibaut Girka
1a3088364f
Fix composer not getting focus after reply confirmation dialog
...
The modal-handling code gives back focus to the element focused when the
modal opened. However, in the case of reply confirmation, it would do so
*after* the composer code itself requested focus.
2018-12-21 20:00:49 +01:00
Thibaut Girka
0605c004a5
Fix incorrect and duplicate onConfirm callback
2018-12-21 20:00:49 +01:00
Thibaut Girka
6166751f9e
[Glitch] Fix that translation is not applied to "joining hashtags"
...
Port bfec030a4e
to glitch-soc
2018-12-21 19:54:54 +01:00
Thibaut Girka
3611ea02e2
[Glitch] Deep compare tags for hashtag column reload
...
Port 4fdefffb99
to glitch-soc
2018-12-21 19:54:54 +01:00
Thibaut Girka
4be7313298
[Glitch] Allow joining several hashtags in a single column
...
Port 4c03e05a4e
to glitch-soc
This introduces new requirements in the API:
`/api/v1/timelines/tag/:tag` now accepts new params: `any`, `all` and `none`
It now returns status matching tag :tag or any of the :any, provided that
they also include all tags in `all` and none of `none`.
2018-12-21 19:54:54 +01:00
Thibaut Girka
6073195a7d
[Glitch] Display customized mascot in web UI
...
Port relevant parts of 9d4541c612
to glitch-soc
2018-12-20 18:39:05 +01:00
Thibaut Girka
fb63941c47
Make drawer markup and styling closer to upstream
...
WARNING: This may break some custom skins!
`.drawer > .contents` has been moved to
`.drawer > .drawer__pager > .drawer__iner`, and the waves have been moved
from `.drawer > .contents` to `.drawer__inner__mastodon`!
2018-12-20 18:39:05 +01:00
Thibaut Girka
5eaf2c9e02
[Glitch] Back to the getting-started when pins the timeline
...
Port 5bf100f87b
to glitch-soc
2018-12-20 14:51:28 +01:00
Thibaut Girka
bc113927d6
Move hide_followers_count logic to an helper
2018-12-20 14:51:12 +01:00
Thibaut Girka
bd23288a52
Add a per-user setting to hide followers count
...
This is only available if the instance-wide setting isn't set and allows
people to hide their own followers count. This does not hide others' to
them.
2018-12-20 14:51:12 +01:00
Thibaut Girka
9e04b2e8a4
Per-user followers count display in profile directory
2018-12-20 14:51:12 +01:00
Thibaut Girka
1b18eb49e3
Hide negative follower counts from glitch flavour
2018-12-20 14:51:12 +01:00
Thibaut Girka
a1c56fcef1
Add admin setting to disable followers count
2018-12-20 14:51:12 +01:00
Thibaut Girka
0cd367e295
Refactor followers_accounts_controller
2018-12-20 14:51:12 +01:00
Thibaut Girka
c2b1e8bc43
Override current_user when generating static pages
2018-12-19 20:49:58 +01:00
Thibaut Girka
e8d5affe06
Restore oops.gif animation for user who have auto_play_gif set
2018-12-19 20:49:58 +01:00
Thibaut Girka
0c2d48b60a
Replace animated oops.gif by a non-animated image
...
Fixes #6060
2018-12-19 20:49:58 +01:00
ThibG
aae088aaf0
Merge pull request #865 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2018-12-19 16:19:00 +01:00
Thibaut Girka
2228655848
[Glitch] Improved appearance of notification filter on safari
...
Port 2e1b5edfea
to glitch-soc
2018-12-19 13:00:08 +01:00
Thibaut Girka
add74816a5
Merge branch 'master' into glitch-soc/merge-upstream
2018-12-19 12:58:49 +01:00
Thibaut Girka
655da1be20
Reword confirm_before_clearing_draft description
2018-12-18 21:54:34 +01:00
Thibaut Girka
9a7201f2ee
Allow disabling the reply confirmation dialog
2018-12-18 21:54:34 +01:00
Thibaut Girka
056a8a8ee4
Allow disabling media confirmation from the confirmation dialog itself
2018-12-18 21:54:34 +01:00
Thibaut Girka
490d8fff0b
Remove dead code
2018-12-18 21:39:35 +01:00
Thibaut Girka
82b01a6c9f
[Glitch] Put "Media Only" option in column settings instead of content area headline
...
Port 4f42238c29
to glitch-soc
2018-12-18 21:39:35 +01:00
Thibaut Girka
9fc7ad7b9c
[Glitch] Always display tab navigation on local/federated timeline even when empty
...
Port 90b64c0069
to glitch-soc
2018-12-18 21:39:35 +01:00
Thibaut Girka
c644e6ea89
Do not replace history state
...
This is both for consistency with account timelines and to not mess with
the logic used to decide whether going back in the browser's history is
going to make us leave the WebUI.
2018-12-18 21:39:35 +01:00
Thibaut Girka
200a8bdd3a
[Glitch] Enable media timeline
...
Port 8182b61518
to glitch-soc
2018-12-18 21:39:35 +01:00
Thibaut Girka
a693d6e2f2
[Glitch] Hide section headline for timelines in production
...
Port 4eeda67727
to glitch-soc
2018-12-18 21:39:35 +01:00
Thibaut Girka
593f88acb1
[Glitch] Change column params on pinned timeline
...
Port 06252ec71e
to glitch-soc
2018-12-18 21:39:35 +01:00
Thibaut Girka
c03cbb9471
[Glitch] Save onlyMedia prop when pinning column
...
Port 5ea643b279
to glitch-soc
2018-12-18 21:39:35 +01:00
Thibaut Girka
1a9e78b9bc
[Glitch] Add exact attribute to WrappedRoute for community timeline
...
Port 46061dc041
to glitch-soc
2018-12-18 21:39:35 +01:00
Thibaut Girka
1fb4bf87f7
[Glitch] Add media timeline
...
Port 7403e5d306
to glitch-soc
2018-12-18 21:39:35 +01:00
ThibG
74ee5bdf37
Merge pull request #862 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2018-12-18 19:37:07 +01:00
Thibaut Girka
0ef2c1415a
[Glitch] Make notifications quick-filter use consistent style with profile tabs
...
Port 12ab15e584
to glitch-soc
2018-12-18 17:23:04 +01:00
Thibaut Girka
06a7c07eda
[Glitch] Add notification quick-filter bar in the frontend app
...
Port 13dce12665
to glitch-soc
2018-12-18 17:22:01 +01:00
Thibaut Girka
a18a46ca6e
[Glitch] Responsive design for profile directory
...
Port SCSS changes from 087e118971
to glitch flavour
2018-12-18 17:03:53 +01:00
Thibaut Girka
034ffc079e
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/controllers/admin/base_controller.rb
Some refactoring made upstream, no real conflict.
- app/javascript/mastodon/features/compose/components/compose_form.js
Updated using upstream's code but using maxChars instead of the
hardcoded length of 500 characters per toot.
- app/javascript/styles/mastodon/components.scss
Upstream redesigned the onboarding modal. Not sure why we had a
conflict there.
2018-12-18 16:55:15 +01:00
Thibaut Girka
36d27e2891
Sandbox toot embeds in the embed modal
...
It should not be necessary thanks to our Content Security Policy, but best
be sure in case a server's CSP is incorrect. Also, avoids a CSP warning about
loading remote scripts.
2018-12-17 22:22:29 +01:00
Thibaut Girka
30de4e4dfc
[Glitch] Minor scrollable list fixes
...
* Make sure loading indicator has enough vertical space
* Respect reduce_motion setting for loading indicator
Port 4ede51743e
to glitch-soc
2018-12-17 22:14:06 +01:00
Thibaut Girka
8266d224ef
Split out is_changing_upload from is_submitting
...
Fixes #855
2018-12-17 13:01:07 +01:00
ThibG
396c5dea87
Merge pull request #856 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2018-12-16 15:26:50 +01:00
Thibaut Girka
7238e4ea5f
[Glitch] Fix padding on select elements in preferences
...
Port c58c00651b
to glitch-soc
2018-12-16 14:48:15 +01:00
Thibaut Girka
89e4ac67c8
[Glitch] Make animated header resoect `auto_play_gif`
...
Port part of 7c48688d85
to glitch-soc
2018-12-16 14:48:15 +01:00
Thibaut Girka
65e994b29b
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/controllers/directories_controller.rb
- app/controllers/settings/applications_controller.rb
- app/controllers/settings/base_controller.rb
- app/controllers/settings/deletes_controller.rb
- app/controllers/settings/exports_controller.rb
- app/controllers/settings/follower_domains_controller.rb
- app/controllers/settings/imports_controller.rb
- app/controllers/settings/migrations_controller.rb
- app/controllers/settings/notifications_controller.rb
- app/controllers/settings/preferences_controller.rb
- app/controllers/settings/sessions_controller.rb
- app/controllers/settings/two_factor_authentication/confirmations_controller.rb
- app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb
- app/controllers/settings/two_factor_authentications_controller.rb
Conflicts were due to some refactoring already made in glitch-soc
when introducing flavours.
2018-12-15 10:45:53 +01:00
Thibaut Girka
f0505a5b2e
On mobile, go back in browser history upon posting, unless threaded mode is enabled
2018-12-14 23:56:53 +01:00
Rey Tucker
35b2ba5030
Remove form_action from CSP
...
This trips an issue when trying to authenticate through to
third-party sites, e.g. bridge.joinmastodon.org:
Refused to send form data to 'https://bridge.joinmastodon.org/ '
because it violates the following Content Security Policy
directive: "form-action 'self'".
Thread: https://vulpine.club/@digifox/101230933751352042
2018-12-14 08:02:06 +01:00
Thibaut Girka
132dd28162
[Glitch] Fix timeline pagination in the WebUI
...
The `hasMore` property of timelines in redux store was set whenever an API
request returned only one page of results, *even* if the query only requested
newer statuses (using `since_id`), causing `hasMore` to be incorrectly set to
false whenever fetching new toots in a timeline, which happens each time
an account's timeline or media gallery is visited.
2018-12-13 21:59:46 +01:00
Thibaut Girka
c20c6c2029
[Glitch] Fix hasMore in notifications
2018-12-13 21:58:48 +01:00
Thibaut Girka
1e656c3632
[Glitch] Fix “load more” button when no data has been fetched
2018-12-13 15:00:36 +01:00
Thibaut Girka
2d097c10d0
[Glitch] Make account media gallery more consistent with account timeline
...
Display “load more” more consistently, add a loading indicator on first load.
2018-12-13 15:00:36 +01:00
Thibaut Girka
5f581d7c3c
[Glitch] Fix LoadMore usage in account media gallery
...
(Even though that codepath is probably never actually used…)
2018-12-13 15:00:36 +01:00
Thibaut Girka
73ee38f485
[Glitch] Do not display empty message when the list is known to have more elements
2018-12-13 15:00:36 +01:00
Thibaut Girka
39696024ca
Minor cleanup in ScrollableList component
2018-12-13 15:00:36 +01:00
ThibG
c6b7b98489
Merge pull request #849 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2018-12-09 16:38:09 +01:00
Thibaut Girka
4f59d1efd7
Fix directory controller in glitch-soc
2018-12-09 16:08:10 +01:00
Thibaut Girka
480f938511
[Glitch] Fix various things in the directory
...
Port ecd303c097
to glitch-soc
2018-12-09 16:08:10 +01:00
Thibaut Girka
0b1bc66695
Port directory CSS changes from upstream
...
Port 73be8f38c1
to glitch-soc
2018-12-09 16:08:10 +01:00
Thibaut Girka
e7f1bfdc2d
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/javascript/packs/public.js
- app/models/user.rb
- config/settings.yml
- db/schema.rb
Moved public.js changes to settings.js.
2018-12-09 16:08:04 +01:00
ThibG
e3682c9c17
Merge pull request #848 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2018-12-06 17:40:43 +01:00
Thibaut Girka
4167ed375b
Fix mention links in detailed statuses not opening in the WebUI
2018-12-06 15:31:21 +01:00
Thibaut Girka
24822eca73
Revert "Add database statement timeout of 60s ( #9382 )"
...
This reverts commit 58a29db99d
.
2018-12-06 14:39:04 +01:00
Thibaut Girka
1df392819d
Merge branch 'master' into glitch-soc/merge-upstream
2018-12-06 12:44:38 +01:00
David Yip
fe9340d95e
Merge pull request #838 from ThibG/glitch-soc/features/reply-all-streaming-entries
...
Display a double reply arrow on public pages for toots that are replies
2018-12-02 16:30:52 -06:00
ThibG
80462e1b8d
Merge pull request #842 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2018-12-02 20:42:10 +01:00
Thibaut Girka
d32d33f408
Merge branch 'master' into glitch-soc/merge-upstream
2018-12-02 20:29:14 +01:00
ThibG
44e6c2dd74
Merge pull request #840 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2018-12-02 11:35:26 +01:00
Thibaut Girka
a07e37cc17
Merge branch 'master' into glitch-soc/merge-upstream
2018-12-01 21:00:16 +01:00
Thibaut Girka
4b85bf12ab
Fix since_id
2018-12-01 18:59:24 +01:00
ThibG
3cbe0c26bb
Merge pull request #837 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2018-11-30 22:37:58 +01:00
Thibaut Girka
76320bf6d8
Scroll to selected toot even if the ancestors happen to be loaded
2018-11-30 22:37:38 +01:00
Thibaut Girka
a10fee3c09
Scroll to detailed status when new ancestors get inserted
2018-11-30 22:37:38 +01:00
Thibaut Girka
31599ad91c
[Glitch] Fix bug in order of conversations in web UI
...
Port e18390cfe6
to glitch-soc
2018-11-30 22:37:38 +01:00
Thibaut Girka
837ea32c88
[Glitch] Replace recursion in status mapStateToProps
...
Port dfbadd6837
to glitch-soc
2018-11-30 22:37:38 +01:00
Thibaut Girka
a28f5695f3
[Glitch] Fix context building in the reducer
...
Port 7706ed038f
to glitch-soc
2018-11-30 22:37:38 +01:00
Thibaut Girka
1624a95b2b
[Glitch] Introduce flat layout to contexts reducer
...
Port 023fe5181b
to glitch-soc
2018-11-30 22:37:38 +01:00
Thibaut Girka
1a5de04789
Display a double reply arrow on public pages for toots that are replies
2018-11-30 22:09:52 +01:00
Thibaut Girka
bc8411ec87
Merge branch 'master' into glitch-soc/merge-upstream
2018-11-30 20:16:26 +01:00
ThibG
b65daa25fa
Merge pull request #835 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2018-11-29 21:47:18 +01:00
Thibaut Girka
ad7a3974cc
Merge branch 'master' into glitch-soc/merge-upstream
2018-11-29 19:22:52 +01:00
Thibaut Girka
6a264c9379
Improve detailed status component lifecycle
...
- Move componentWillMount and componentWillReceiveProps logic to
getDerivedStateFromProps.
- Compute CW auto-unfold status earlier
2018-11-29 18:32:42 +01:00
Thibaut Girka
7e63fb26e0
Do not hardcode preferences link, pleroma doesn't have it
2018-11-28 22:36:01 +01:00
Thibaut Girka
922d05864f
Add error boundary component to catch Web UI crashes
2018-11-28 22:36:01 +01:00
Thibaut Girka
39c8a71df8
Do not crash the whole UI when loading an invalid column
2018-11-28 22:36:01 +01:00
Thibaut Girka
c18bb5d245
Switch “cycling” reply policy link to set of radio inputs
...
Fixes #832
2018-11-28 22:35:42 +01:00
Thibaut Girka
6b22845039
Add specs for list replies policy
2018-11-28 14:46:07 +01:00
Thibaut Girka
f17a61a916
Add basic UI to set list replies setting in glitch-soc
2018-11-28 14:46:07 +01:00
Thibaut Girka
06c7fb8015
Add backend support to read and update list-specific show_replies settings
2018-11-28 14:46:07 +01:00
Thibaut Girka
53d0293d25
Add database support for list show-reply preferences
2018-11-28 14:46:07 +01:00
David Yip
74a281475a
Merge pull request #829 from ThibG/glitch-soc/features/volume-sliders
...
[Glitch] Volume sliders for videos
2018-11-27 15:27:21 -06:00
ThibG
33be091f50
Merge pull request #828 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2018-11-27 16:26:18 +01:00
Thibaut Girka
3b707bdc12
[Glitch] Volume sliders for videos
...
Port f978afa487
to glitch-soc
2018-11-27 15:21:57 +01:00
Thibaut Girka
55edfd6e0e
Merge branch 'master' into glitch-soc/merge-upstream
2018-11-27 15:10:58 +01:00
Thibaut Girka
f969eca07e
[Glitch] check_boxes label should use display: inline-block
...
Port 180ae0472a
to glitch-soc
2018-11-27 13:29:12 +01:00
Thibaut Girka
f8e07ca5cd
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/models/status.rb
Resolved by taking both changes (not a real conflict, just changes too close
to each other).
2018-11-27 13:23:02 +01:00
Thibaut Girka
6b6e633c09
Update MediaGallery and Video props when folding/unfolding CWs in detailed statuses
2018-11-25 11:29:56 +01:00
Thibaut Girka
b41d60f2d8
Render placeholder when inline video container width isn't known
2018-11-25 11:29:56 +01:00
Thibaut Girka
0d3612482e
Render placeholder instead of image when MediaGallery container width isn't known
2018-11-25 11:29:56 +01:00
Thibaut Girka
b3ff35a75c
Move URLs to backend in their own file
2018-11-19 15:56:38 +01:00
Thibaut Girka
a77ee0bb6d
Fix composer not displaying on iPad
2018-11-16 15:04:32 +01:00
Thibaut Girka
86527024aa
In detailed status view, take displayMedia setting into account when changing media
...
Fixes #819
2018-11-15 16:38:50 +01:00
Thibaut Girka
a100f05687
Only stream local-only toots to logged-in users
2018-11-13 18:55:57 +01:00
Thibaut Girka
f84897c7d7
Add field to serialized local-only statuses
2018-11-13 18:55:57 +01:00
Thibaut Girka
759750801e
Exclude local-only toots from atom feeds
2018-11-13 18:55:57 +01:00
ThibG
e4feef6b5c
Merge pull request #817 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2018-11-13 18:48:07 +01:00
Thibaut Girka
6ce7e74b46
[Glitch] Fix race condition when interacting with deleted toots
...
Port c875f19673
to glitch-soc
2018-11-13 16:30:07 +01:00
Thibaut Girka
bfe2b9cc50
Merge branch 'master' into glitch-soc/merge-upstream
2018-11-13 16:28:07 +01:00
Thibaut Girka
2fe0cb1623
[Glitch] Prepend account header even when status list is empty
...
Partially port 90b64c0069
2018-11-13 15:54:04 +01:00
Thibaut Girka
c78c80f807
[Glitch] Fix loading indicator inconsistency
...
Port 3cecf3e5b9
to glitch-soc
2018-11-13 15:54:04 +01:00
Thibaut Girka
5ebbaffaa3
[Glitch] Use local instead of global loading indicator for timelines, account timelines
...
Port dd00cd19d2
to glitch-soc
2018-11-13 15:54:04 +01:00
ThibG
c5a4dc9118
Merge pull request #813 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2018-11-12 16:00:16 +01:00
Thibaut Girka
1283e112b9
Tighten CSP a bit
2018-11-12 15:43:02 +01:00
Thibaut Girka
0506c6f62f
Merge branch 'master' into glitch-soc/merge-upstream
2018-11-10 17:57:19 +01:00
ThibG
09562b0fcc
Merge pull request #806 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2018-11-09 22:29:52 +01:00
Thibaut Girka
868cace797
[Glitch] Remove unused computation of reblog references from updateTimeline
2018-11-09 21:57:56 +01:00
Thibaut Girka
0e80661e42
[Glitch] Don't remove originals of boosted toots from timeline
...
Port 2b51b4094c
to glitch-soc
2018-11-09 21:57:56 +01:00
Thibaut Girka
44f5f7bab4
Fix drawer waves being displayed in the list editor
2018-11-09 18:00:29 +01:00
Thibaut Girka
c6fc3e0c65
[Glitch] Fix form validation flash message color and input borders
...
Port ccbdf689e8
to glitch-soc
2018-11-09 15:10:09 +01:00
Thibaut Girka
9201398507
Merge branch 'master' into glitch-soc/merge-upstream
2018-11-09 14:56:31 +01:00
Thibaut Girka
bf92e7aaa6
[Glitch] Implement adding a user to a list from their profile
...
Port bb5558de62
to glitch-soc
2018-11-09 14:50:08 +01:00
Thibaut Girka
a2a254625b
[Glitch] Update reset.scss from upstream
2018-11-06 16:03:53 +01:00
Thibaut Girka
36dab188fd
Merge branch 'master' into glitch-soc/merge-upstream
2018-11-06 15:22:44 +01:00
Thibaut Girka
34209c0340
Fix timestamp position in public pages with RTL languages
2018-10-31 11:37:47 +01:00
Thibaut Girka
b3c1380980
Fix styling of display names in public pages
2018-10-31 11:37:47 +01:00
ThibG
a78ec63afa
Merge pull request #803 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes (v2.6.1)
2018-10-31 11:15:37 +01:00
Thibaut Girka
75b48dc177
Merge branch 'master' into glitch-soc/merge-upstream
2018-10-31 10:08:36 +01:00
Thibaut Girka
2b2facbbdf
[Glitch] Port some of upstream's getting started footer links
2018-10-31 10:07:41 +01:00
ThibG
08c0f8b67c
Merge pull request #802 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2018-10-30 20:10:09 +01:00
Thibaut Girka
0d6b8f36aa
[Glitch] Fix empty display name precedence over username in web UI
...
Port f59b840549
to glitch-soc
2018-10-30 17:54:50 +01:00
Thibaut Girka
1c448d6474
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/controllers/auth/sessions_controller.rb
Upstream reverted something we partially reverted already.
Reverted the rest to match upstream.
2018-10-30 17:52:08 +01:00
Thibaut Girka
7e18e95716
Add a local setting for inline preview cards
2018-10-30 17:51:06 +01:00
Thibaut Girka
bdc2338833
Add a “link” status icon for toots with a preview card
2018-10-30 17:51:06 +01:00
Thibaut Girka
b21615e957
[Glitch] Fix dimensions of preview cards, fix crash in web UI, fix warning
...
Port 9c38c5daa3
to glitch-soc
2018-10-30 17:51:06 +01:00
Thibaut Girka
ac9780b844
[Glitch] Include preview cards in status entity in REST API
...
Port 795f0107d2
to glitch-soc
2018-10-30 17:51:06 +01:00
ThibG
7f24242ef6
Merge pull request #801 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2018-10-30 14:20:25 +01:00
Thibaut Girka
48be335f4f
Remove duplicate and outdated specs
2018-10-30 12:46:05 +01:00
Masoud Abkenar
3aa2418217
[Glitch] RTL: fix toot privacy preferences radio buttonss
...
Port e961a763a2
to glitch-soc
2018-10-30 11:24:40 +01:00
Masoud Abkenar
e32a4f55fe
[Glitch] RTL: fix preferences page checkbox margins
...
Port 5ee0b51ac8
to glitch-soc
2018-10-30 11:24:19 +01:00
Thibaut Girka
94ad76a5b9
Merge branch 'master' into glitch-soc/merge-upstream
2018-10-30 11:22:25 +01:00
ash lea
7ec3f6022d
move some constants to rails environment
2018-10-29 21:29:31 +01:00
ThibG
88659eda24
Merge pull request #798 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2018-10-29 21:29:15 +01:00
Thibaut Girka
ee5132a00e
Merge branch 'master' into glitch-soc/merge-upstream
2018-10-29 14:16:35 +01:00
Thibaut Girka
f16d66c5c8
Merge branch 'master' into glitch-soc/merge-upstream
2018-10-29 14:09:54 +01:00
Thibaut Girka
a942ad3062
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- config/locales/simple_form.ja.yml
Not a real conflict, one new string was introduced in
glitch and one in upstream.
2018-10-29 14:00:41 +01:00
ThibG
7f22ed0fc9
Merge pull request #794 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2018-10-28 20:36:55 +01:00
Thibaut Girka
b00f60f1d3
Merge branch 'master' into glitch-soc/merge-upstream
2018-10-28 08:37:49 +01:00
Thibaut Girka
ee1f1a2ec9
When searching for an emoji with multiple separators, consider the full input
...
e.g., typing “blob_cat_p” used to search for “blob” and “cat”, but not
“blob_cat_p”, which means “blob_cat_patpat” is very unlikely to show up,
although it is likely what the user wanted to type in the first place.
2018-10-27 22:45:11 +02:00
Thibaut Girka
8f4fab65a1
Do not rely on hover for upload form options if touch is used
2018-10-27 19:06:49 +02:00
Thibaut Girka
008f98b304
[Glitch] RTL: fix column-back-button__icon margins/content
...
Port 6e1a4f85ad
to glitch-soc
2018-10-27 18:55:11 +02:00
Thibaut Girka
c13cfeac09
Merge branch 'master' into glitch-soc/merge-upstream
2018-10-27 18:54:26 +02:00
Thibaut Girka
5bb8563f6c
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/controllers/admin/base_controller.rb
- app/controllers/filters_controller.rb
- app/controllers/invites_controller.rb
- app/controllers/settings/deletes_controller.rb
- app/controllers/settings/exports_controller.rb
- app/controllers/settings/follower_domains_controller.rb
- app/controllers/settings/migrations_controller.rb
- app/controllers/settings/notifications_controller.rb
- app/controllers/settings/preferences_controller.rb
- app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb
- app/javascript/packs/public.js
- app/views/settings/profiles/show.html.haml
Conflicts were mostly due to the addition of body classes to the settings page,
this was caused by rejecting upstream changes for most of those files and
modifying Settings::BaseController instead.
Another cause of conflicts was the deletion of client-side checking of
display name / bio length, this was modified in app/javascript/core/settings.js
instead.
2018-10-26 20:41:43 +02:00
ThibG
0e8de56a22
Merge pull request #792 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2018-10-24 11:28:25 +02:00
Thibaut Girka
ed8d06212f
Keep back own DMs in Home timeline
...
Follow-up to e45a6edd65
, fixes inconsistencies
in glitch-soc behavior.
2018-10-23 20:03:35 +02:00
Thibaut Girka
8f3096b846
Merge branch 'master' into glitch-soc/merge-upstream
2018-10-23 17:15:57 +02:00
Thibaut Girka
0c7f710be1
[Glitch] Surround mid-text display names with bdi tags
...
Port 7861c5f108
to glitch-soc
2018-10-22 18:57:20 +02:00
Thibaut Girka
323ae1403a
[Glitch] fix: initial state of PrivacyDropdown is should not be null
...
Port bebe8ec887
to glitch-soc
2018-10-22 18:41:34 +02:00
Thibaut Girka
1bb23d0407
[Glitch] RTL: fix cardbar margins and alignment
...
Port c73864c137
to glitch-soc
2018-10-22 18:39:37 +02:00
Thibaut Girka
c9b19e05e2
[Glitch] RTL: fix admin account avatar margin in about page
...
Port 3a157210c8
to glitch-soc
2018-10-22 18:38:52 +02:00
Thibaut Girka
c14be538a6
[Glitch] RTL: fix column settings toggle label
...
Port bf58461d36
to glitch-soc
2018-10-22 18:38:11 +02:00
Thibaut Girka
a1f512f18b
[Glitch] Fix domain label position and color
...
Port 25f9ead041
to glitch-soc
2018-10-22 18:37:17 +02:00
Thibaut Girka
9950db2e1c
[Glitch] RTL: fix preferences layout
...
Port 029943d59b
to glitch-soc
2018-10-22 18:34:48 +02:00
Thibaut Girka
076f0a0eb6
[Glitch] Fix admin account avatar margin
...
Port 065b39e7a4
to glitch-soc
2018-10-22 18:33:35 +02:00
Thibaut Girka
aa277ab5fb
[Glitch] RTL: fix user stats in about page
...
Port 301cbcc980
to glitch-soc
2018-10-22 18:31:50 +02:00
Thibaut Girka
ef9c11e050
[Glitch] RTL: fix domain append at signup form
...
Port 65b3804a6c
to glitch-soc
2018-10-22 18:31:50 +02:00
Thibaut Girka
e18724363d
[Glitch] Fixes 8987 broken alignment at "Remote interaction dialog"
...
Port d35801aaa2
to glitch-soc
2018-10-22 18:31:50 +02:00
Thibaut Girka
1139b758c5
[Glitch] RTL: fix admin account margins in about page
...
Port f8c1b32541
to glitch-soc
2018-10-22 18:31:50 +02:00
Thibaut Girka
bf9c4b6d98
[Glitch] undo part of PR 8202 to fix RTL
...
Port efd09e2ebb
to glitch-soc
2018-10-22 18:22:01 +02:00
Thibaut Girka
9f1c9b6135
[Glitch] Improve style of notice/alert messages
...
Port b972478812
to glitch-soc
2018-10-22 18:20:43 +02:00
Thibaut Girka
e45a6edd65
Keep new DMs in home feeds and in the old DM timeline
...
Revert server-side part of 87fdd139b8
2018-10-22 18:15:51 +02:00
Thibaut Girka
dcded13a99
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- .github/ISSUE_TEMPLATE/bug_report.md
Took our version.
- CONTRIBUTING.md
Updated the embedded copy of upstream's version.
- README.md
Took our version.
- app/policies/status_policy.rb
Not a real conflict, took code from both.
- app/views/layouts/embedded.html.haml
Added upstream's changes (dns-prefetch) and fixed
`%body.embed`
- app/views/settings/preferences/show.html.haml
Reverted some of upstream changes, as we have a
page dedicated for flavours and skins.
- config/initializers/content_security_policy.rb
Kept our version of the CSP.
- config/initializers/doorkeeper.rb
Not a real conflict, took code from both.
2018-10-22 17:51:38 +02:00
Thibaut Girka
4739e0f090
Put a video camera emoji or a picture frame emoji instead of “.”
...
This uses the same logic as the status icons in the glitch flavor.
2018-10-21 16:09:18 +02:00
Thibaut Girka
8729f5e466
Do not move CWs to toot body when toot body is empty
...
Fixes #395
Instead of leaving the toot body blank, it replaces it with a single “.” in
order for the fold/unfold CW behavior to not look *too* weird on upstream
Mastodon. Note that this does not fix upstream's CW-dropping behavior, as
that is decided at the time the toot is posted, not received.
2018-10-21 16:09:18 +02:00
Thibaut Girka
04bedd237b
Attempt at fixing inline video player
2018-10-21 16:09:07 +02:00
Thibaut Girka
dfa5b0576f
Update mediaGallery component's width when opening CWs
2018-10-21 16:09:07 +02:00
Thibaut Girka
e4c3ea1809
Force sensitive content flag when posting a toot with a CW
...
Indeed, when the “Always enable the Content Warning field” setting is enabled,
sending a content-less toot with a CW would move the CW to the toot's content
and leave the toot not marked as sensitive.
2018-10-20 17:06:21 +02:00
Thibaut Girka
13c3fa8d36
Focus the UI when pressing Escape in the CW field
2018-10-20 15:00:39 +02:00
Thibaut Girka
b13c34de3a
Fix fav/boosts hotkeys not working on detailed statuses
2018-10-18 19:00:59 +02:00
Thibaut Girka
38b11e0b58
Fix deleting individual notifications from glitch-soc's web interface
...
Fixes #783
2018-10-15 22:36:55 +02:00
Thibaut Girka
b0527a4ce7
Handle alt+enter in the spoiler input as shortcut for secondary post
...
Fixes #780
2018-10-14 12:00:21 +02:00
Thibaut Girka
70d346ea95
Fix auto-unfold CWs when no regexp is set
...
Fixes #778
2018-10-12 23:34:26 +02:00
Thibaut Girka
3d5d899094
Allow selecting both default flavour and theme
...
Fixes #672
2018-10-12 19:06:35 +02:00
Eugen Rochko
fac529975b
Improve signature verification safeguards ( #8959 )
...
* Downcase signed_headers string before building the signed string
The HTTP Signatures draft does not mandate the “headers” field to be downcased,
but mandates the header field names to be downcased in the signed string, which
means that prior to this patch, Mastodon could fail to process signatures from
some compliant clients. It also means that it would not actually check the
Digest of non-compliant clients that wouldn't use a lowercased Digest field
name.
Thankfully, I don't know of any such client.
* Revert "Remove dead code (#8919 )"
This reverts commit a00ce8c92c
.
* Restore time window checking, change it to 12 hours
By checking the Date header, we can prevent replaying old vulnerable
signatures. The focus is to prevent replaying old vulnerable requests
from software that has been fixed in the meantime, so a somewhat long
window should be fine and accounts for timezone misconfiguration.
* Escape users' URLs when formatting them
Fixes possible HTML injection
* Escape all string interpolations in Formatter class
Slightly improve performance by reducing class allocations
from repeated Formatter#encode calls
* Fix code style issues
2018-10-12 07:00:41 +02:00
ThibG
0075964244
Merge pull request #775 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2018-10-11 21:28:03 +02:00
Thibaut Girka
8f720be9f3
Merge commit 'ac7df62a0441b95ec04fd9111a9394795dd53ff2' into glitch-soc/merge-upstream
2018-10-11 14:12:36 +02:00
Thibaut Girka
bb1103d974
Really fix HotKeys
2018-10-10 17:40:06 +02:00
Thibaut Girka
a02244f17c
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
app/javascript/packs/public.js
Changes made to app/javascript/packs/publics.js were applied to
app/javascript/core/settings.js
2018-10-09 21:08:26 +02:00
Thibaut Girka
269edc0e48
Fix CW icon color in local-settings modal
2018-10-09 18:10:54 +02:00
Thibaut Girka
721aec40cd
Define some local-settings hints
2018-10-09 18:10:54 +02:00
Thibaut Girka
26409f3e8e
Add support for hints (or extended descriptions) in local-settings pages
2018-10-09 18:10:54 +02:00
Thibaut Girka
5f308a7f05
When screen width is too narrow, hide local-settings page text, keep only icons
2018-10-09 18:10:54 +02:00
Thibaut Girka
6cd793f0ac
Change “preferences” icon to match settings page icon
2018-10-09 18:10:54 +02:00
Thibaut Girka
edb9ec8543
Add icons for each of the local-setting pages
2018-10-09 18:10:54 +02:00
ThibG
641d056e0f
Merge pull request #774 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2018-10-09 13:23:01 +02:00
Thibaut Girka
122ac9cd1d
Merge branch 'master' into glitch-soc/merge-upstream
2018-10-09 12:12:03 +02:00
ThibG
4134a10549
Merge pull request #770 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2018-10-09 12:11:14 +02:00
Thibaut Girka
d0b1369a85
Fix app-wide hotkeys randomly failing to work
2018-10-09 12:10:51 +02:00
Thibaut Girka
b368d3c15d
Merge branch 'master' into glitch-soc/merge-upstream
2018-10-08 15:34:53 +02:00
Thibaut Girka
d17844e6d1
Merge branch 'master' into glitch-soc/merge-upstream
2018-10-08 13:51:33 +02:00
Thibaut Girka
96c3d26870
Move “Show action buttons in collapsed toots” option
2018-10-08 13:49:25 +02:00
Thibaut Girka
faecb35fe0
Switch from selects to radio buttons for local settings, improve styling
2018-10-08 13:49:25 +02:00
Thibaut Girka
a3677a828d
[Glitch] Change documentation URL
...
Port 28401962ca
to glitch-soc
2018-10-07 22:56:24 +02:00
Thibaut Girka
b4ba1058b8
[Glitch] RTL: fix margins of public-account-header__tabs
...
Port 185cb2dc3a
to glitch-soc
2018-10-07 22:56:24 +02:00
ThibG
f1c3053d36
Merge pull request #768 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2018-10-07 20:13:07 +02:00
Thibaut Girka
611740ce81
Merge branch 'master' into glitch-soc/merge-upstream
2018-10-07 19:47:56 +02:00
Thibaut Girka
7cc7843109
Do not scroll timelines when *closing* media modals
...
Media modals push an history state so that pressing back on mobile closes them.
We made sure to not scroll when opening them, but not when *closing* them,
which caused some issues in rare cases.
2018-10-07 12:08:32 +02:00
ThibG
f990b9c768
Merge pull request #764 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2018-10-05 21:58:23 +02:00
Thibaut Girka
98bb6815a7
Merge branch 'master' into glitch-soc/merge-upstream
2018-10-05 21:48:25 +02:00
Thibaut Girka
c6e4c48942
[Glitch] Add a confirmation dialog when hitting reply and the compose box isn't empty
2018-10-05 19:08:52 +02:00
ThibG
515ce8f469
Merge pull request #762 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2018-10-05 19:01:44 +02:00
Thibaut Girka
00fcdebed7
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
db/migrate/20170716191202_add_hide_notifications_to_mute.rb
spec/controllers/application_controller_spec.rb
Took our version, upstream changes were only minor style linting.
2018-10-05 15:23:57 +02:00
Thibaut Girka
a9e8f98a9d
Make hidden media clickable in account media gallery
2018-10-02 22:00:57 +02:00
Thibaut Girka
d82c495c0f
Add media description (or status spoiler) in account media gallery
2018-10-02 22:00:57 +02:00
Thibaut Girka
bd1f08fa9a
Fix account gallery hidden media background color in mastodon-light
2018-10-02 22:00:57 +02:00
Thibaut Girka
eb85427576
[Glitch] Honour displayMedia setting in accountMedia gallery
...
Inspired by b79ab15859
2018-10-02 22:00:57 +02:00
ThibG
35e9d099b3
Merge pull request #758 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2018-10-02 12:01:40 +02:00
Thibaut Girka
6ad7606909
[Glitch] Add support for new display_media setting
...
Port f7a6f9489d
to glitch-soc
[API] [vanilla required] [glitch-soc optional] initial_state show_sensitive_media boolean changed to show_media string with options "default", "hide_all", "show_all"
2018-10-01 16:48:55 +02:00
Thibaut Girka
15197a831c
[Glitch] RTL: fix margins: public-layout.header.nav-button
...
Port df2f4052b8
to glitch-soc
2018-10-01 14:38:35 +02:00
Thibaut Girka
884a898442
[Glitch] RTL: fix statubar action buttons/counter margins
...
Port 9f6662fcc9
to glitch-soc
2018-10-01 14:38:32 +02:00
Thibaut Girka
36d426cec9
[Glitch] Separate font-family into variable
...
Port d0d65b5a28
to glitch-soc
2018-10-01 14:38:29 +02:00
Thibaut Girka
24d05c7a50
Merge branch 'master' into glitch-soc/merge-upstream
2018-10-01 14:36:06 +02:00
Thibaut Girka
c91d9b7389
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
app/lib/user_settings_decorator.rb
app/models/user.rb
app/serializers/initial_state_serializer.rb
app/views/stream_entries/_simple_status.html.haml
config/locales/simple_form.en.yml
config/locales/simple_form.ja.yml
config/locales/simple_form.pl.yml
config/routes.rb
2018-10-01 12:43:20 +02:00
Spencer Alves
4e60a0d543
Add option to hide action bar in collapsed toots
2018-09-30 08:31:50 +02:00
David Yip
c065717b67
Merge pull request #681 from ThibG/glitch-soc/fixes/accessibility
...
Port various accessibility improvements from upstream
2018-09-29 19:01:19 -05:00
David Yip
2bb3c8c944
Merge pull request #755 from ThibG/glitch-soc/features/optional-reply-selection
...
Make pre-selection of usernames optional when replying to a toot
2018-09-29 19:01:05 -05:00
David Yip
19968912fa
Merge pull request #754 from ThibG/glitch-soc/fixes/scroll-compose-into-view
...
Scroll to textarea when composing a toot
2018-09-29 19:00:31 -05:00
David Yip
5b43d7bcbf
Merge pull request #745 from ThibG/glitch-soc/fixes/grey-out-button
...
Disable the “TOOT” button (and secondary toot button) if the toot text is empty
2018-09-29 19:00:06 -05:00
Thibaut Girka
76b8ae044d
Fix build status link in README.md
...
It was still linking to Travis, oops.
2018-09-28 21:18:04 +02:00
Thibaut Girka
86b2b009dd
Make pre-selection of usernames optional when replying to a toot
...
Fixes #751
2018-09-28 21:01:09 +02:00
Thibaut Girka
15134beb1e
Fix styling issue in “Compose box options” local settings page
2018-09-28 18:55:44 +02:00
Thibaut Girka
9594c68532
Scroll to textarea when composing a toot
2018-09-28 18:44:55 +02:00
Thibaut Girka
fa18859b20
[Glitch] Adjust beforeUnload conditions
...
Port 05f90e3695
to glitch-soc
2018-09-28 17:09:25 +02:00
Thibaut Girka
abffbba819
Fix maxCharacters in vanilla front-end
2018-09-28 17:05:19 +02:00
Thibaut Girka
3b05eb8002
Add -glitch suffix to version string
...
Fixes #715
2018-09-26 11:11:30 +02:00
Thibaut Girka
d3426ed87a
Disable the “TOOT” button (and secondary toot button) if the toot text is empty
2018-09-21 23:20:06 +02:00
Thibaut Girka
23e7c1c765
Fix background being transparent for verified link fields
2018-09-21 12:56:42 +02:00
Thibaut Girka
9e8d776a77
[Glitch] Display verified links in glitch flavor
...
Port front-end changes from f4d549d300
to glitch-soc
2018-09-21 12:56:42 +02:00
Thibaut Girka
5833cc41c2
[Glitch] Add edit profile action button to profile
...
Port some parts from 1a7a74ff76
2018-09-21 12:56:42 +02:00
Thibaut Girka
c1701ae2a8
[Glitch] Fix “Toots” tab highlighting for replies and media timelines
...
Port front-end changes from f8b54d229f
2018-09-21 12:56:29 +02:00
Thibaut Girka
925c185ef9
Prevent clicks on video from initiating selections
2018-09-21 12:56:13 +02:00
霧島ひなた
5c9a2f5d77
change translation glitch's features [ja]
2018-09-21 10:55:44 +02:00
霧島ひなた
5c6271887d
translation glitch's features [ja]
2018-09-21 10:55:44 +02:00
ThibG
17464c10ad
Merge pull request #739 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2018-09-21 08:39:07 +02:00
Thibaut Girka
343acd96cc
Merge branch 'master' into glitch-soc/merge-upstream
2018-09-20 18:36:00 +02:00
Thibaut Girka
fba0200765
[Glitch] Redesign forms, verify link ownership with rel="me"
...
Port SCSS changes from f4d549d300
2018-09-20 18:23:53 +02:00
Thibaut Girka
a6d47ac5f5
[Glitch] Port SCSS changes from upstream
...
Port SCSS changes from:
- a58ec29631
- cdfe51e325
- 1f6ed4f86a
- 617f40fc2b
- 6a0d4d36ad
- 2374a00c10
- a2cabf3f4a
2018-09-20 18:23:16 +02:00
Thibaut Girka
022d96c999
[Glitch] Group reports by target account
...
Port SCSS from 011437dcb5
to glitch-soc
2018-09-20 17:54:04 +02:00
Thibaut Girka
91bef4759f
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
Vagrantfile
app/javascript/packs/public.js
app/views/admin/settings/edit.html.haml
app/views/settings/preferences/show.html.haml
app/views/settings/profiles/show.html.haml
config/locales/es.yml
config/locales/simple_form.en.yml
config/webpack/configuration.js
config/webpack/loaders/babel.js
package.json
yarn.lock
Split new additions to app/javascript/packs/public.js to
app/javascript/core/settings.js
2018-09-19 21:46:01 +02:00
ThibG
382cdd7f95
Unconditionally re-encode locally-uploaded images to strip metadata
...
This strips metadata on file upload by re-encoding the files, at the cost
of possible slight image quality decrease and processing resources.
2018-09-17 21:09:59 +02:00
Thibaut Girka
657805f444
Fix thread CW expansion not being reset when changing threads
2018-09-16 12:41:20 +02:00
Igor Galić
8433bd89e4
prepend re: to replies to spoiler-text
...
if spoiler-text doesn't already start with re:, we prepend `re: `
ourselves in replies.
This implements https://github.com/tootsuite/mastodon/issues/8667
Following Plemora's example: https://git.pleroma.social/pleroma/pleroma-fe/merge_requests/318
2018-09-13 22:32:03 +02:00
Thibaut Girka
c3ab2973c5
Improve keyboard VS mouse navigation of dropdown menus
2018-09-13 20:32:08 +02:00
Thibaut Girka
5ff733b614
Only focus first item of dropdown if it was opened via keyboard
2018-09-13 20:32:08 +02:00
Thibaut Girka
cf142e8556
[Glitch] Highlight active tab in action bar
...
Port 7b7c26063e
to glitch-soc
2018-09-13 17:13:29 +02:00
Thibaut Girka
1cb3af21c5
Autofocus comment textarea in report modal
2018-09-13 17:03:48 +02:00
Thibaut Girka
b3c698d6f4
Auto-focus emoji picker's search field
2018-09-13 15:32:23 +02:00
Thibaut Girka
2df72d0697
Fix building assets in test environment
...
Webpacker (Ruby wrapper to webpack) uses RAILS_ENV-based environments while
the javascript configuration for webpack re-reads this configuration file using
the NODE_ENV environment variable. This means that when RAILS_ENV=test, running
“assets:precompile” compiled the production packs in “public/packs” while
webpacker expects them in “public/packs-test”. This causes Ruby to recompile
them on-the-fly, possibly leading to race conditions in parallel_tests.
This changes:
- Disables on-the-fly compilation in test environment
- Changes the javascript part to read the correct environment
2018-09-13 15:32:02 +02:00
Thibaut Girka
307fb338ee
Fix composer actions modal
2018-09-11 22:04:06 +02:00
Thibaut Girka
49734c03fd
Fix action modal links
2018-09-11 22:04:06 +02:00
ThibG
82b521b4c3
Merge pull request #724 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2018-09-11 20:09:00 +02:00
Thibaut Girka
59de2868c1
Fix media description in various media modals
2018-09-11 18:29:19 +02:00
Thibaut Girka
ac6fb758b9
Fix incorrect disabled boost button color when reduce-motion is set
2018-09-11 18:03:48 +02:00
Thibaut Girka
f1214f00d9
Do not clear local storage on log out
2018-09-11 17:00:22 +02:00
Thibaut Girka
cd99255698
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
app/controllers/oauth/authorizations_controller.rb
Just two changes being too close to one another.
Took both.
2018-09-11 16:51:26 +02:00
Thibaut Girka
65f625cf23
[Glitch] Hide floating action button on thread views
...
Port f66a786029
to glitch-soc
2018-09-11 16:29:46 +02:00
Thibaut Girka
e36f6f48e5
Fix status embed card links color
2018-09-10 19:53:55 +02:00
Thibaut Girka
d9a92d5040
[Glitch] After click to embed video, autoplay it
...
Port 478ca39e5e
to glitch-soc
2018-09-10 19:53:55 +02:00
Thibaut Girka
bc5009cd45
[Glitch] Click card to embed external content
...
Port front-end changes from f7765acf9d
to glitch-soc
2018-09-10 19:53:55 +02:00
Thibaut Girka
dfa6fb4927
[Glitch] Fix oEmbed image_modal src.
...
Port 25b0d7538e
to glitch-soc
2018-09-10 19:53:55 +02:00
Thibaut Girka
cc58265216
[Glitch] Ensure link thumbnails are not stretched to super low quality
...
Port front-end changes from c36b9cc5a6
to glitch-soc
2018-09-10 19:53:55 +02:00
Thibaut Girka
49eaf72faf
[Glitch] Add embed_url to preview cards
...
Port front-end changes from c083816c24
to glitch-soc
2018-09-10 19:53:55 +02:00
Thibaut Girka
324ce93368
Add preferences for notification badges
2018-09-07 20:37:17 +02:00
Thibaut Girka
ba4521b175
Move compose box options to their own page
2018-09-07 20:37:17 +02:00
Thibaut Girka
b28cbb8b25
Add unread notifications badge to the mobile navbar
2018-09-07 20:37:17 +02:00
Thibaut Girka
2cdc00bc8b
Add unread notifications badge to the navigation bar
2018-09-07 20:37:17 +02:00
Thibaut Girka
0f155af32a
Add notification badge to favicon
2018-09-07 20:37:17 +02:00
Thibaut Girka
d315f1dc02
Count unread notifications when window loses focus
2018-09-07 20:37:17 +02:00
Thibaut Girka
c8875b4d8a
Keep track of unread notifications when the notification column isn't mounted
2018-09-07 20:37:17 +02:00
Thibaut Girka
711826cb37
Accurately count deleted unread notifications
2018-09-07 20:37:17 +02:00
Thibaut Girka
f4ca3262f2
[Glitch] Audio.prototype.seek is undefined
...
Port f08e6e9ab5
to glitch-soc
2018-09-07 20:37:17 +02:00
Thibaut Girka
8dbbec0939
Fix dropdown arrow position
2018-09-07 09:45:33 +02:00
Thibaut Girka
7f2f59dae6
Fix public profile's “show more” links styling
2018-09-05 13:46:19 +02:00
Thibaut Girka
258e8b7734
Port SCSS changes from 19b07ba260
2018-09-05 13:46:19 +02:00
Thibaut Girka
4b29a41f1d
Port SCSS changes from 85bb32c410
2018-09-05 13:46:19 +02:00
Thibaut Girka
77e7da7d0d
Port SCSS changes from 78fa926ed5
2018-09-05 13:46:19 +02:00
Thibaut Girka
d8b2f15b23
Pause video playback if toot is collapsed or CWs folded ( fixes #146 )
2018-09-05 11:58:56 +02:00
Thibaut Girka
a9ed9d3572
Fix videos being cropped
2018-09-05 11:58:43 +02:00
Thibaut Girka
c0275cdcb2
Fix interactions between CW and sensitive flag when spoilersAlwaysOn is set
2018-09-04 19:40:57 +02:00
Thibaut Girka
3d5a789bbb
Fix “sensitive” media warning and upload form colors in Mastodon-light
2018-09-04 18:50:26 +02:00
Thibaut Girka
f1a73fd5f4
Outline white/grey/blue emojis
2018-09-04 16:01:41 +02:00
Thibaut Girka
6e771bf680
Light theme overhaul
2018-09-04 16:01:41 +02:00
Thibaut Girka
36f50be305
[Glitch] Add white outline to black emoji
...
Inspired from 0bfa0f2374
2018-09-04 15:40:27 +02:00
Thibaut Girka
b6ce5fa3fb
Fix emoji autosuggest when using a CDN for assets
2018-09-04 15:05:31 +02:00
Thibaut Girka
8622dccaf1
Disable focus points for letterboxed media
2018-09-04 13:31:55 +02:00
Thibaut Girka
9998271a5b
Fix full-width margins
2018-09-04 13:31:55 +02:00
Thibaut Girka
be644e3b7c
Media gallery styling closer to upstream's
2018-09-04 13:31:55 +02:00
Thibaut Girka
8183d2ed55
[Glitch] Do not override ctrl/cmd+click in media gallery
2018-09-04 13:31:55 +02:00
Rey Tucker
40d04a3209
Add manifest_src to CSP
...
Fixes manifest.json not being loaded because of CSP violation
h/t https://vulpine.club/@binary/100662852252438648
2018-09-03 22:37:54 +02:00
Thibaut Girka
bd437f8077
Add admin links to status and account menus ( fixes #673 )
...
If the current logged-in user is an admin, add quick links to the admin
interface in account and toot dropdown menu. Suggestion by @ashkitten
2018-09-03 18:19:11 +02:00
Thibaut Girka
7ea4c793d6
Allow to show a specific status in the admin interface
2018-09-03 18:19:11 +02:00
Thibaut Girka
6ad7dac791
Let the front-end know the current account is a moderator
2018-09-03 18:19:11 +02:00
Thibaut Girka
b3fdd166e8
[Glitch] Skip VS15 (Emoji textual presentation)
...
Port a060beee72
to glitch-soc
2018-09-03 18:18:50 +02:00
Thibaut Girka
8e862ecf8d
[Glitch] Add aria-label to floatingActionButton
...
Port 7c12c7b124
to glitch-soc
2018-09-03 18:18:39 +02:00
Thibaut Girka
27ee42299b
[Glitch] Inactive header in main profile to match column
...
Port 1bfe735d57
to glitch-soc
2018-09-03 18:18:24 +02:00
Thibaut Girka
a8de13c031
Fix CI badge, as we have switched from Travis to CircleCI
2018-09-03 17:41:28 +02:00
ThibG
174548f3bd
Merge pull request #702 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2018-09-03 17:40:03 +02:00
Thibaut Girka
6c233a04a0
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
README.md
Discarded upstream changes to the README, kept our version.
2018-09-03 14:33:06 +02:00
Thibaut Girka
e915bc3e9e
Fixes columns scrolling to top when opening media modal
...
Fixes #700
2018-09-03 14:24:10 +02:00
ThibG
2b82829a53
Merge pull request #699 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2018-09-01 17:44:06 +02:00
Thibaut Girka
a74a7d5fe3
Merge branch 'master' into glitch-soc/merge-upstream
2018-09-01 17:23:46 +02:00
Thibaut Girka
cc7adf7e84
Fix composer not displaying on chrome mobile ( fixes #696 )
2018-09-01 09:39:25 +02:00
ThibG
fd2c7aa8ec
Merge pull request #694 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2018-08-31 20:56:22 +02:00
Thibaut Girka
530da545a5
[Glitch] Give focused status a sensible aria-label for screen readers
...
Port 248df68c36
to glitch-soc
2018-08-31 19:49:51 +02:00
Thibaut Girka
087dcf720e
[Glitch] Fix off-by-one error in aria-posinset
...
Port 885711afb9
to glitch-soc
2018-08-31 19:49:29 +02:00
Thibaut Girka
d8fbd74c47
[Glitch] Add aria-label to column regions
...
Port 66dbb59aa1
to glitch-soc
2018-08-31 19:49:29 +02:00
Thibaut Girka
6f75a9001f
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/views/stream_entries/_simple_status.html.haml
- config/locales/nl.yml
Deleted unused translation strings (themes) and adapted minor changes to
_simple_status.html.haml
2018-08-31 19:10:57 +02:00
Thibaut Girka
c6942a5283
Add option to not automatically unfold content warnings matching a regexp
...
Fixes #678
2018-08-31 18:35:03 +02:00
Thibaut Girka
5c400a2842
Allow text inputs in local settings dialog
2018-08-31 18:35:03 +02:00
Thibaut Girka
9d2739d74d
Add a setting to automatically unfold all content warnings
2018-08-31 18:35:03 +02:00
Thibaut Girka
130bdb5ee8
[Glitch] Show compose form on delete & redraft when in mobile layout
...
Port 025fbb8285
to glitch-soc
2018-08-31 18:33:46 +02:00
Thibaut Girka
0f1db47a7e
Fix search results on compose box
2018-08-31 18:33:46 +02:00
Thibaut Girka
b4f548fa18
Fix account header showing on search page
2018-08-31 18:33:46 +02:00
Thibaut Girka
4a686ddf8a
[Glitch] On the mobile UI, move the search column to the right
...
Port 20bb90ced6
to glitch-soc
2018-08-31 18:33:46 +02:00
Thibaut Girka
4686b3fa76
[Glitch] Hide search from Compose on mobile devices
...
Port 0893b16695
to glitch-soc
2018-08-31 18:33:46 +02:00
Thibaut Girka
37a00d4c1d
[Glitch] Add search item to tab bar for mobile devices
...
Port c9cbb8de70
to glitch-soc
2018-08-31 18:33:46 +02:00
Thibaut Girka
76a3f373e3
[Glitch] Use withRouter for TabsBar
...
Port 61e6275781
to glitch-soc
2018-08-31 18:33:46 +02:00
Thibaut Girka
5f035a2a1a
[Glitch] Move "compose" on mobile to floating action button
...
Port e72db6d9dd
to glitch-soc
2018-08-31 18:33:46 +02:00
Thibaut Girka
70c308c4aa
[Glitch] When search enabled, display hint in search popout
...
Port 7901f9f63e
to glitch-soc
2018-08-31 18:33:46 +02:00
Thibaut Girka
5d647197ec
Add bookmarks to archive takeout
2018-08-30 16:29:47 +02:00
Thibaut Girka
c20b27a9f4
Restrict querySelectorAll to the upload form component
2018-08-30 13:20:37 +02:00
Thibaut Girka
1544ac4e27
Add confirmation dialog when posting media without description
...
Fixes #211
2018-08-30 13:20:37 +02:00
Thibaut Girka
5ce6727669
[Glitch] Reduce padding of profile metadata boxes to allow more text
...
Port 9463bba5fb
to glitch-soc
2018-08-29 19:28:59 +02:00
Thibaut Girka
171e54eb46
Add opt-in feature to have the spoilers field always on ( fixes #634 )
2018-08-29 14:29:36 +02:00
ThibG
1b479f08c5
Merge pull request #690 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2018-08-29 14:23:45 +02:00
Thibaut Girka
c24491a8df
Merge branch 'master' into glitch-soc/merge-upstream
2018-08-29 13:57:56 +02:00
Thibaut Girka
c4b3479173
Fix CSP with S3/SWIFT hosts
2018-08-28 22:10:40 +02:00
Thibaut Girka
4a9e3f80e8
[Glitch] Add CSS class to replies
...
Port 2bbec9f4da
to glitch-soc
2018-08-28 19:52:47 +02:00
Thibaut Girka
3b09597556
[Glitch] Preserve hashtag casing in web UI hashtag history
...
Port f9b23a5d62
to glitch-soc
2018-08-28 19:52:28 +02:00
Thibaut Girka
24b6811a6e
[Glitch] Implement tag auto-completion by history
...
Port 460e380d38
to glitch-soc
2018-08-28 19:52:28 +02:00
Thibaut Girka
e3246cd13b
Preserve hashtag casing in threaded mode
...
Inspired by f9b23a5d62
2018-08-28 19:52:28 +02:00
ThibG
14563f5167
Merge pull request #684 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2018-08-28 19:51:36 +02:00
Thibaut Girka
43d132039b
Merge branch 'master' into glitch-soc/merge-upstream
2018-08-28 17:24:39 +02:00
Thibaut Girka
3fe5029fbe
Adjust CSP to fix image resizing
2018-08-28 16:58:55 +02:00
Thibaut Girka
937cd03a9a
[Glitch] Add missing video descriptions
...
Port ac092d03e7
to glitch-soc
2018-08-27 20:21:23 +02:00
Thibaut Girka
3106c81b1e
[Glitch] Wait until relationship is loaded before showing follow button
...
Port cd049454be
to glitch-soc
2018-08-27 20:21:12 +02:00
ThibG
8852fff3a4
Merge pull request #675 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2018-08-27 20:20:49 +02:00
Thibaut Girka
53b7bb9d04
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
app/controllers/api/v1/mutes_controller.rb
config/locales/simple_form.pl.yml
2018-08-27 18:09:28 +02:00
ThibG
af934b9071
Merge pull request #674 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2018-08-26 19:12:07 +02:00
Thibaut Girka
be20eb4b2f
Merge branch 'master' into glitch-soc/merge-upstream
2018-08-26 18:21:33 +02:00
Thibaut Girka
5eb3b8522e
Merge branch 'master' into glitch-soc/merge-upstream
2018-08-26 14:39:16 +02:00
Thibaut Girka
36393e1d2b
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
app/views/layouts/application.html.haml
Edited:
app/helpers/application_helper.rb
app/views/admin/domain_blocks/new.html.haml
Conflict wasn't really one, just two changes too close to one another.
Edition was to adapt the class names for themes to class names for
skins and flavours.
Also edited app/views/admin/domain_blocks/new.html.haml to strip the
duplicate admin pack inclusion thing.
2018-08-26 14:23:24 +02:00
ThibG
2903f8f36b
Merge pull request #671 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2018-08-26 13:23:52 +02:00
Thibaut Girka
246c313d45
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
app/controllers/application_controller.rb
Changed instance theme selection by instance flavour selection.
2018-08-24 15:10:34 +02:00
Thibaut Girka
0ddf439999
Only apply CSP in production mode
2018-08-23 22:58:40 +02:00
Thibaut Girka
48db3b3c99
Tighten CSP while allowing CDN hosts
2018-08-23 22:58:40 +02:00
Thibaut Girka
478f70a0e6
Update poylfills ( fixes #662 )
2018-08-23 22:58:25 +02:00
Thibaut Girka
fce248810b
[Glitch] Update state when opened dropdown is unmounted
...
Port dcd3544d153dd2a3961bd0d2214ed01a902a66da to glitch-soc
2018-08-23 22:58:14 +02:00
ThibG
8aa58e34bb
Merge pull request #665 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2018-08-22 21:35:07 +02:00
Thibaut Girka
e70fc059a9
Merge branch 'master' into glitch-soc/merge-upstream
2018-08-22 20:56:32 +02:00
Thibaut Girka
628fca50e2
Override CSP setting in the embed controller to allow frames
2018-08-22 20:39:33 +02:00
Thibaut Girka
e7a72439f1
Move CSP headers to the appropriate Rails configuration
...
Also drop dev-static.glitch.social reference.
2018-08-22 20:39:33 +02:00
Thibaut Girka
f34616eec1
Fix locale packs loading in embed layout
2018-08-22 20:39:33 +02:00
Thibaut Girka
3c49daeb8d
Add glitch-soc local setting to display reply counters
...
Defaults to false.
2018-08-22 20:29:55 +02:00
Thibaut Girka
d62ea55d51
Move layout options to their own section
2018-08-22 20:29:55 +02:00
Thibaut Girka
87ad942d76
[Glitch] Display replies count in web UI
...
Port 4df9cabb22
to glitch-soc
2018-08-22 20:29:55 +02:00
Thibaut Girka
801919fc9b
Add hashtag trendline support to glitch-soc flavour
...
Port Mastodon's hashtag stats thing to glitch-soc.
This doesn't change how hashtags are ordered, and doesn't add a trending
hashtags section, but it does change how hashtag searches are rendered,
displaying a trend line alongside each hashtag.
2018-08-22 19:27:06 +02:00
Thibaut Girka
360fbf1bd4
Add pinned accounts editor
2018-08-22 16:18:23 +02:00
Thibaut Girka
9fbaaefe59
Split list editor into components and containers
2018-08-22 16:18:23 +02:00
Thibaut Girka
d69f045681
Fix ColumnLink keys in getting_started_misc
2018-08-22 16:18:23 +02:00
ThibG
37965ac8d9
Merge pull request #660 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2018-08-21 19:54:21 +02:00
Thibaut Girka
8b4abaa90d
Merge branch 'master' into glitch-soc/master
...
Conflicts:
config/routes.rb
Added the “endorsements” route from upstream.
2018-08-21 18:24:48 +02:00
Thibaut Girka
c789181626
[Glitch] Add hotkey for follow requests
...
Port 25f6f41052
to glitch-soc
2018-08-20 21:25:02 +02:00
Thibaut Girka
b230c04e00
Make the privacy dropdown button not look strange when using top placement
...
Inspired by 8fe1f8d4ce
2018-08-20 20:10:53 +02:00
Thibaut Girka
24f39c0841
[Glitch] Skip pagination logic entirely for pinned toots
2018-08-20 20:09:19 +02:00
Thibaut Girka
0c091475df
Make non-link ColumnLinks behave as links
2018-08-20 20:08:13 +02:00
Thibaut Girka
f4d28ccfa3
Don't filter own toots
2018-08-19 21:36:46 +02:00
Thibaut Girka
ea3c0ce321
Adapt github issue template to glitch-soc
...
We don't have releases, so it don't make sense to mention.
On the other hand, a lot of our code is from upstream, so encourage people to
check whether it is a bug in glitch-soc or upstream.
2018-08-19 16:56:42 +02:00
Thibaut Girka
432f6b88b0
Focus CW field when enabling it, focus compose textarea when disabling it
...
Port a99179d31f
and 09147186b7
to glitch-soc
2018-08-19 16:56:31 +02:00
ThibG
484b9314e3
Merge pull request #652 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2018-08-19 09:46:26 +02:00
Thibaut Girka
88a0395a58
Merge branch 'master' into glitch-soc/merge-upstream
2018-08-19 09:27:18 +02:00
ThibG
44e31c3e53
Merge pull request #649 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2018-08-18 18:22:54 +02:00
Thibaut Girka
bfeac6747a
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
.circleci/config.yml
app/controllers/authorize_follows_controller.rb
app/javascript/packs/public.js
Moved new stuff from packs/public.js to core/public.js.
Added appropriate use_pack in new controllers.
2018-08-18 18:04:49 +02:00
Thibaut Girka
7423c0c130
Various minor upload description fixes
2018-08-18 17:53:20 +02:00
Thibaut Girka
534439e73b
Add focal points support in the composer
2018-08-18 17:53:20 +02:00
Thibaut Girka
9782ac017b
Refactor in preparation for focal points modal
2018-08-18 17:53:20 +02:00
Thibaut Girka
69d4fa3bc5
Fix rails-ujs not being run on some settings pages ( fixes #645 )
2018-08-17 19:51:05 +02:00
ThibG
32075fe27f
Merge pull request #642 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2018-08-17 18:09:30 +02:00
Thibaut Girka
a16ff45d81
Temporarily revert doorkeeper back to 4.2.6
...
This avoids a regression within OAuth with some clients
2018-08-17 17:50:38 +02:00
Thibaut Girka
280d7b1df8
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
app/models/status.rb
db/migrate/20180528141303_fix_accounts_unique_index.rb
db/schema.rb
Resolved by taking upstream changes (no real conflicts, just glitch-soc
specific code too close to actual changes).
2018-08-17 17:43:54 +02:00
Thibaut Girka
4a6bc2482a
[Glitch] Defer scrollIntoView after DOM is drawn
2018-08-17 14:46:37 +02:00
Thibaut Girka
50cd70b3e9
Fix incorrect prop type for ComposerReply.status
2018-08-16 21:19:20 +02:00
Thibaut Girka
7595ae4090
Fix one GettingStarted ColumnLink not having a key
2018-08-16 20:59:12 +02:00
Thibaut Girka
80148d8edd
Split custom filter migration script using the post-deployment migration system
...
There were some concerns with the custom filter migration script dropping a table,
thus making it unsafe to run in a zero-downtime setting. Upstream introduced
a way to run migrations after deployment, so revisit the old migration script to
make use of this.
2018-08-16 20:30:09 +02:00
Thibaut Girka
494eaab5b1
Slightly more aggressive video preloading
...
- Preload video metadata if the video is loaded in detailed view, as it is
likely to get played, and metadata is useful for seeking in the video.
- Preload video data if it's fullscreen as it is extremely likely to get
played right after being put in fullscreen (although those are two steps).
- Preload video data if the user has clicked the position slider, as the video
will play as soon as the mouse button is released, and video metadata is
needed to properly seek into the video.
2018-08-14 21:56:23 +02:00
Thibaut Girka
c4e8402ef9
Fix bug when clicking on video position slider before starting the video
2018-08-14 21:56:23 +02:00
Thibaut Girka
f0fa6e3a7c
Prevent default event handling when clicking on the video position slider
...
This prevents accidental text selection and avoids opening the toot containing
the video in the dynamic column when clicking on the position slider.
2018-08-14 21:56:23 +02:00
Eugen Rochko
fcb527cdd6
Add post-deployment migration system ( #8182 )
...
Adopted from GitLab CE. Generate new migration with:
rails g post_deployment_migration name_of_migration_here
By default they are run together with db:migrate. To not run them,
the env variable SKIP_POST_DEPLOYMENT_MIGRATIONS must be set
Code by Yorick Peterse <yorickpeterse@gmail.com>, see also:
83c8241160
2018-08-13 18:17:20 +02:00
Evgeny Petrov
9e4ac1c12c
Added endorse strings, fixed footer 'developers' string ( #8183 )
2018-08-13 18:17:20 +02:00
Eugen Rochko
434628d98f
Expect relays to answer with accept/reject ( #8179 )
2018-08-13 18:17:20 +02:00
S.H
5f41bbd274
Update Rails ( #8141 )
...
* Update Rails
* fix Update Rails
2018-08-13 18:17:20 +02:00
ThibG
19da279703
Add some feedback to maintenance rake tasks ( #8173 )
2018-08-13 18:17:20 +02:00
Yamagishi Kazutoshi
662a914f5e
Weblate translations (2018-08-12) ( #8171 )
...
* Translated using Weblate (Japanese)
Currently translated at 100.0% (307 of 307 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/
* Translated using Weblate (Japanese)
Currently translated at 98.5% (657 of 667 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/
* Translated using Weblate (Japanese)
Currently translated at 98.5% (657 of 667 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/
* Translated using Weblate (Japanese)
Currently translated at 99.8% (666 of 667 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/
* Translated using Weblate (Czech)
Currently translated at 100.0% (307 of 307 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cs/
* Translated using Weblate (Czech)
Currently translated at 98.5% (657 of 667 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/
* Translated using Weblate (Czech)
Currently translated at 100.0% (307 of 307 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cs/
* Translated using Weblate (Czech)
Currently translated at 99.8% (666 of 667 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/
* Translated using Weblate (Czech)
Currently translated at 100.0% (2 of 2 strings)
Translation: Mastodon/Activerecord
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/cs/
* Translated using Weblate (Czech)
Currently translated at 61.2% (38 of 62 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/cs/
* Translated using Weblate (Ukrainian)
Currently translated at 51.2% (42 of 82 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/uk/
* Translated using Weblate (Czech)
Currently translated at 100.0% (62 of 62 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/cs/
* Translated using Weblate (Galician)
Currently translated at 99.8% (666 of 667 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 99.8% (666 of 667 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/
* Translated using Weblate (Dutch)
Currently translated at 100.0% (667 of 667 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/
* Translated using Weblate (Ukrainian)
Currently translated at 99.6% (306 of 307 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/uk/
* Translated using Weblate (Czech)
Currently translated at 67.0% (55 of 82 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/cs/
* Translated using Weblate (Ukrainian)
Currently translated at 97.0% (647 of 667 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/uk/
* Translated using Weblate (Ukrainian)
Currently translated at 97.1% (648 of 667 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/uk/
* Translated using Weblate (Czech)
Currently translated at 100.0% (82 of 82 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/cs/
* Translated using Weblate (Czech)
Currently translated at 18.3% (18 of 98 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/cs/
* Translated using Weblate (Danish)
Currently translated at 79.3% (529 of 667 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/da/
* Translated using Weblate (Czech)
Currently translated at 61.2% (60 of 98 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/cs/
* Translated using Weblate (Czech)
Currently translated at 100.0% (98 of 98 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/cs/
* Translated using Weblate (Occitan)
Currently translated at 99.7% (667 of 669 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/oc/
* Translated using Weblate (German)
Currently translated at 96.5% (646 of 669 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/
* Translated using Weblate (Japanese)
Currently translated at 99.7% (667 of 669 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 99.8% (668 of 669 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/
* Translated using Weblate (Czech)
Currently translated at 99.8% (668 of 669 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (307 of 307 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt_BR/
* Translated using Weblate (Corsican)
Currently translated at 99.3% (305 of 307 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/co/
* Translated using Weblate (Corsican)
Currently translated at 92.2% (617 of 669 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/co/
* Translated using Weblate (Telugu)
Currently translated at 100.0% (307 of 307 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/te/
* Translated using Weblate (Arabic)
Currently translated at 91.4% (75 of 82 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/
* Translated using Weblate (Arabic)
Currently translated at 100.0% (307 of 307 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/
* Translated using Weblate (Arabic)
Currently translated at 92.9% (622 of 669 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/
* Translated using Weblate (Danish)
Currently translated at 92.8% (91 of 98 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/da/
* Translated using Weblate (Greek)
Currently translated at 99.8% (668 of 669 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/
* Translated using Weblate (Danish)
Currently translated at 82.0% (549 of 669 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/da/
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 99.8% (668 of 669 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/
* Translated using Weblate (Korean)
Currently translated at 98.2% (657 of 669 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ko/
* Translated using Weblate (Korean)
Currently translated at 100.0% (307 of 307 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ko/
* Translated using Weblate (German)
Currently translated at 97.7% (654 of 669 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/
* Translated using Weblate (Corsican)
Currently translated at 98.5% (659 of 669 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/co/
* Translated using Weblate (Corsican)
Currently translated at 100.0% (82 of 82 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/co/
* Translated using Weblate (Corsican)
Currently translated at 100.0% (307 of 307 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/co/
* Translated using Weblate (Corsican)
Currently translated at 100.0% (98 of 98 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/co/
* Translated using Weblate (French)
Currently translated at 100.0% (307 of 307 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/
* Translated using Weblate (Basque)
Currently translated at 96.2% (644 of 669 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/eu/
* Translated using Weblate (Basque)
Currently translated at 100.0% (98 of 98 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/eu/
* Translated using Weblate (Basque)
Currently translated at 90.2% (74 of 82 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/eu/
* Translated using Weblate (Basque)
Currently translated at 100.0% (307 of 307 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eu/
* Translated using Weblate (Czech)
Currently translated at 99.8% (668 of 669 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/
* Translated using Weblate (Czech)
Currently translated at 100.0% (2 of 2 strings)
Translation: Mastodon/Activerecord
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/cs/
* Translated using Weblate (Czech)
Currently translated at 100.0% (82 of 82 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/cs/
* Translated using Weblate (Czech)
Currently translated at 100.0% (307 of 307 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cs/
* Translated using Weblate (Asturian)
Currently translated at 29.8% (200 of 669 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ast/
* Translated using Weblate (Greek)
Currently translated at 99.8% (668 of 669 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/
* Translated using Weblate (Greek)
Currently translated at 100.0% (307 of 307 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/
* Translated using Weblate (Czech)
Currently translated at 100.0% (98 of 98 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/cs/
* Translated using Weblate (German)
Currently translated at 100.0% (98 of 98 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/de/
* Translated using Weblate (Greek)
Currently translated at 100.0% (82 of 82 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/el/
* Translated using Weblate (German)
Currently translated at 96.3% (79 of 82 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/de/
* Translated using Weblate (German)
Currently translated at 99.7% (667 of 669 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/
* Translated using Weblate (German)
Currently translated at 100.0% (307 of 307 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/de/
* Translated using Weblate (German)
Currently translated at 100.0% (98 of 98 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/de/
* Translated using Weblate (French)
Currently translated at 100.0% (98 of 98 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/fr/
* Translated using Weblate (German)
Currently translated at 97.5% (80 of 82 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/de/
* Translated using Weblate (French)
Currently translated at 100.0% (82 of 82 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fr/
* Translated using Weblate (French)
Currently translated at 100.0% (307 of 307 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/
* Translated using Weblate (German)
Currently translated at 98.7% (81 of 82 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/de/
* Translated using Weblate (German)
Currently translated at 99.8% (668 of 669 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/
* Translated using Weblate (German)
Currently translated at 98.7% (81 of 82 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/de/
* Translated using Weblate (German)
Currently translated at 98.7% (82 of 82 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/de/
* Translated using Weblate (French)
Currently translated at 97.4% (652 of 669 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/
* Translated using Weblate (German)
Currently translated at 99.8% (668 of 669 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/
* Translated using Weblate (Japanese)
Currently translated at 99.8% (668 of 669 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/
* Translated using Weblate (German)
Currently translated at 99.8% (668 of 669 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/
* Translated using Weblate (Dutch)
Currently translated at 100.0% (669 of 669 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/
* Translated using Weblate (German)
Currently translated at 99.8% (668 of 669 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/
* Translated using Weblate (Danish)
Currently translated at 85.0% (569 of 669 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/da/
* Translated using Weblate (Czech)
Currently translated at 100.0% (307 of 307 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cs/
* Translated using Weblate (Dutch)
Currently translated at 100.0% (307 of 307 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/
* Translated using Weblate (Dutch)
Currently translated at 100.0% (669 of 669 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/
* yarn manage:translations
* i18n-tasks normalize && i18n-tasks remove-unused
2018-08-13 18:17:20 +02:00
ThibG
2a9950b2e2
Make some migration script more robust ( fixes #8007 ) ( #8170 )
...
Include a dummy Account class in the migration script containing only the
attributes relevant to the migration in order to not rely as much on the
codebase being in sync with the database schema.
2018-08-13 18:17:20 +02:00
ThibG
d215c43cda
Merge pull request #633 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2018-08-11 16:17:29 +02:00
Thibaut Girka
84a2587d44
Merge branch 'master' into glitch-soc/merge-upstream
2018-08-11 15:45:42 +02:00
Thibaut Girka
741fb32bef
Fix statuses batch checkboxes in admin panel ( fixes #411 )
2018-08-11 15:45:12 +02:00
Thibaut Girka
acb3d5b7aa
Don't prevent opening links in tabs with keyboard modifiers
...
Ctrl+click usually allows opening a link in a new tab. This
was prevented for hashtag or user links in toots.
2018-08-11 15:29:08 +02:00
ThibG
d787bcdeb1
Merge pull request #630 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2018-08-11 15:28:06 +02:00
Thibaut Girka
03afc365d5
Introduce OAuth scopes for bookmarks
2018-08-10 16:49:06 +02:00
Thibaut Girka
7067b64de3
Implement public profile endorsements in glitch-soc
...
Port WebUI changes from f2404de871
to glitch-soc
2018-08-10 16:25:46 +02:00
Thibaut Girka
4e66e0ac04
Merge upstream SCSS changes for /about, /about/more and /terms
...
Port various commits to glitch-soc, mainly commits
0dcc1950d1
and
5b8603879f
.
2018-08-10 16:22:49 +02:00
Thibaut Girka
16a4a333a2
Merge upstream styling for public profile endorsements
...
Port the SCSS part of f2404de871
to glitch-soc
2018-08-10 16:22:49 +02:00
Thibaut Girka
e5a603206d
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
app/controllers/accounts_controller.rb
app/javascript/mastodon/locales/pl.json
app/views/about/more.html.haml
Conflicts in `accounts_controller.rb` resolved by taking upstream's
version + our `use_pack`.
Conflicts in `pl.json` resolved by taking upstream's changes.
Conflicts in `aboute/more.html.haml` resolved by taking upstream's changes.
2018-08-10 16:22:31 +02:00
Thibaut Girka
90b492143d
Introduce OAuth scopes for bookmarks
2018-08-10 15:26:52 +02:00
Thibaut Girka
7d1dd59496
Good bye, CW rainbows
...
Accessibility issues largely outweigh the joke and consistency with upstream.
2018-08-07 18:49:49 +02:00
Thibaut Girka
c700778922
Scroll to linked status in public status view
2018-08-07 16:58:00 +02:00
Thibaut Girka
617c3a8006
Restore glitch-soc's 500 characters limit for bios ( fixes #625 )
2018-08-06 08:20:29 +02:00
Thibaut Girka
5e6cec4a40
Import upstream's emojify function in settings.js
...
This fixes updating the profile preview when changing display name.
2018-08-05 12:57:20 +02:00
Thibaut Girka
ed69117048
Fix styling of toot prepended text on public profiles
...
Fixes how “Pinned toot”, “… boosted” etc. are styled on public profiles.
2018-08-02 12:43:00 +02:00
ThibG
cf0f8eb742
Merge pull request #621 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2018-08-02 11:57:52 +02:00
Thibaut Girka
bf1d3ae3b8
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
config/settings.yml
2018-08-01 22:20:25 +02:00
Thibaut Girka
71b318dedc
Delete leftovers from keyword_mutes
2018-08-01 16:49:27 +02:00
ThibG
20e75666b2
Merge pull request #619 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2018-08-01 15:29:35 +02:00
Thibaut Girka
a0d0111979
Fix toot styling on public pages
...
The public pages now use CSS from the WebUI to style toots, but the glitch-soc
UI is widely different. Hack around that for now by hardcoding upstream-like
values.
2018-08-01 00:18:42 +02:00
Thibaut Girka
7ab46b73bd
Reintroduce glitch-soc avatar styling in public pages
2018-08-01 00:18:42 +02:00
Thibaut Girka
a3dd2deda3
[Glitch] Do not hide hashtag timeline in mobile view, make it full-window
...
Port 13ac8ca66a
to glitch-soc
2018-08-01 00:18:42 +02:00
Thibaut Girka
175c2155a9
[Glitch] Compensate for scrollbar disappearing when media modal
...
Port 60df87f6f0
to glitch-soc
2018-08-01 00:18:42 +02:00
Thibaut Girka
d2b3eebe00
[Glitch] Show media modal on public timeline
...
Port e0b1e17bd0
to glitch-soc
2018-08-01 00:18:42 +02:00
Thibaut Girka
5cd7fe21bf
[Glitch] Add missing formatting to the text in hero widget
...
Port 1d773b3a46
to glitch-soc
2018-08-01 00:18:42 +02:00
Thibaut Girka
d894cdc93f
Port profile redesign to glitch-soc
...
Port bb71538bb5
to glitch-soc
2018-08-01 00:18:42 +02:00
Thibaut Girka
c1c514ca70
Merge branch 'master' into glitch-soc/merge-upstream
...
Manually-resolved conflicts:
.circleci/config.yml
app/controllers/accounts_controller.rb
app/controllers/auth/passwords_controller.rb
app/controllers/statuses_controller.rb
app/javascript/packs/public.js
app/models/media_attachment.rb
app/views/stream_entries/_content_spoiler.html.haml
app/views/stream_entries/_media.html.haml
config/locales/en.yml
config/locales/ja.yml
config/locales/pl.yml
lib/mastodon/version.rb
Some content from app/javascript/packs/public.js has been split to
app/javascript/core/settings.js.
Translation strings for glitch-soc's keyword mutes were dropped.
Everything else was mostly “take both”.
2018-08-01 00:18:13 +02:00
Thibaut Girka
88b593a63f
Drop glitch-style account bio fields
...
Upstream's implementation has been merged a while ago and is the preferred
way to set fields, as it is the only one compatible with upstream and is
more user-friendly.
This commit deletes the legacy glitch-soc FrontMatter functionality in order
to clean up the code and make it easier to maintain.
2018-07-31 16:26:36 +02:00
Thibaut Girka
c4bec9263c
Disallow remote users from viewing local-only toots
2018-07-31 15:41:04 +02:00
Thibaut Girka
9f2945ef80
Add test to disallow remote users from fetching local-only toots
2018-07-31 15:41:04 +02:00
Thibaut Girka
9d09c7cc68
Use workspace instead of caching for built assets
...
Tests cannot run without built assets, and we want
exactly the matching assets. This is not a cache.
2018-07-30 22:25:22 +02:00
Thibaut Girka
1bae4c4f83
[Glitch] Resize images by area instead of fixed dimensions
...
Port WebUI part of 0fb0037ca7
to glitch-soc
2018-07-30 19:30:38 +02:00
ThibG
ce090a5201
Merge pull request #614 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes up to (excluding) profile redesign
2018-07-30 16:51:55 +02:00
Thibaut Girka
5f1bdca4c8
Merge commit 'e23b26178a71f90d64fe2a3e9e4468f265ecc71c' into glitch-soc/merge-upstream
...
Merge upstream changes right before the public profile redesign.
2018-07-30 14:39:06 +02:00
Thibaut Girka
b02bfe86ce
Don't reset scroll position when opening a modal
2018-07-30 14:32:02 +02:00
Thibaut Girka
5d060cb6e4
Allow modals to be closed by pressing “back”
2018-07-30 14:32:02 +02:00
Thibaut Girka
3eb3c21327
Treat the App Setting link as a proper link ( fixes #375 )
2018-07-30 14:31:45 +02:00
Thibaut Girka
88b7ccc2ca
[Glitch] Improve WebUI account action bar
...
Mostly a port of 2ccef52a4f
to glitch-soc
2018-07-30 14:24:35 +02:00
Thibaut Girka
4cf7cfd9e0
[Glitch] Fix accounts' display name/bio not being set from initial state
...
Port 20d1be18af
to glitch-soc
2018-07-30 14:24:24 +02:00
Thibaut Girka
d8544e7003
Use same margin for navbar and column for consistency
2018-07-28 23:26:18 +02:00
Thibaut Girka
69ea4a01e1
Hide navigation bar text so it can fit on small screens
2018-07-28 23:26:18 +02:00
Thibaut Girka
37302c63c3
Fix glitch-soc columns padding on mobile ( fixes #561 )
2018-07-28 23:26:18 +02:00
Thibaut Girka
93d4e9a58d
Preserve hashtags in threaded mode ( fixes #584 )
2018-07-28 23:25:57 +02:00
Thibaut Girka
28a59e4e80
Move CW field just above main textarea
2018-07-28 23:25:42 +02:00
Thibaut Girka
358e3a4c32
Get rid of Collapsable, use CSS instead
...
Change inspired by 691107263c
2018-07-28 23:25:42 +02:00
Thibaut Girka
7317b7b231
Reduce assets precompilation time by about 20%
...
Bundle most common webpack chunks into a “common” pack,
in a way similar to what upstream does.
2018-07-28 23:24:41 +02:00
Thibaut Girka
d3783b864c
Refactor reply indicator and show compact list of attachments
2018-07-28 23:24:15 +02:00
Thibaut Girka
e3bf8c8aa1
Show reply indicator for empty toots, not undefined toots ( fixes #610 )
...
Fix a regression introduced by 612b00d1bb
2018-07-28 23:24:15 +02:00
Thibaut Girka
3fa9bf7cc2
Double CircleCI's timeout for assets:precompile…
2018-07-27 10:38:46 +02:00
Thibaut Girka
c057aeb76b
[Glitch] Add documentation for “p” hotkey
...
Port ed50c2393a0f12f88f1102f8cf8beca3bf711158 to glitch-soc
2018-07-26 22:19:01 +02:00
Thibaut Girka
a8911616b6
Add hotkey variants to keyboard shortcuts description
...
Port 89c6d2bd6bc014ca6487c8f2569f8252fb3ef5dc to glitch-soc
2018-07-26 22:19:01 +02:00
ThibG
b156fc4b4d
Merge pull request #603 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2018-07-26 22:17:10 +02:00
Thibaut Girka
6141c2a035
Merge branch 'master' into glitch-soc/merge-upstream
2018-07-26 21:22:43 +02:00
Thibaut Girka
82ab5aacb2
Prevent scrolling main frame when navigating in image gallery with arrow keys
2018-07-26 08:42:25 +02:00
Thibaut Girka
02326a4322
[Glitch] Use LoadingBar instead of blur to indicate that an image is loading
...
Port 955d5d36e8
to the glitch-soc flavour
2018-07-24 21:20:18 +02:00
Thibaut Girka
1769a7e9aa
Use the same description string as upstream for the “x” hotkey
2018-07-24 21:15:21 +02:00
Thibaut Girka
b1ed2b1d03
Fix focusing search bar with hotkeys
2018-07-24 21:15:21 +02:00
Thibaut Girka
c600bcfe1d
Fix focusing composer textarea on “new toot” hotkey
2018-07-24 21:15:21 +02:00
Thibaut Girka
037228cf03
Fix routing issues, especially keyboards shortcuts changing location
2018-07-24 21:14:50 +02:00
Thibaut Girka
1aa253c41d
Display custom emoji in account notes in WebUI ( fixes #595 )
2018-07-21 21:44:49 +02:00
Thibaut Girka
c99054ecb2
Add CSS for the newly-introduced dashboard ( fixes #592 )
2018-07-18 23:08:27 +02:00
Thibaut Girka
828f602b2f
[Glitch] Ensure container of React components has full width
...
Port f6910fba02
to glitch-soc
2018-07-18 22:38:55 +02:00
ThibG
baf42ef0b3
Merge pull request #590 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2018-07-18 22:38:43 +02:00
Thibaut Girka
b9d5d8982d
Merge branch 'master' into glitch-soc/merge-upstream
2018-07-18 21:54:51 +02:00
Thibaut Girka
f328d20ff8
Increase timeout for assets:precompile
2018-07-18 21:20:30 +02:00
Thibaut Girka
d2244c86de
Goodbye Travis CI, hello Circle CI? ( fixes #559 )
2018-07-18 21:20:30 +02:00
Thibaut Girka
552b4d9a5f
Disable threaded mode when canceling a reply ( fixes #583 )
2018-07-18 16:42:00 +02:00
ThibG
c44579c42d
Merge pull request #585 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2018-07-18 09:17:20 +02:00
Thibaut Girka
7dbed4dab9
Merge branch 'master' into glitch-soc/merge-upstream
2018-07-17 22:05:25 +02:00
Thibaut Girka
1fb78602c5
Do not cause an error if domain_lists.blocks.next is undefined ( fixes #572 )
...
Port d0d23b8f0a
to glitch-soc
2018-07-17 21:54:54 +02:00
Thibaut Girka
8501ad5c5c
Process statuses on COMPOSE_SUBMIT_SUCCESS ( fixes #579 )
2018-07-17 21:54:36 +02:00
ThibG
012ca4c68d
Merge pull request #578 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2018-07-17 21:54:12 +02:00
Thibaut Girka
bcf157a1a9
Avoid loading rails-ujs twice on vanilla flavour
2018-07-16 16:42:52 +02:00
Thibaut Girka
f26f1145ac
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
Dockerfile
app/javascript/packs/common.js
config/webpack/loaders/sass.js
config/webpack/shared.js
db/schema.rb
package.json
yarn.lock
A lot of the conflicts come from updating webpack.
Even though upstream deleted app/javascript/packs/common.js, I kept
glitch-soc's version as it unifies JS/CSS packs behavior across flavours.
Ported glitch changes to webpack 4.x
2018-07-16 14:50:42 +02:00
ThibG
8e8491e1da
Merge pull request #575 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2018-07-12 21:41:40 +02:00
Thibaut Girka
ddfcedcfe4
Merge branch 'master' into glitch-soc/merge-upstream
2018-07-12 19:26:20 +02:00
Thibaut Girka
57f31b361f
Add an option restricting secondary toot privacy to that of the toot being replied to
2018-07-12 19:15:44 +02:00
Thibaut Girka
d8b13b46f7
Move privacyPreference to utils
2018-07-12 15:31:42 +02:00
Thibaut Girka
cd05378b59
[Glitch] Refactor privacyPrefence() to use priority list
...
Port f2d9a3c239
to glitch-soc
2018-07-12 15:31:42 +02:00
Thibaut Girka
d67cb13d84
Use options rather than a boolean
...
This prepares for a third option that would restrict privacy to
privacyPreference(replyPrivacy, sideArmBasePrivacy)
2018-07-12 11:22:34 +02:00
Thibaut Girka
8c8707771d
Do not store duplicate reply_privacy
2018-07-12 11:22:34 +02:00
Ash Levy
6f06d16b1e
add option to enable auto visibility on secondary toot button
2018-07-12 11:22:34 +02:00
Thibaut Girka
7cb7ecaf7e
[Glitch] Make whole-word filter regex consistent between Ruby and JS
...
Port front-end part of 20fefdb714
to glitch-soc
2018-07-11 22:06:34 +02:00
Thibaut Girka
debc6544d9
[Glitch] Add follow button to detailed status, add gradient to mask bio cut-off ( fixes #566 )
...
Port 30e1da7668
to glitch-soc
2018-07-11 22:05:15 +02:00
ThibG
017628fd00
Merge pull request #567 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2018-07-11 19:53:43 +02:00
Thibaut Girka
6f0f583abe
Merge branch 'master' into glitch-soc/merge-upstream
2018-07-11 17:57:08 +02:00
Thibaut Girka
612b00d1bb
Display reply indicator even when replying to contentless toot ( fixes #564 )
2018-07-10 22:53:04 +02:00
Thibaut Girka
ef1d660596
make sure reblogged's filter is set correctly
2018-07-10 14:06:04 +02:00
Thibaut Girka
faa4db7975
[Glitch] Add option to not consider word boundaries when processing keyword filtering
...
Port 1ca4e51eb3
to glitch-soc
2018-07-10 14:06:04 +02:00
Thibaut Girka
6777dfc8d9
[Glitch] In keyword filter, account for reblogs, HTML and whole-words
...
Port 404c7702ec
to glitch-soc
2018-07-10 14:06:04 +02:00
Thibaut Girka
00c1386b9d
[Glitch] Fix filters not affecting notifications in web UI
...
Port cfeb3beb4e
to glitch-soc
2018-07-10 14:06:04 +02:00
Thibaut Girka
0bb1720495
Add client-side custom filter support to glitch-soc
...
Port cdb101340a
to glitch-soc,
but without dropping support for regexp filters yet.
2018-07-10 14:06:04 +02:00
Thibaut Girka
33c1607c83
[Glitch] Fix Chrome issue with sizes="0px"
2018-07-10 10:53:36 +02:00
Ash Levy
e96a4434c7
add keybind in composer textarea for secondary submit
2018-07-10 10:53:22 +02:00
ThibG
e6647ccf6d
Merge pull request #557 from ThibG/glitch-soc/tentative-merge
...
Merge upstream changes
2018-07-10 10:52:18 +02:00
Thibaut Girka
402da8065c
Migrate glitch-soc keyword mutes to Mastodon's
...
Completely remove glitch-soc's Keyword Mutes, migrate
existing database records to CustomFilters.
Handling of client-side filters is still not implemented
in the glitch-soc front-end.
2018-07-09 19:19:23 +02:00
Thibaut Girka
ee41947e9d
Set appropriate assets pack for the keyword filter page
2018-07-09 19:19:23 +02:00
Thibaut Girka
7a7d8c335e
Re-install test/dev dependencies before running tests
...
before_script used to trigger “yarn install --no-progress --production”,
which would uninstall dependencies required to run the tests.
Until railties is fixed or we move to Circle CI, work around that
issue by re-installing dev dependencies.
2018-07-09 19:19:23 +02:00
Thibaut Girka
d392020da6
Merge branch 'master' into glitch-soc/tentative-merge
...
Conflicts:
README.md
app/controllers/statuses_controller.rb
app/lib/feed_manager.rb
config/navigation.rb
spec/lib/feed_manager_spec.rb
Conflicts were resolved by taking both versions for each change.
This means the two filter systems (glitch-soc's keyword mutes and tootsuite's
custom filters) are in place, which will be changed in a follow-up commit.
2018-07-09 07:13:59 +02:00
Thibaut Girka
c699b2d141
Remove duplicate code for handling muted users
...
The mute check was indeed streamlined in f62539ce5c
and we somehow kept some of the old code when merging.
2018-07-07 19:10:13 +02:00
ThibG
c18d55e8c2
Merge pull request #553 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2018-06-24 15:27:51 +02:00
Thibaut Girka
f364a27922
Increase padding of toots
2018-06-24 14:46:02 +02:00
Thibaut Girka
ccbaf32bca
Fix margins of toot text
2018-06-24 14:46:02 +02:00
Thibaut Girka
4b0f27ba78
Merge branch 'master' into glitch-soc/merge-upstream
2018-06-24 14:32:22 +02:00
ThibG
03cfe366fd
Merge pull request #550 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2018-06-22 00:10:43 +02:00
Thibaut Girka
0c3a337e04
Fix confirmations_controller
2018-06-21 23:48:54 +02:00
Thibaut Girka
f0161702d8
[Glitch] Submit report using meta key
...
Port 64d7a63f18
to glitch-soc
2018-06-21 22:28:50 +02:00
Thibaut Girka
d0faac9027
Fix clicking on collapsed toots with a background ( fixes #547 )
2018-06-21 22:17:19 +02:00
Thibaut Girka
ab5f450700
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
app/models/user.rb
Resolved by adding :default_language to user settings fields
2018-06-21 20:49:57 +02:00
Thibaut Girka
26c20a4ec7
[Glitch] Preserve newlines in delete & redraft and desktop notifications
...
Port c75493755f
to glitch-soc
2018-06-16 15:09:28 +02:00
Thibaut Girka
a01faecfcb
[Glitch] Add redraft function
...
Port bd0791d800
to glitch-soc
2018-06-16 15:09:28 +02:00
ThibG
c08a249558
Merge pull request #544 from ThibG/glitch-soc/merge-upstream
...
Merge branch 'master' into glitch-soc/merge-upstream
2018-06-16 15:08:52 +02:00
Thibaut Girka
e8ccac468a
[Glitch] Add vendor prefix for background-clip
...
Port e0354aba7c
to glitch-soc
2018-06-15 22:14:48 +02:00
David Yip
8cafeedc25
Port 85470ec872
to glitch emoji picker.
...
Fixes #541 .
2018-06-15 22:10:50 +02:00
Thibaut Girka
db200226b8
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
app/javascript/mastodon/initial_state.js
db/schema.rb
Upstream added a new field to initial_state.
Not too sure about what happened with db/schema.rb though…
2018-06-15 20:51:39 +02:00
Jenkins
afceef74c2
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-06-14 06:17:24 +00:00
David Yip
9d2b7ef9f8
Merge pull request #540 from lanodan/glitch-soc-pr/charLimit
...
Put maxChars back in compose.js
2018-06-13 22:46:31 -05:00
Lain Iwakura
6bae583d2f
Handle character limit in initial state in frontend.
2018-06-14 01:56:11 +02:00
David Yip
f1bfcb50f0
Merge pull request #531 from glitch-soc/454-allow-keyword-mutes-to-skip-mentions
...
Allow keyword mutes to skip mentions (#454 )
2018-06-12 19:28:08 -05:00
David Yip
5cff053944
Merge branch 'master' into 454-allow-keyword-mutes-to-skip-mentions
2018-06-12 18:13:30 -05:00
David Yip
f6bb50b6ec
Merge pull request #539 from glitch-soc/merge-upstream
...
Merge upstream
2018-06-12 18:12:29 -05:00
David Yip
99b2bc2668
keyword mute: Add missing scope for regex escape test
2018-06-12 17:48:38 -05:00
David Yip
fac6e392e9
Port emojimart 2.6.1 changes to glitch flavour
...
See also the following commits:
- 0c3ce41031
- 268d90e810
2018-06-12 17:43:50 -05:00
David Yip
908a770d2b
keyword mute: use mentions scope in home feed filtering ( #454 )
...
If a status shows up in mentions because all keyword mutes that might
apply to it are marked as "don't apply to mentions", then it ought to
show up in the home feed also.
2018-06-12 17:14:35 -05:00
David Yip
e931cf656d
Merge remote-tracking branch 'glitchsoc/master' into 454-allow-keyword-mutes-to-skip-mentions
...
Conflicts:
app/models/glitch/keyword_mute.rb
2018-06-12 16:39:30 -05:00
Jenkins
4d8d1fa129
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-06-12 13:17:21 +00:00
David Yip
34f1fd2a62
Merge pull request #538 from ThibG/glitch-soc/fixes/obsolote-constants
...
Delete references to removed constants (fixes #537 )
2018-06-09 11:42:56 -05:00
Thibaut Girka
7d3c0e4cb4
Delete references to removed constants ( fixes #537 )
2018-06-09 18:14:23 +02:00
David Yip
f9eb4ea80a
Merge pull request #506 from ThibG/glitch-soc/fixes/static-500
...
Hardcode default skin/theme in error layout (fixes #373 )
2018-06-09 10:39:55 -05:00
David Yip
a9515f3186
Merge pull request #535 from glitch-soc/merge-upstream
...
Merge upstream
2018-06-08 00:33:09 -05:00
David Yip
8142bd2553
Merge remote-tracking branch 'tootsuite/master' into merge-upstream
...
Conflicts:
app/models/status.rb
The conflict in the Status model was due to
5bf5003384
.
It was resolved by accepting tootsuite's changes.
2018-06-07 05:13:49 -05:00
David Yip
f8d50a4070
Merge pull request #509 from ThibG/glitch-soc/fixes/router-history-navigation
...
Use history.state to decide whether we should goBack() or go to / (fixes #247 )
2018-06-06 23:56:48 -05:00
David Yip
68373e799b
Merge pull request #534 from glitch-soc/restructure-kw-as-word-lists
...
Escape metacharacters in non-whole-word keyword mutes (#463 , #533 )
2018-06-05 21:38:04 -05:00
David Yip
a640c322c1
Escape metacharacters in non-whole-word keyword mutes. Fixes #533 .
...
Also addresses #463 .
2018-06-05 02:49:28 -05:00
David Yip
f009fef40b
Merge pull request #530 from glitch-soc/restructure-kw-as-word-lists
...
keyword mute: Store keywords in a list, not a regex
2018-06-04 15:58:23 -05:00
David Yip
97d2df77aa
Add apply-to-mentions option to keyword mute UI. #454 .
2018-06-04 02:51:28 -05:00
David Yip
cf28049f0a
Add a FeedManager example demonstrating non-mention keywords. #454 .
2018-06-03 23:04:00 -05:00
David Yip
a40e322f4b
Fix spacing in some FeedManager examples.
2018-06-03 23:02:01 -05:00
David Yip
26573ad7e6
Thread scopes through #matches?. #454 .
...
Also add an apply_to_mentions attribute on Glitch::KeywordMute, which is
used to calculate scope. Next up: additions to the test suite to
demonstrate how scoping works.
2018-06-03 23:00:50 -05:00
David Yip
c55263027a
Merge remote-tracking branch 'origin/master' into gs-master
2018-06-03 19:44:05 -05:00
David Yip
37d495eeeb
keyword mute: Store keywords as a list
...
This has a couple of advantages over the regex approach:
- Keywords are individually addressable, which makes it easier to gather
statistics (#363 )
- Keywords can be individually applied to different feeds, e.g. skipping
mentions (#454 )
It *does* end up creating many more Regexp objects. I'm not yet sure if
the difference is significant.
2018-06-03 18:12:55 -05:00
David Yip
0f979c3460
Merge pull request #529 from glitch-soc/tweak-491
...
Note that favourite confirmation applies to Glitch flavour only (#491 )
2018-06-03 04:22:20 -05:00
David Yip
d757c8a644
prefs: Note that favourite confirmation applies to Glitch flavour only ( #491 )
2018-06-03 03:40:27 -05:00
David Yip
5dd2a78034
Merge pull request #528 from glitch-soc/merge-upstream
...
Merge with tootsuite/master
2018-06-03 03:01:09 -05:00
David Yip
8343f56b2c
Whoops, forgot to clean up a conflict.
2018-06-03 02:35:54 -05:00
David Yip
cfdbb36bdf
Merge pull request #519 from ThibG/glitch-soc/fixes/status-node-null
...
Prevent a rare crash when a status' root node is undefined
2018-06-02 16:19:06 -05:00
David Yip
3550470c18
Merge remote-tracking branch 'origin/master' into gs-master
...
Conflicts:
app/javascript/mastodon/locales/en.json
app/javascript/mastodon/locales/ja.json
app/javascript/mastodon/locales/pl.json
The above conflicts appear to be a text conflict introduced by
glitch-soc's additional level of columns (i.e. moving a bunch of columns
under the Misc option). They were resolved via accept-ours.
2018-06-02 16:15:36 -05:00
David Yip
a641d1b5b8
Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master
2018-06-02 16:08:31 -05:00
David Yip
9ad5de8a3a
Merge pull request #501 from ThibG/glitch-soc/features/red-bookmarks
...
Make active bookmarks red (fixes #493 )
2018-06-01 00:36:48 -05:00
David Yip
0aba716fe1
Merge pull request #471 from impiaaa/thread-icon
...
Add an extra icon to indicate that a status is part of a conversation
2018-06-01 00:35:13 -05:00
Spencer Alves
e5f25a73f2
Adjust spacing between status icons
2018-05-31 21:55:44 -07:00
Spencer Alves
7d2e6429c2
Merge branch 'glitch' into thread-icon
2018-05-31 21:33:16 -07:00
Thibaut Girka
b9fdeceb3c
Make active bookmarks red ( fixes #493 )
2018-05-31 14:39:48 +02:00
Thibaut Girka
cc396f085d
Use history.state to decide whether we should goBack() or go to / ( fixes #247 )
...
So far, glitch-soc used history.length to decide whether to call `goBack()` or
go to / in order to not leave the webUI. This made clicking the “Back” button
go to the “Getting started” column instead of going back in the browser's
history when such an action would leave the web UI, but also when:
- The WebUI is refreshed (F5)
- A tab is restored
- The history length reaches its maximum (e.g., 50 in Firefox)
This commit fixes these shortcomings by checking `window.history.state`.
Indeed, we only want to go back in the browser's history when the current
location has been reached from within the WebUI, which only happens via
`pushState` as far as I know. Since browser store the serialized state in
the browser history, this also survives page reload and session restoration.
2018-05-31 14:39:02 +02:00
Thibaut Girka
f86d280fd6
Use props.router instead of context.router, as we are using withRouter
2018-05-31 14:39:02 +02:00
Thibaut Girka
e8a9627f66
Hardcode default skin/theme in error layout ( fixes #373 )
...
This is a bit hackish. The best way would simply to somehow
use Mastodon's ApplicationController with `use_pack 'error'` from
the Rake task, but I'm not sure how to do that.
2018-05-31 14:38:48 +02:00
Thibaut Girka
893f2aff20
Prevent a rare crash when a status' root node is undefined
2018-05-31 14:38:29 +02:00
Thibaut Girka
e396fbfe3b
Fix direct timeline
2018-05-31 14:37:13 +02:00
Jenkins
165b5dc7f5
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-05-31 01:17:25 +00:00
Thibaut Girka
e7b3a4263e
[Glitch] Fix low-contrasted cancel button of reply indicator
...
Port 86efccce2a
to glitch-soc
2018-05-29 21:25:47 +02:00
Thibaut Girka
08dbe29e29
[Glitch] Improve load gap styling in web UI
...
Port 45c9f16f71
to glitch-soc
2018-05-29 21:25:28 +02:00
Thibaut Girka
cc589d6ec0
[Glitch] Use randomized setTimeout when fallback-polling and re-add since_id
...
Port dafd7afc5e
to glitch-soc
2018-05-29 21:25:28 +02:00
Thibaut Girka
fbc25bdd2d
[Glitch] Do not crash in getStatusIds when there is a gap in the timeline
...
Port b1938d7853
to glitch-soc
2018-05-29 21:25:28 +02:00
Thibaut Girka
5cc4d34250
[Glitch] Fix gap insertion for timeline disconnection
...
Port 66359ec522
to glitch-soc
2018-05-29 21:25:28 +02:00
Thibaut Girka
15bef77add
[Glitch] Fix ID duplication in timelines
...
Port 306267dbd2
to glitch-soc
2018-05-29 21:25:28 +02:00
Thibaut Girka
4b38ac3bed
[Glitch] Fix comparing id
...
Port 0ba49eca8b
to glitch-soc
2018-05-29 21:25:28 +02:00
Thibaut Girka
6020a21130
[Glitch] Fix LoadMore on account media gallery
...
Port 3523aa440b
to glitch-soc
2018-05-29 21:25:28 +02:00
Thibaut Girka
5d16fd3f28
[Glitch] Add missing null handling in notification reducer
...
Port 2f3ac14a43
to glitch-soc
2018-05-29 21:25:28 +02:00
Thibaut Girka
4eba8c50c3
[Glitch] Allow clients to fetch notifications made while they were offline
...
Port cbf97c03bb
to glitch-soc
2018-05-29 21:25:28 +02:00
Thibaut Girka
0ad3eedd4c
[Glitch] Allow clients to fetch statuses made while they were offline
...
Port 9a1a55ce52
to glitch-soc
2018-05-29 21:25:28 +02:00
Thibaut Girka
532fb8e215
Fix error when unmuting a domain without listing muted domains first
2018-05-29 16:26:39 +02:00
David Yip
6a1544bd46
Merge pull request #525 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2018-05-29 09:06:00 -05:00
Thibaut Girka
c087738270
Merge branch 'master' into glitch-soc/merge-upstream
2018-05-29 13:52:26 +02:00
Thibaut Girka
8b98afa781
[Glitch] Replace onScrollToBottom with onLoadMore
...
Port b0664a5e6c
to glitch-soc
2018-05-27 20:40:58 +02:00
Thibaut Girka
a81ed7b205
Do not needlessly refresh pinned toots
...
Port missing part of 6ae70a92c9
to glitch-soc
2018-05-27 20:40:58 +02:00
Thibaut Girka
60addb14ce
[Glitch] Change icon for domain blocks
...
Port fa04945365
to glitch-soc
2018-05-27 20:40:58 +02:00
Thibaut Girka
b7508940b7
[Glitch] Add option to show only local toots in timeline preview
...
Port missing changes from 4e4f1b0dcb
to glitch-soc
2018-05-27 20:39:25 +02:00
Thibaut Girka
1fa3586db5
[Glitch] Use streaming API for standalone timelines on /about and /tag pages
...
Port 0128b86d30
to glitch-soc
2018-05-27 20:39:25 +02:00
Thibaut Girka
d959d04133
Change direct message warning to match upstream
2018-05-27 15:46:00 +02:00
ThibG
458ec31791
Merge pull request #520 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2018-05-27 14:24:57 +02:00
Thibaut Girka
659b8a12ec
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
config/locales/ca.yml
config/locales/nl.yml
config/locales/oc.yml
config/locales/pt-BR.yml
Resolved conflicts by removing upstream-specific changes
2018-05-27 13:20:15 +02:00
Thibaut Girka
c2e528916c
Implement client-size image resizing from upstream
2018-05-27 11:02:54 +02:00
Thibaut Girka
d253449ff0
Port upstream's result section headers ( fixes #366 )
2018-05-27 11:02:44 +02:00
ThibG
22bc07998c
Merge pull request #508 from ThibG/glitch-soc/fixes/remove-leftover-from-attachment-url-insertion
...
Fix caret position after inserting suggestions
2018-05-26 13:22:49 +02:00
Thibaut Girka
18d9a7fd71
Fix caret position after inserting suggestions ( fixes #281 )
2018-05-26 12:17:03 +02:00
Thibaut Girka
d8793e1bee
Remove unneeded code now that attachment URL isn't appended to toots
2018-05-26 12:17:03 +02:00
ThibG
a5c25242af
Merge pull request #514 from ThibG/glitch-soc/fixes/fix-hardcoded-fav
...
[Glitch] Use .star-icon instead of hardcoding color in detailed statuses
2018-05-25 22:03:31 +02:00
ThibG
a4f68f90db
Merge pull request #518 from ThibG/glitch-soc/merge-master
...
Merge upstream changes
2018-05-25 21:41:25 +02:00
Thibaut Girka
11cc2e099a
Merge branch 'master' into glitch-soc/merge-master
...
Conflicts:
app/javascript/styles/mastodon-light.scss
config/themes.yml
Removed config/themes.yml, took upstream's mastodon-light.scss
2018-05-25 18:59:02 +02:00
ThibG
9b75a13104
Merge pull request #517 from ThibG/glitch-soc/fixes/max_toot_chars
...
Add missing comma in InitalStateSerializer (fixes #516 )
2018-05-25 14:44:20 +02:00
Thibaut Girka
c1d0f96bb4
Add missing comma in InitalStateSerializer ( fixes #516 )
2018-05-25 14:06:48 +02:00
Thibaut Girka
4c91215e1f
[Glitch] Use .star-icon instead of hardcoding color in detailed statuses
...
Port 2587fcdd27
to glitch-soc
2018-05-25 11:16:11 +02:00
ThibG
88ec5193cb
Merge pull request #510 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2018-05-23 19:19:28 +02:00
ThibG
7719fe0df2
Merge pull request #505 from ThibG/glitch-soc/features/fetch-relationships-on-search
...
[Glitch] Fetch relationships for search results in UI
2018-05-23 18:54:51 +02:00
ThibG
e4c82e33e4
Merge pull request #512 from ThibG/glitch-soc/fixes/fix-ckbox-color
...
Change notification cleaning checkbox color (fixes #511 )
2018-05-23 18:54:31 +02:00
Thibaut Girka
0553496b76
Change notification cleaning checkbox color ( fixes #511 )
2018-05-23 18:29:15 +02:00
Thibaut Girka
e0ef89c73f
Merge branch 'master' into glitch-soc/merge-upstream
2018-05-23 16:05:19 +02:00
Thibaut Girka
247f55f673
[Glitch] Fetch relationships for search results in UI
...
Port webui changes from cba2897108
to glitch-soc
2018-05-22 13:05:40 +02:00
ThibG
2289250f69
Merge pull request #503 from glitch-soc/merge-upstream
...
Merge upstream
2018-05-22 10:02:33 +02:00
David Yip
6dd676e006
Merge remote-tracking branch 'origin/master' into merge-upstream
...
Conflicts:
config/locales/pl.yml
The conflict in config/locales/pl.yml concerns the themes key, which is
not used in glitchsoc. Resolution: remove the themes key-related
changes, i.e. accept-ours.
2018-05-21 16:30:24 -05:00
Jenkins
f93806ea55
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-05-21 18:17:23 +00:00
ThibG
cc230e5d57
Merge pull request #495 from ThibG/glitch-soc/fixes/port-upstream-fixes
...
Port various WebUI fixes from upstream
2018-05-21 19:20:17 +02:00
Thibaut Girka
d0b2f71501
Fix width only being set for standalone media
2018-05-21 18:25:41 +02:00
Thibaut Girka
3ad3cee44c
[Glitch] Use real container width in MediaGallery srcSet
...
Port 22e067bf5c
to glitch-soc
2018-05-21 17:55:07 +02:00
Thibaut Girka
463078dcc4
[Glitch] Do not override the default push notification settings
...
Port 1951ff41b3
to glitch-soc
2018-05-21 17:52:26 +02:00
ThibG
162f1863a7
Merge pull request #499 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2018-05-21 17:51:06 +02:00
Thibaut Girka
a4c9bda771
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
app/javascript/styles/mastodon-light.scss
config/locales/en.yml
config/locales/fr.yml
config/locales/simple_form.pl.yml
config/themes.yml
Conflicts resolved by deleting config/themes.yml,
marking app/javascript/styles/mastodon-light.scss as added,
and taking all new translation strings, not removing anything from
them.
2018-05-21 16:40:02 +02:00
ThibG
98ecadbf99
Merge pull request #492 from ThibG/glitch-soc/fixes/port-scss
...
Port SCSS changes from upstream
2018-05-21 16:29:05 +02:00
Thibaut Girka
c53aacdfa0
Recover glitch-soc specific styles that were removed by accident
2018-05-21 15:56:47 +02:00
Thibaut Girka
d250e072a2
In footer, replace text "Mastodon" with logo
...
Port SCSS changes from 93c66f0c03
to glitch-soc
2018-05-20 11:29:06 +02:00
Thibaut Girka
9ed8051961
Add preference to hide following/followers lists
...
Port SCSS from 1e02dc8715
2018-05-20 11:28:58 +02:00
Thibaut Girka
50540446f5
[Glitch] Improvements to toots display in admin view
...
Port SCSS changes from 0f2fbf7d05
(I'm sorry for the animated rainbows)
2018-05-20 11:28:58 +02:00
David Yip
2f9bd86f6e
Merge pull request #470 from ThibG/glitch-soc/fixes/status-click-detailed
...
Widen clickable area of toots
2018-05-20 03:03:39 -05:00
David Yip
56a3d2b64b
Merge pull request #494 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2018-05-20 03:01:44 -05:00
Thibaut Girka
b481e4fac1
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
config/locales/simple_form.ja.yml
2018-05-19 22:41:10 +02:00
Thibaut Girka
9d6788b30b
Prevent click on video from opening detailed toot
2018-05-18 17:49:51 +02:00
Thibaut Girka
2154bd1b5a
Widen clickable area of toots
2018-05-18 17:33:58 +02:00
ThibG
625c4f36ef
Merge pull request #490 from glitch-soc/merge-upstream
...
Merge with tootsuite @ 57b503d4ef
2018-05-18 17:20:32 +02:00
David Yip
765fc6700c
ci: Hack around a Travis condition, I guess
2018-05-18 09:51:00 -05:00
David Yip
399af266e5
ci: Bump .travis.yml to 2.5.1
2018-05-18 08:47:17 -05:00
David Yip
e0eebba461
Merge remote-tracking branch 'origin/master' into merge-upstream
...
Conflicts:
app/controllers/follower_accounts_controller.rb
app/controllers/following_accounts_controller.rb
app/controllers/settings/preferences_controller.rb
app/lib/user_settings_decorator.rb
app/models/user.rb
config/locales/simple_form.en.yml
2018-05-18 08:47:10 -05:00
David Yip
023dfa119e
Merge pull request #487 from ThibG/glitch-soc/cleanup
...
Remove service worker code that has never been used
2018-05-18 08:37:31 -05:00
David Yip
81e3ec4d61
Merge pull request #488 from ThibG/glitch-soc/features/accounts-custom-emoji
...
[Glitch] Enable custom emojis in profiles
2018-05-18 07:55:00 -05:00
David Yip
5d823ee00a
Merge pull request #489 from ThibG/glitch-soc/features/port-public-ui-changes
...
Port public UI changes from upstream
2018-05-18 07:53:53 -05:00
Jenkins
4c0770d6c8
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-05-18 00:17:23 +00:00
Thibaut Girka
07baa1ddb5
[Glitch] Open video modal on public UI
...
Port d9b2f84c92
to glitch-soc
2018-05-17 18:37:00 +02:00
Thibaut Girka
94db024e4c
[Glitch] Combine similar components into one on public UI
...
Port f9afd06221
to glitch-soc
2018-05-17 18:37:00 +02:00
Thibaut Girka
dd1d98f9cf
[Glitch] Show card modal on public pages
...
Port 16fee0335f
to glitch-soc
2018-05-17 18:37:00 +02:00
Thibaut Girka
52b2f18b15
[Glitch] Enable custom emojis in profiles
...
Port 61a9018607
to glitch-soc
2018-05-17 15:57:16 +02:00
Thibaut Girka
ca49ad86c6
Remove service worker code that has never been used
2018-05-17 15:39:37 +02:00
Jenkins
2636a23092
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-05-17 11:17:21 +00:00
ThibG
4bf43e6f3e
Merge pull request #486 from ThibG/glitch-soc/merge-upstream
...
Merge changes from upstream
2018-05-16 23:10:12 +02:00
Thibaut Girka
78ac246b87
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
Gemfile
Solved conflicts by using upstream's line for posix-spawn
2018-05-16 21:52:38 +02:00
ThibG
80aad16e10
Merge pull request #405 from ThibG/glitch-soc/features/dm-from-menu
...
[Glitch] Feature: Direct message from menu
2018-05-16 20:17:08 +02:00
ThibG
9712d59dda
Merge pull request #485 from ThibG/glitch-soc/fixes/light-theme-textarea-color
...
Fix mastodon-light background color of the composer textarea when posting
2018-05-16 20:16:59 +02:00
Thibaut Girka
784712791d
[Glitch] Reword the direct message warning
...
Port 53c2164e9c
to glitch-soc
2018-05-16 19:45:30 +02:00
Thibaut Girka
97c69de416
[Glitch] Feature: Direct message from Statuses
...
Port 904a2479dd
to glitch-soc
2018-05-16 19:45:30 +02:00
Thibaut Girka
fb6de5310d
[Glitch] Fix issues with sending direct messages from user profile
...
Port 4fd71accd4
to glitch-soc
2018-05-16 19:45:30 +02:00
Thibaut Girka
a5fac975f3
[Glitch] Feature: Direct message from menu
...
Port d1f34151ae
to glitch-soc
2018-05-16 19:45:30 +02:00
Thibaut Girka
eb9c9855ce
Fix mastodon-light background color of the composer textarea when posting
2018-05-16 19:37:44 +02:00
ThibG
f47f6c3345
Merge pull request #483 from ThibG/glitch-soc/fixes/modal
...
Fix modals testing for props.noEsc (fixes #482 )
2018-05-15 10:52:07 +02:00
Thibaut Girka
dfa60cb0a8
Fix modals testing for props.noEsc ( fixes #482 )
2018-05-15 10:39:12 +02:00
David Yip
939ea456d2
Merge pull request #476 from ThibG/fixes/update-scss
...
Change local settings SCSS to be more consistent with modals
2018-05-14 15:04:28 -05:00
Thibaut Girka
971218d1dc
Change local settings SCSS to be more consistent with modals
2018-05-14 21:39:04 +02:00
David Yip
b5684e9874
Merge pull request #481 from ThibG/glitch-soc/merge
...
Merge upstream changes
2018-05-14 14:14:00 -05:00
Thibaut Girka
ba7ee67498
Merge branch 'master' into glitch-soc/merge
2018-05-14 20:51:50 +02:00
beatrix
4665965543
Merge pull request #469 from ThibG/glitch-soc/features/glitch-light-theme
...
Port Sylvhem's mastodon-light to glitch flavour
2018-05-13 18:57:58 -04:00
ThibG
685cf5599f
Merge pull request #480 from ThibG/glitch-soc/fixes/glitch-soc-bio-escape
...
Fix glitch-style bio fields incorrect HTML escaping in public profiles
2018-05-12 17:53:01 +02:00
Thibaut Girka
cc8d81519e
Fix glitch-style bio fields incorrect HTML escaping in public profiles
2018-05-12 17:45:30 +02:00
ThibG
bd4decb7db
Merge pull request #479 from ThibG/glitch-soc/fixes/modal-root-keyup
...
Fix root modal's keyup handling (Fixes #478 )
2018-05-11 23:04:12 +02:00
Thibaut Girka
769a48495c
Fix root modal's keyup handling ( Fixes #478 )
2018-05-11 22:42:32 +02:00
ThibG
da8897aaef
Merge pull request #477 from ThibG/glitch-soc/merge
...
Merge upstream changes
2018-05-11 20:34:19 +02:00
Thibaut Girka
45fce0e496
Merge branch 'master' into glitch-soc/merge
...
Conflicts:
app/controllers/invites_controller.rb
app/serializers/initial_state_serializer.rb
config/locales/ko.yml
2018-05-11 18:12:42 +02:00
ThibG
e7ed61917b
Merge pull request #475 from ThibG/fixes/update-scss
...
Update SCSS from upstream
2018-05-11 16:51:14 +02:00
ThibG
479e5bbd4a
Merge pull request #474 from ThibG/glitch-soc/fixes/html-ified-tooltip
...
[Glitch] Use plaintext value for field value tooltips in web UI
2018-05-11 16:26:23 +02:00
Thibaut Girka
6284039832
[Glitch] Fix contact info styling on landing page
2018-05-11 16:05:47 +02:00
Thibaut Girka
f2e5ed6841
Update SCSS for tables
2018-05-11 14:48:19 +02:00
Thibaut Girka
8860f14ef0
Update SCSS for statuses public view
2018-05-11 14:43:26 +02:00
Thibaut Girka
4a1040c4cb
[Glitch] Adjust RTL styles for landing page
...
Port 8bf3e750ab
to glitch-soc
2018-05-11 14:34:23 +02:00
Thibaut Girka
e8644f3a4b
Update forms SCSS from upstream
2018-05-11 14:31:18 +02:00
Thibaut Girka
4cd65fe074
Update SCSS to match “Show card modal on public pages”
2018-05-11 14:20:46 +02:00
Thibaut Girka
1a4d735b1d
Update SCSS for about/landing page
2018-05-11 14:18:52 +02:00
Thibaut Girka
db73c0bc5d
Update admin page SCSS from upstream
2018-05-11 14:13:59 +02:00
Thibaut Girka
f6ec8c4821
[Glitch] Use plaintext value for field value tooltips in web UI
...
Port d185f3ddaf
to glitch-soc
This doesn't change anything for glitch-style fields, but those will go
away eventually
2018-05-10 14:11:23 +02:00
ThibG
34142ab29c
Merge pull request #472 from ThibG/glitch-soc/merge
...
Merge upstream changes
2018-05-10 00:28:54 +02:00
Thibaut Girka
5d8052e715
Add bot badge to account headers in the WebUI
2018-05-10 00:05:08 +02:00
Thibaut Girka
2f01935cba
Adapt account fields rendering code in the WebUI to match upstream
2018-05-10 00:03:34 +02:00
Thibaut Girka
30bb530c70
Update glitch-soc style to match new bio fields markup
2018-05-10 00:03:34 +02:00
Thibaut Girka
a8be40933d
Ignore tootsuite-specific theme-related translation strings
2018-05-10 00:03:34 +02:00
Thibaut Girka
1c9c0167b7
Merge branch 'master' into glitch-soc/master
...
Conflicts:
app/models/account.rb
app/views/accounts/_header.html.haml
2018-05-10 00:03:28 +02:00
David Yip
143878d9da
Merge remote-tracking branch 'glitchsoc/master' into gs-master
2018-05-08 09:43:33 -05:00
Spencer Alves
f2ff167c1a
Add an extra icon to indicate that a status is part of a conversation
2018-05-07 22:10:34 -07:00
Thibaut Girka
8f3402b1f0
Port Sylvhem's mastodon-light to glitch flavour
2018-05-07 17:00:02 +02:00
beatrix
919e2098cb
Merge pull request #468 from ThibG/glitch-soc/features/reports-improvements
...
Various improvements to the reports modal
2018-05-07 09:45:13 -04:00
beatrix
2eb924c00c
Merge pull request #467 from ThibG/glitch-soc/fixes/fix-boost-color
...
Fix color of disabled boost buttons (fixes #466 )
2018-05-07 09:21:32 -04:00
Thibaut Girka
658ac4396c
Hide media in report modal regardless of whether they are marked sensitive
...
The rationale behind this is that if the user wants to report violent media,
they might not want to see it repeatedly. The “sensitive” property is still
kept, displaying different messages for hidden media depending on whether
they are marked as sensitive.
2018-05-07 15:00:55 +02:00
Thibaut Girka
6b94237810
[Glitch] Allow report modal to be up to 80% of viewport height
...
Port bddb330a8a08b7459c299fb56ae8770c3ac69af5 to glitch-soc
2018-05-07 14:59:22 +02:00
Thibaut Girka
7972464e71
[Glitch] Also display replies in report modal
...
Port c88e12fca622c46a361a5c751a529e77aa5bf2ba to glitch-soc
2018-05-07 14:55:16 +02:00
Thibaut Girka
ffdb85f859
Fix color of disabled boost buttons ( fixes #466 )
2018-05-07 13:37:29 +02:00
David Yip
2e25da4da0
Merge pull request #465 from ThibG/glitch-soc/rollback-scroll-changes
...
Glitch soc/rollback scroll changes
2018-05-06 17:39:07 -05:00
David Yip
a0629c5696
Merge pull request #464 from ThibG/glitch-soc/fixes/high-contrast-colors
...
Fix glitch high-contrast skin text colors
2018-05-06 17:38:58 -05:00
Thibaut Girka
de7feea30e
Revert "[Glitch] Prevent timeline from moving when cursor is hovering over it"
...
This reverts commit 553cc28240
.
2018-05-06 21:50:33 +02:00
Thibaut Girka
4133f70902
Revert "[Glitch] Do not re-position scroll when loading more (inserting items from below)"
...
This reverts commit 32974a58dc
.
2018-05-06 21:50:26 +02:00
Thibaut Girka
1adca9b040
Fix glitch high-contrast skin text colors
...
Port from 3c5006ec7f
2018-05-06 21:00:35 +02:00
beatrix
331190e5fb
Merge pull request #462 from ThibG/glitch-soc/features/dropdowns-accessibility
...
Improve accessibility of toot dropdown menu
2018-05-06 12:12:20 -04:00
beatrix
92f192e9b1
Merge pull request #461 from ThibG/glitch-soc/fixes/emoji-picker-placement
...
[Glitch] Place emoji picker top if it is closer to the bottom of the viewport
2018-05-06 11:33:09 -04:00
beatrix
4480cd745f
Merge pull request #460 from ThibG/glitch-soc/features/do-not-scroll-when-mouse-over
...
Prevent timeline from moving when cursor is hovering over it
2018-05-06 11:32:56 -04:00
beatrix
06770656eb
Merge pull request #459 from ThibG/glitch-soc/features/text-color-variables
...
Add text color variables + minor SCSS fixes + high contrast skin
2018-05-06 11:32:42 -04:00
beatrix
e56639258a
Merge pull request #458 from monsterpit-daggertooth/glitch-fix-escape-metachars-in-mutes
...
Escape regex metachars in keyword mutes
2018-05-06 11:32:22 -04:00
beatrix
35a1a3171f
Merge pull request #449 from ThibG/glitch-soc/features/upstream-account-items
...
Support upstream bio items / custom account fields
2018-05-06 11:32:05 -04:00
Thibaut Girka
65349bc155
Fix color of status icons in glitch-soc high contrast skin
2018-05-06 11:31:05 +02:00
ThibG
af4fb72993
Merge pull request #457 from m4sk1n/glitch-light
...
Add a light theme by @Sylvhem
2018-05-06 11:21:26 +02:00
Thibaut Girka
2d065ceaf6
minor fix
2018-05-05 22:38:15 +02:00
Thibaut Girka
f7a076eded
[Glitch] Add high-contrast theme
2018-05-05 22:33:02 +02:00
Thibaut Girka
caebf69e77
Move attachment-lists out of lists.scss
2018-05-05 22:33:02 +02:00
Thibaut Girka
bd3b9bf7b9
[Glitch] Fix text color in "show more" link inside boost confirmation modal
...
Port ba917e15f6
to glitch-soc
2018-05-05 22:33:02 +02:00
Thibaut Girka
983328376b
Fix link colors in report modal
2018-05-05 22:33:02 +02:00
Thibaut Girka
b3a236637e
[Glitch] Add color variables of texts for better accesibility
...
Port 74dae9458d
and related to glitch-soc
2018-05-05 22:33:02 +02:00
Thibaut Girka
390cfdef2e
[Glitch] Update SCSS of admin and setting pages
...
Port the SCSS changes from cb74c0cfe4
to glitch-soc
2018-05-05 17:58:01 +02:00
Thibaut Girka
9edc5cafe4
[Glitch] Improve styling of closed registrations message
...
Port SCSS changes from 5acd5315f2
to glitch-soc
2018-05-05 17:43:09 +02:00
Thibaut Girka
32974a58dc
[Glitch] Do not re-position scroll when loading more (inserting items from below)
...
Port 8c601b54cc
to glitch-soc
2018-05-05 17:18:55 +02:00
Thibaut Girka
553cc28240
[Glitch] Prevent timeline from moving when cursor is hovering over it
...
Port 58852695c8
to glitch-soc
2018-05-05 17:18:25 +02:00
Thibaut Girka
cee157fc19
Improve accessibility of toot dropdown menu
...
* Prevent Enter keypresses from triggering dropdown display toggle twice
* Give focus to first/selected item of dropdown menus
* Implement keyboard navigation in generic dropdown menus
Partial port from ef7d64c801
to glitch-soc
2018-05-05 17:11:48 +02:00
Thibaut Girka
bfa5bdde2c
[Glitch] Place emoji picker top if it is closer to the bottom of the viewport
...
Port ad5d3134e4
to glitch-soc
2018-05-05 16:58:20 +02:00
Daggertooth
b25278180a
Escape metachars in keywords
2018-05-04 14:58:11 -05:00
David Yip
7600067a30
Merge remote-tracking branch 'origin/master' into gs-master
...
Conflicts:
app/controllers/follower_accounts_controller.rb
app/controllers/following_accounts_controller.rb
db/schema.rb
2018-05-04 14:16:30 -05:00
Marcin Mikołajczak
4c2b522a60
Add a light theme
...
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2018-05-04 20:25:58 +02:00
Jenkins
cb62935c0b
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-05-04 18:17:32 +00:00
David Yip
b316d373ea
Merge remote-tracking branch 'origin/master' into gs-master
...
Conflicts:
CONTRIBUTING.md
2018-05-04 12:16:12 -05:00
David Yip
2058922cc9
Merge branch 'merge-upstream' into gs-master
2018-05-04 12:04:55 -05:00
David Yip
1aa25ee0f5
Merge pull request #456 from m4sk1n/glitch-contrast
...
“Enable” high contrast theme
2018-05-04 11:47:49 -05:00
Marcin Mikołajczak
a7a61889d7
“Enable” high contrast theme
...
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2018-05-04 17:50:11 +02:00
David Yip
54e80bec73
Remove duplicate posix-spawn entry from Gemfile.
2018-05-04 10:11:45 -05:00
David Yip
e41332c37b
Make posix-spawn spec in Gemfile match what's in Gemfile.lock.
2018-05-04 09:51:18 -05:00
David Yip
77a92d3260
Merge remote-tracking branch 'origin/master' into merge-upstream
...
Conflicts:
Gemfile.lock
2018-05-04 09:42:31 -05:00
David Yip
c511b0f72a
Merge remote-tracking branch 'glitchsoc/master' into gs-master
2018-05-04 03:47:35 -05:00
David Yip
da70208b45
Merge remote-tracking branch 'origin/master' into merge-upstream
2018-05-04 03:23:57 -05:00
David Yip
63f848ac8c
Merge pull request #453 from ThibG/glitch-soc/features/short-date
...
[Glitch] Improve relative timestamps in web UI
2018-05-04 03:08:28 -05:00
David Yip
2d392fb3b8
Remove unused translations.
2018-05-04 03:01:10 -05:00
David Yip
106a5d7b83
Remove unnecessary code from MediaAttachment#set_type_and_extension.
...
Well, it seems unnecessary, anyway.
2018-05-04 02:38:04 -05:00
David Yip
c816701550
Merge remote-tracking branch 'origin/master' into gs-master
...
Conflicts:
.travis.yml
Gemfile.lock
README.md
app/controllers/settings/follower_domains_controller.rb
app/controllers/statuses_controller.rb
app/javascript/mastodon/locales/ja.json
app/lib/feed_manager.rb
app/models/media_attachment.rb
app/models/mute.rb
app/models/status.rb
app/services/mute_service.rb
app/views/home/index.html.haml
app/views/stream_entries/_simple_status.html.haml
config/locales/ca.yml
config/locales/en.yml
config/locales/es.yml
config/locales/fr.yml
config/locales/nl.yml
config/locales/pl.yml
config/locales/pt-BR.yml
config/themes.yml
2018-05-03 17:23:44 -05:00
Thibaut Girka
70a16d8858
[Glitch] Improve relative timestamps in web UI
...
Port 660cb058e1
to glitch-soc flavour
2018-05-02 13:45:40 +02:00
David Yip
3a47842223
Merge pull request #451 from glitch-soc/450-make-non-whole-word-mutes-case-insensitive
...
Also treat non-whole-word mutes as case-insensitive (#450 )
2018-04-30 22:38:10 -05:00
David Yip
5f8f481425
Also treat non-whole-word mutes as case-insensitive. #450 .
2018-04-30 20:08:22 -05:00
Thibaut Girka
356d0214c9
Implement tootsuite-style account fields
...
glitch-soc-style still in backup, both sharing the same SCSS style
2018-04-29 18:48:45 +02:00
Thibaut Girka
91fb82a4dd
Fix style of account fields form
2018-04-29 18:48:44 +02:00
beatrix
64be38da0c
Merge pull request #448 from m4sk1n/glitch-pl
...
🌍 : 🇵🇱 ⬆️
2018-04-27 10:31:08 -04:00
beatrix
8de8a621f5
Merge pull request #447 from ThibG/glitch-soc/features/unfold-thread
...
Fix enabling/disabling collapsed toots, as well as the unfold thread feature
2018-04-27 10:30:26 -04:00
Marcin Mikołajczak
deb91f5989
🌍 : 🇵🇱 ⬆️
...
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2018-04-27 14:15:38 +02:00
Thibaut Girka
0ce06657c0
Update react-redux to 5.0.7 to fix an issue with getDerivedStateFromProps
2018-04-27 01:24:55 +02:00
Thibaut Girka
1222e0a381
Use new getDerivedStateFromProps instead of deprecated componentWillReceiveProps
...
As we are already using the new getSnapshotBeforeUpdate lifecycle method,
we apparently cannot use the deprecated ones at all in this component.
2018-04-27 01:24:55 +02:00
Thibaut Girka
b39f3648a7
Tentative fix for #446
2018-04-27 00:59:36 +02:00
beatrix
f4ed38272b
Merge pull request #401 from ThibG/glitch-soc/features/unfold-thread
...
Port the “unfold thread” feature from Mastodon's UI to glitch-soc flavour
2018-04-26 11:34:14 -04:00
beatrix
8f12afb599
Merge pull request #438 from ThibG/glitch-soc/fixes/j-k-hotkeys-pinned
...
[Glitch] Fix the hot key (j, k) does not function correctly when ther…
2018-04-26 11:33:48 -04:00
beatrix
1e9fe95e13
Merge pull request #439 from ThibG/glitch-soc/fixes/emoji-shortcode-inline
...
[Glitch] Do not set emoji as inline-block
2018-04-26 11:33:36 -04:00
beatrix
33691f4920
Merge pull request #440 from ThibG/glitch-soc/fixes/video-fullscreen
...
[Glitch] Fix fullscreen video player
2018-04-26 11:33:24 -04:00
David Yip
aebcf83b4d
Merge pull request #443 from unascribed/glitchsoc-pr-better-collapsed-statuses-fix
...
Fix fade being colored wrongly for DMs and upon focus
2018-04-24 14:26:53 -05:00
Una Thompson
62bea7a290
Fix fade being colored wrongly for DMs and upon focus
2018-04-24 11:34:17 -04:00
ThibG
65b8880ec9
Merge pull request #442 from ThibG/glitch-soc/fixes/actions-modal-mobile
...
Fix actions modal on mobile (fixes #441 )
2018-04-23 23:42:29 +02:00
Thibaut Girka
240833c023
Fix actions modal on mobile ( fixes #441 )
2018-04-23 23:18:36 +02:00
Thibaut Girka
51d276fb98
[Glitch] Fix fullscreen video player
...
Port 53b1d88873
to glitch-soc
2018-04-23 20:38:08 +02:00
Thibaut Girka
003d114332
[Glitch] Fix the hot key (j, k) does not function correctly when there is a pinned toot in account timeline.
...
Port 23106844a1
to glitch-soc
2018-04-22 23:11:16 +02:00
Thibaut Girka
105ffaef8f
[Glitch] Do not set emoji as inline-block
...
Port 597948fb13
to glitch-soc
2018-04-22 22:10:53 +02:00
Thibaut Girka
b383c0688a
[Glitch] Do not overwrite some status attributes in reducer
...
Backport 386365090c
2018-04-22 19:19:01 +02:00
Thibaut Girka
64d8d0464d
Add show more/less toggle for entire threads in web UI
...
Inspired from b6003afcdb
but using component
properties instead of redux store for hidden/revealed state.
2018-04-22 19:19:01 +02:00
Thibaut Girka
2888f74c12
Refactor the infamous three-valued boolean into two booleans, trying to simplify the logic
2018-04-22 19:18:15 +02:00
Thibaut Girka
259bc9840b
[Glitch] Fix style of legacy column headers
...
Backports daefbd66a6
2018-04-22 19:17:10 +02:00
Thibaut Girka
63d671b18f
[Glitch] Fix button hiding when header title is too long
...
Port ffb2b8ef8c
to glitch-soc
2018-04-22 19:17:10 +02:00
Thibaut Girka
abf7c5b850
[Glitch] Fix column headers accessibility
...
Port 08e4c78e78
to glitch-soc.
SCSS fix inspired by 69f13e7bca
.
2018-04-22 19:17:10 +02:00
beatrix
06fc278e4c
Merge pull request #432 from ThibG/glitch-soc/features/reblog-private
...
Glitchsoc-specific changes to allow boosting own private toots
2018-04-22 12:32:58 -04:00
beatrix
8f1ec48cbe
Merge pull request #421 from ThibG/glitch-soc/features/custom-emoji-api
...
[Glitch] retrieve custom emoji list via API instead of before page load
2018-04-22 12:10:48 -04:00
beatrix
125e8c7f5a
Merge pull request #427 from ThibG/glitch-soc/fixes/scroll-behavior
...
Improve ScrollableList behavior
2018-04-22 12:09:52 -04:00
beatrix
cd5728b176
Merge pull request #434 from ThibG/glitch-soc/fixes/public-inline-video
...
Fix video player on toot public views
2018-04-22 12:09:11 -04:00
beatrix
6fb610f865
Merge pull request #433 from ThibG/glitch-soc/fixes/status-filtering
...
Status filtering fixes from upstream
2018-04-22 12:08:12 -04:00
beatrix
e88ce27855
Merge pull request #435 from ThibG/glitch-soc/features/public-modals
...
[Glitch] Show media modal on public pages
2018-04-22 12:07:29 -04:00
beatrix
d7ae97c10a
Merge pull request #436 from unascribed/glitchsoc-pr-better-collapsed-statuses
...
Add fade and margin to collapsed statuses
2018-04-22 12:06:37 -04:00
Una Thompson
5f9b85a0cf
Add fade and margin to collapsed statuses
2018-04-22 11:34:19 -04:00
Thibaut Girka
e4dff10934
Fix video player on toot public views
2018-04-20 16:08:46 +02:00
Thibaut Girka
7a68079b3f
[Glitch] Show media modal on public pages
...
Port ff7941e652
to glitch-soc
2018-04-20 15:58:36 +02:00
Jenkins
ed17e173d6
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-04-19 22:17:23 +00:00
David Yip
40006bcd03
Merge pull request #426 from ThibG/glitch-soc/features/display-focal-points
...
Honor focal points when displaying media
2018-04-19 10:03:49 -05:00
Thibaut Girka
13fa8ec2c7
[Glitch] Fix status filtering in contexts reducer
...
Port 1a37d7e252
to glitch-soc
2018-04-19 16:43:02 +02:00
Thibaut Girka
f84b4d90cb
[Glitch] Do not filter the status collection after muting and blocking
...
Port fd87e5a53b
to glitch-soc
2018-04-19 16:42:27 +02:00
Thibaut Girka
694337d9bb
Fix auto-collapsed toots making the TL jump ( fixes #417 )
2018-04-19 11:30:42 +02:00
Thibaut Girka
931a4d1ebf
Clean up dead code
2018-04-19 11:30:42 +02:00
Thibaut Girka
8f8b71a278
Use React's new lifecycles for scrollable lists
2018-04-19 11:29:37 +02:00
Thibaut Girka
3068384dbc
Glitchsoc-specific changes to allow boosting own private toots
2018-04-19 11:24:29 +02:00
Thibaut Girka
779aa707ec
Only compute height dynamically for standalone media
...
This prevents changing the status' height and triggering jumps in the TL
2018-04-19 11:16:18 +02:00
Thibaut Girka
52229405ed
[Glitch] Make detailed status' media gallery standalone
2018-04-19 11:16:18 +02:00
Thibaut Girka
dcc1c10937
[Glitch] Center thumbnails on focus point
...
Port the display part of the following commits to glitch-soc:
* 90f12f2e5a
* b170627ceb
* 11697d6894
* 56eb5c3f34
2018-04-19 11:16:18 +02:00
Thibaut Girka
f1e25b672a
Use javascript to set MediaGallery height automatically
2018-04-19 11:16:18 +02:00
Thibaut Girka
a95f8271be
Revert some glitch-specific refactoring
...
In order to keep my sanity when porting changes between glitch-soc and upstream.
2018-04-19 11:16:18 +02:00
Thibaut Girka
1822ce89f9
[Glitch] retrieve custom emoji list via API instead of before page load
...
Port b08ab329f4
to glitch-soc
2018-04-19 11:12:52 +02:00
Jenkins
d55ab8e3e8
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-04-19 01:17:38 +00:00
David Yip
d2b28ea51d
Merge remote-tracking branch 'glitchsoc/master' into gs-master
2018-04-18 19:31:53 -05:00
David Yip
78c145d3cb
db: make schema.rb version subsume bookmarks migration.
2018-04-18 19:08:35 -05:00
David Yip
16d5217502
Merge remote-tracking branch 'origin/master' into gs-master
...
Conflicts:
app/controllers/home_controller.rb
app/controllers/stream_entries_controller.rb
app/javascript/mastodon/locales/ja.json
app/javascript/mastodon/locales/pl.json
2018-04-18 18:48:12 -05:00
ThibG
21837b291e
Merge pull request #430 from ThibG/glitch-soc/features/bookmarks
...
Fix the bookmark column pinning fix…
2018-04-17 11:46:31 +02:00
Thibaut Girka
1aac83ef47
Fix the bookmark column pinning fix…
2018-04-17 11:24:07 +02:00
ThibG
84d0aa7b26
Merge pull request #429 from ThibG/glitch-soc/features/bookmarks
...
Fix pinning the bookmarks column (fixes #428 )
2018-04-16 23:24:51 +02:00
Thibaut Girka
54f5170f59
Fix pinning the bookmarks column ( fixes #428 )
2018-04-16 22:52:45 +02:00
David Yip
f879672554
Merge pull request #424 from ThibG/glitch-soc/features/video-player-improvements
...
Backport a few MediaGallery/Video changes from upstream (fixes #423 )
2018-04-16 14:41:36 -05:00
David Yip
1076204eb4
Merge pull request #425 from ThibG/glitch-soc/fixes/gifv-modal-size
...
Fix extended video player (gifv) modal size
2018-04-16 14:41:18 -05:00
Thibaut Girka
5cc7c4b920
Fix extended video player (gifv) modal size
...
It was currently full-size
2018-04-14 21:47:56 +02:00
Thibaut Girka
5d96c5ac41
[Glitch] Responsively enforce 16:9 ratio on video thumbnails in web UI
...
Port the video-player part of 036dd98abb
to
glitch-soc. MediaGallery part ignored since it has diverged quite a bit.
This fixes #423
2018-04-14 17:35:45 +02:00
David Yip
813da6788e
Merge remote-tracking branch 'origin/master' into gs-master
...
Conflicts:
db/schema.rb
2018-04-14 09:12:50 -05:00
Thibaut Girka
c5dd4ed1d5
[Glitch] Fix media button type
...
Port ecdac9017e
to glitch-soc
2018-04-14 12:30:55 +02:00
Thibaut Girka
dfe8abb8cd
[Glitch] Handle preference to always display sensitive media
...
Port the UI part of 76f3d5d16b
to glitch-soc
2018-04-14 12:27:14 +02:00
Jenkins
e3d0d72b29
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-04-14 09:17:23 +00:00
David Yip
d66192f21c
Merge remote-tracking branch 'glitchsoc/master' into gs-master
...
Conflicts:
db/schema.rb
2018-04-14 03:50:31 -05:00
David Yip
78aca92689
ci: Tell Travis to expect before_script to be slow.
2018-04-14 03:04:32 -05:00
David Yip
95a892accd
Merge pull request #422 from KnzkDev/ja-translation
...
Add missing Japanese translation
2018-04-13 18:52:32 -05:00
imncls
dd4ad6300b
Add missing Japanese translation
2018-04-14 07:53:56 +09:00
David Yip
b7804028c2
Merge pull request #419 from ThibG/glitch-soc/features/bookmarks
...
Bookmarks
2018-04-13 16:38:15 -05:00
David Yip
ed490b781f
Merge remote-tracking branch 'origin/master' into gs-master
...
Conflicts:
Gemfile.lock
config/application.rb
2018-04-13 16:36:46 -05:00
David Yip
a817f084ea
Merge remote-tracking branch 'tootsuite/master'
...
Conflicts:
app/controllers/statuses_controller.rb
2018-04-12 03:30:57 -05:00
David Yip
eb72c3398c
Merge pull request #418 from ThibG/glitch-soc/fixes/composer-dropdowns
...
Place composer dropdown menus top if they are closer to the bottom of the viewport
2018-04-12 03:28:22 -05:00
David Yip
0b326950bf
Merge pull request #416 from ThibG/glitch-soc/features/media-modal
...
Port various media modal improvements to glitch-soc
2018-04-12 00:20:19 -05:00
David Yip
763cda91a8
Merge pull request #420 from ThibG/glitch-soc/fixes/reports-style
...
Update glitch-soc style to match changes to reports UI
2018-04-11 15:21:17 -05:00
Thibaut Girka
acb434b0c9
Add glitch-soc front-end support for bookmarks
...
Unlike boosts and like, there is no confirmation dialog as misclicking
can be recovered without another user seeing it.
2018-04-11 21:05:34 +02:00
Thibaut Girka
09240810b4
Add spec for bookmark endpoints
2018-04-11 21:05:34 +02:00
Thibaut Girka
50eb8f1f61
Add backend support for bookmarks
...
Bookmarks behave like favourites, except they aren't shared with other
users and do not have an associated counter.
2018-04-11 20:40:29 +02:00
Thibaut Girka
043a699990
Update glitch-soc style to match changes to reports UI
...
Port style changes from d9b62e34da
2018-04-11 19:15:42 +02:00
Jenkins
33c2bbdda7
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-04-11 00:50:09 +00:00
Thibaut Girka
e74e5c7eb9
Place composer dropdown menus top if they are closer to the bottom of the viewport
2018-04-10 20:52:31 +02:00
David Yip
67e77f230e
Merge remote-tracking branch 'origin/master' into gs-master
...
Conflicts:
app/serializers/initial_state_serializer.rb
The glitch flavour isn't yet pulling custom emoji data on its own (see
https://github.com/tootsuite/mastodon/pull/7047 ). Once that gets into
the glitch flavour, we can eliminate the custom_emojis load.
2018-04-08 19:05:02 -05:00
David Yip
695b53b796
Merge pull request #414 from ThibG/glitch-soc/fixes/fix-video-playback
...
Fix video playback in glitch-soc detailed statuses
2018-04-08 18:18:41 -05:00
David Yip
8a082d8735
Merge pull request #415 from ThibG/glitch-soc/fixes/source-url
...
Point to glitch-soc source and not tootsuite on the public page
2018-04-08 18:18:00 -05:00
Thibaut Girka
9073687f66
[Glitch] Fix video player height
...
Port 31e7b73084
to glitch-soc
2018-04-09 01:08:51 +02:00
Thibaut Girka
101e6564fd
[Glitch] Refactor scss
...
Port f691afaae9
to glitch-soc
2018-04-09 01:08:50 +02:00
Thibaut Girka
0fb5ea5d15
Fix video modal
2018-04-09 00:11:10 +02:00
Thibaut Girka
a4fa8c9064
[Glitch] Avoid using JS to set height in MediaModal
...
Port fa5c867e0e
to glitch-soc
2018-04-08 23:18:24 +02:00
Thibaut Girka
87071d9e81
[Glitch] Improved media modal
...
Port 4e929b2d17
to glitch-soc
2018-04-08 23:15:25 +02:00
Thibaut Girka
0b86ec4e7f
[Glitch] Allow to open a modal for embedded photo
...
Port bf7757cbbc
to glitch-soc
2018-04-08 23:06:33 +02:00
Thibaut Girka
88bcfaeb18
Point to glitch-soc source and not tootsuite on the public page
...
(hello AGPLv3)
2018-04-08 15:43:26 +02:00
Thibaut Girka
a896f601fa
Fix video playback in glitch-soc detailed statuses
2018-04-08 12:22:12 +02:00
David Yip
3ab6a8b8be
Merge remote-tracking branch 'origin/master' into gs-master
...
Conflicts:
spec/views/about/show.html.haml_spec.rb
2018-04-04 13:56:58 -05:00
David Yip
bda1782cd8
Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master
2018-04-04 13:55:42 -05:00
beatrix
77b650b69c
Merge pull request #412 from ThibG/glitch-soc/cleanup
...
Remove duplicate message entries (minor code cleanup)
2018-04-04 11:36:54 -04:00
beatrix
4ab58c3292
Merge pull request #413 from ThibG/glitch-soc/fixes/fix-account-card-style
...
Update accounts SCSS for public pages
2018-04-04 11:36:41 -04:00
Thibaut Girka
d0e792e231
Update accounts SCSS for public pages
2018-04-04 15:40:59 +02:00
Thibaut Girka
75f2e9fd97
Remove duplicate message entries
2018-04-04 12:19:00 +02:00
Jenkins
6611100480
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-04-03 19:17:20 +00:00
David Yip
1f5bdd8445
Merge pull request #410 from ThibG/glitch-soc/fixes/compose-disable
...
[Glitch] Fix: Prevent submission using same logic as submit button disabling
2018-04-02 14:42:09 -05:00
Thibaut Girka
ca9f022a80
[Glitch] Fix: Prevent submission using same logic as submit button disabling.
...
Port 6a895e1ab3
to glitch-soc
2018-04-02 20:04:18 +02:00
David Yip
eb39db7f93
Merge remote-tracking branch 'origin/master' into gs-master
...
Conflicts:
app/javascript/mastodon/locales/en.json
app/javascript/mastodon/locales/ja.json
app/javascript/mastodon/locales/pl.json
app/views/accounts/_header.html.haml
2018-04-01 20:24:50 -05:00
Jenkins
f0bb3ff533
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-03-30 19:17:17 +00:00
beatrix
01bad04efd
Merge pull request #408 from ThibG/glitch-soc/fixes/admin-js
...
Add “public” pack to admin controller, as it is included in upstream …
2018-03-30 14:50:19 -04:00
beatrix
3304cb681d
Merge pull request #380 from ThibG/glitch-soc/features/domain-block-ui
...
Port #6628 to glitch-soc flavour
2018-03-30 14:50:02 -04:00
David Yip
257146c960
Merge pull request #406 from ThibG/glitch-soc/fixes/menu-fixes
...
Backport dropdown menu fixes from Mastodon
2018-03-30 11:29:26 -05:00
David Yip
9248d1e3a7
Merge pull request #407 from ThibG/glitch-soc/fixes/migration-page
...
Fix migration page style
2018-03-30 11:27:57 -05:00
Thibaut Girka
b305e7452a
Add “public” pack to admin controller, as it is included in upstream admin layout
...
Fixes CW unfolding in moderation
2018-03-30 18:16:47 +02:00
Thibaut Girka
167a2ecde0
Fix migration page style
2018-03-30 15:26:12 +02:00
Thibaut Girka
48bcf4d6e8
[Glitch] Remove pointer events on the entire UI when a dropdown menu is open
...
Port 913a38111f
to glitch-soc
2018-03-30 12:45:23 +02:00
Thibaut Girka
2871a82fcc
[Glitch] Place dropdown menu top if it is closer to the bottom of the viewport
...
Port f6a8d835d3
to glitch-soc
2018-03-30 12:31:29 +02:00
Thibaut Girka
218cc261d1
Add the domain blocks UI to Getting Started Misc
2018-03-30 10:07:33 +02:00
Thibaut Girka
afa813d71f
Add basic domain block UI
2018-03-30 10:07:33 +02:00
Thibaut Girka
482ad7d7c4
Keep list of blocked domains
...
Might be overkill, but I'm trying to follow the same logic as for blocked users
2018-03-30 10:07:33 +02:00
Thibaut Girka
79da0ad7a2
Update all known users' domain_blocking relationship instead of just one's
2018-03-30 10:07:33 +02:00
Thibaut Girka
937ace10d9
Fix undefined URL in `fetchDomainBlocks`
2018-03-30 10:07:33 +02:00
David Yip
1bd12cf8eb
Merge pull request #404 from ThibG/glitch-soc/features/moved-note
...
[Untested] [Glitch] Profile redirect notes
2018-03-29 09:26:31 -05:00
Thibaut Girka
b5948044b3
[Glitch] Display unfollow button even if account moved
...
Backport 3987bd18a4
to glitch-soc
2018-03-29 14:59:20 +02:00
Thibaut Girka
a59c146bf8
[Glitch] Profile redirect notes
...
Port WebUI changes from 58cede4808
2018-03-29 14:59:20 +02:00
David Yip
4e45954280
Merge pull request #402 from ThibG/glitch-soc/fixes/accept-empty-toot-contents
...
Render toots with empty contents
2018-03-28 16:39:12 -05:00
David Yip
d37a79adce
Merge pull request #403 from ThibG/glitch-soc/fixes/attachment-lists-fixup
...
Fix attachment lists
2018-03-28 16:38:53 -05:00
Thibaut Girka
7db431eac6
Fix attachment lists
2018-03-28 22:19:36 +02:00
Thibaut Girka
53eab4470d
Render toots with empty contents
...
This is necessary to display toots with media but otherwise no contents,
as glitch-soc displays the media as a child of StatusContent, unlike
Mastodon.
2018-03-28 21:13:45 +02:00
David Yip
1ed9500b52
Merge pull request #400 from vulpineclub/dev-gs-392-frontmatter
...
Remove ignored 'u' parameter on regexp (#392 )
2018-03-27 13:06:28 -05:00
David Yip
d2cdc2b5a3
Merge remote-tracking branch 'origin/master' into gs-master
2018-03-27 10:44:12 -05:00
David Yip
49c957bc3b
Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master
2018-03-27 10:41:18 -05:00
Rey Tucker
21b586436e
Remove ignored 'u' parameter on regexp ( #392 )
2018-03-27 11:30:49 -04:00
David Yip
f61aa8e0f7
Merge remote-tracking branch 'origin/master' into gs-master
...
Conflicts:
app/javascript/styles/mastodon/components.scss
app/models/media_attachment.rb
2018-03-27 10:26:47 -05:00
David Yip
6af17b79c5
Merge pull request #399 from ThibG/glitch-soc/features/attachments-list
...
Port attachment lists to glitch-soc flavour
2018-03-27 10:20:52 -05:00
Thibaut Girka
88790b91de
[Glitch] Display AttachmentList in notifications
...
Port 77406d3a09
to glitch-soc
2018-03-27 16:09:33 +02:00
Thibaut Girka
3bc5452449
[Glitch] Display AttachmentList in timelines in compact style when media missing
...
Port 86a9de6753
to glitch-soc
2018-03-27 16:09:27 +02:00
Jenkins
db3be77890
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-03-26 11:17:19 +00:00
Jenkins
837b3804bf
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-03-25 15:17:21 +00:00
David Yip
995b59526b
Re-insert stack size fix in Dockerfile
2018-03-23 12:09:22 -05:00
David Yip
1772034ef2
Merge pull request #398 from ashkitten/compressed-notifs
...
make expanded notifications show like default
2018-03-23 11:57:12 -05:00
Jenkins
03b2f701e7
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-03-23 10:17:18 +00:00
Ash Levy
58eeb92755
expanded notifications show like default
2018-03-22 10:20:36 -04:00
David Yip
9c3e4bdead
Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master
2018-03-21 13:39:31 -05:00
Jenkins
6290cd7969
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-03-21 17:17:20 +00:00
Jenkins
e8aeec4fea
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-03-20 19:17:20 +00:00
David Yip
2649cce3a0
Merge pull request #396 from ThibG/glitch-soc/fixes/compose-suggestions
...
[Glitch] Cancel outdated pending compose suggestions
2018-03-20 10:48:33 -05:00
Thibaut Girka
12b0ea0667
[Glitch] Cancel outdated pending compose suggestions
...
Port 08f49bdb0d9ea03b1290bc1b6f1beaa37a6308e2 to the glitch flavour
2018-03-20 14:20:17 +01:00
David Yip
0fa0836e63
Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master
2018-03-19 15:41:59 -05:00
David Yip
c074b226b6
Merge pull request #394 from ashkitten/compressed-notifs
...
fix compressed notifications again (#393 )
2018-03-19 15:41:09 -05:00
Jenkins
df70571bfe
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-03-19 20:17:18 +00:00
Ash Lea
5b00b8f0da
fix .status__info__icons layout
2018-03-19 07:13:18 -04:00
David Yip
ab04be2f84
Merge remote-tracking branch 'origin/master' into gs-master
...
Conflicts:
config/i18n-tasks.yml
2018-03-18 20:21:17 -05:00
David Yip
6a6f680d98
Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master
2018-03-18 20:20:08 -05:00
David Yip
a387f99659
Merge pull request #388 from ThibG/glitch-soc/federated-pinned-toots
...
Port WebUI toots/with reply/media tabs and pinned toots to glitch
2018-03-18 20:17:15 -05:00
Ash Levy
c68c1466ac
fix compressed notifications again ( #393 )
2018-03-18 13:42:28 -04:00
Jenkins
f2a9a13b32
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-03-18 16:17:15 +00:00
Jenkins
9341b982b6
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-03-17 17:17:21 +00:00
David Yip
fe17446af0
Merge pull request #391 from ashkitten/compressed-notifs
...
fix non-notification boosts for compressed notifications
2018-03-16 18:15:59 -05:00
Ash Levy
33d5fe889a
fix non-notification boosts
2018-03-16 18:36:35 -04:00
Thibaut Girka
6f0e50f9a0
[Glitch] Federate pinned statuses over ActivityPub
...
Port 9110db41c5
to glitch
2018-03-16 23:16:20 +01:00
Thibaut Girka
cd73af3bd0
[Glitch] Improve style of web UI account tabs
...
Port of 38b9af76a2
to glitch
2018-03-16 23:16:20 +01:00
Thibaut Girka
f00af46d70
[Glitch] Add "Toots/Toots with replies/Media" tab below profile header
...
Port 5131012505
to glitch
2018-03-16 23:16:20 +01:00
David Yip
50f56ba375
Merge pull request #385 from ThibG/glitch-soc/features/port-reports-ui-changes
...
Port reports ui changes to glitch-soc flavour
2018-03-16 17:13:09 -05:00
David Yip
8383f777fb
Merge pull request #389 from ThibG/glitch-soc/error-500
...
Fix error 500 page
2018-03-16 16:51:19 -05:00
David Yip
a3c86d8cb9
Merge pull request #386 from ashkitten/compressed-notifs
...
compress boost/fave notifications more
2018-03-16 16:35:15 -05:00
Thibaut Girka
cf754e6a91
Fix error 500 page
2018-03-16 22:31:20 +01:00
Thibaut Girka
9c40a5f3c8
Fix toot text color in the report modal
2018-03-16 15:27:13 +01:00
Thibaut Girka
19f7bd1582
Show media on report UI
...
Ports 219aac7800
to glitch-soc
2018-03-16 15:27:13 +01:00
Thibaut Girka
22870985da
Add close modal icon to report dialog ( #6591 )
...
Port 379cdfaac5
to glitch-soc flavour
2018-03-16 15:27:13 +01:00
Thibaut Girka
9cf574d0d2
Port federated reports UI to glitchsoc
...
Port 41a01bec23
to glitch-soc
2018-03-16 15:27:13 +01:00
Jenkins
d75a6054a0
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-03-13 18:17:20 +00:00
Ash Levy
9317f6853e
compress boost/fave notifications more
2018-03-13 13:54:57 -04:00
David Yip
f8e934f955
Merge remote-tracking branch 'origin/master' into merge-upstream
...
Conflicts:
README.md
2018-03-12 17:52:19 -05:00
Gô Shoemake
22f2750578
Merge pull request #384 from ThibG/glitch-soc/features/no-media-url
...
Remove text requirement when media attached from statuses (fixes #381 )
2018-03-12 13:09:42 -07:00
Gô Shoemake
2395a4c313
Merge pull request #344 from chriswmartin/getting-started-badge-merge
...
merge tootsuite pr #6313 into glitch & move getting_started dispatch stuff to mapDispatchToProps
2018-03-12 13:07:59 -07:00
Thibaut Girka
841ef606a9
Remove text requirement when media attached from statuses ( fixes #381 )
...
Ports cfa9b6e13a
to glitchsoc
2018-03-12 18:39:07 +01:00
Jenkins
a0724cd742
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-03-11 09:17:21 +00:00
David Yip
0c2a16fcbf
Merge pull request #379 from ThibG/glitch-soc/features/improved-account-header
...
Port #6627 and #6636 to glitch-soc flavour
2018-03-10 23:35:16 -06:00
Jenkins
e553905ba7
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-03-09 12:17:22 +00:00
Thibaut Girka
25c5223617
Port #6627 and #6636 to glitch-soc
2018-03-09 12:10:22 +01:00
Jenkins
447d7e6127
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-03-09 00:17:17 +00:00
beatrix
43a9a781a4
Merge pull request #377 from glitch-soc/merge-upstream
...
hhhhhhhhhnnnnnnnnnnnghh!!!!!
2018-03-03 13:40:00 -05:00
David Yip
65e2a4645e
Use glitchsoc TimelineComponent's margin/padding on about page.
2018-03-03 11:16:10 -06:00
David Yip
6176e278f4
Copy in new CSS for about page.
2018-03-03 11:01:24 -06:00
David Yip
1b8fcd4df5
Merge remote-tracking branch 'origin/master' into merge-upstream
...
Conflicts:
README.md
app/controllers/follower_accounts_controller.rb
app/controllers/following_accounts_controller.rb
app/serializers/rest/instance_serializer.rb
app/views/stream_entries/_simple_status.html.haml
config/locales/simple_form.ja.yml
2018-03-02 21:46:44 -06:00
David Yip
ee00da01d2
Merge pull request #372 from KnzkDev/fix/ja-translation
...
Add missing Japanese translate
2018-02-26 11:38:53 -06:00
David Yip
d8e964456c
Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master
2018-02-26 11:35:34 -06:00
imncls
041df1a5a7
i18n normalize data
2018-02-26 12:53:02 +09:00
imncls
e591b3fe38
Add missing Japanese translate
2018-02-26 11:12:55 +09:00
David Yip
a3c794d5d6
Merge pull request #370 from KnzkDev/fix/border-radius
...
Fix border-radius of owner avatar in /about/more
2018-02-25 16:41:47 -06:00
yuzulabo
43cc79aaa0
Fix border-radius of owner avatar in /about/more
2018-02-25 23:27:32 +09:00
Jenkins
2edf7128f2
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-02-24 05:17:10 +00:00
David Yip
f53953d28a
Merge pull request #369 from KnzkDev/merge-upstream
...
Merge with upstream @ e668180044
2018-02-23 15:05:00 -06:00
imncls
f2f19e1f8a
Update SCSS
2018-02-24 03:22:58 +09:00
imncls
7bff3243ae
Update columns.scss
2018-02-24 01:45:15 +09:00
imncls
ef1d46948a
Update containers.scss
2018-02-24 01:26:48 +09:00
imncls
82408904a1
Update index.scss
2018-02-24 01:25:49 +09:00
imncls
3afc6174f5
Fix data export page error
2018-02-24 00:29:26 +09:00
imncls
fa3641df7f
Update about.scss
2018-02-24 00:22:05 +09:00
imncls
697f289597
Use absolute URL for focus reticle
2018-02-23 23:50:25 +09:00
imncls
bb6988a7ac
Merge branch 'master' of https://github.com/tootsuite/mastodon
...
# Conflicts:
# app/controllers/settings/exports_controller.rb
# app/models/media_attachment.rb
# app/models/status.rb
# app/views/about/show.html.haml
# docker_entrypoint.sh
# spec/views/about/show.html.haml_spec.rb
2018-02-23 23:28:31 +09:00
Jenkins
544543e40a
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-02-20 16:17:11 +00:00
Jenkins
1445ba1703
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-02-19 15:17:14 +00:00
David Yip
3d033a4687
Merge remote-tracking branch 'tootsuite/master' into merge-upstream
...
Conflicts:
Gemfile
config/locales/simple_form.pl.yml
2018-02-17 00:02:37 -06:00
Jenkins
e9052ceaaf
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-02-11 23:17:11 +00:00
Jenkins
5ffa6f0fa1
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-02-11 18:17:11 +00:00
Jenkins
efc9ffcb80
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-02-11 04:10:16 +00:00
David Yip
b6159bcb0a
Merge remote-tracking branch 'origin/merge-upstream'
2018-02-10 22:08:45 -06:00
beatrix
136458eaf4
Merge pull request #362 from ThibG/glitch-soc/fix-notifications-clearing
...
Revert 245816ab27
(fixes #348 )
2018-02-10 21:47:27 -05:00
beatrix
20b519f0fc
Merge pull request #236 from glitch-soc/plaintext-mutes
...
Make keyword mutes operate on plain text input
2018-02-10 21:46:19 -05:00
David Yip
380989def8
Remove NOKOGIRI_USE_SYSTEM_LIBRARIES from Travis. #236 .
...
Nokogiri linked to the version of libxml2 shipped in Travis' Trusty
image exhibits incorrect behavior when parsing strings resembling
<p>I <3 oats</p>
In particular, Html2Text.convert (which uses nokogiri) will return "I"
for the above string when it ought to return "I <3 oats".
The version of libxml2 shipped with nokogiri 1.8.1+ exhibits correct
parse behavior for this string, as does the libxml2 present in Ubuntu
Xenial.
2018-02-10 19:29:17 -06:00
Thibaut Girka
fb6f131fa1
Revert 245816ab27
( fixes #348 )
...
Since 245816ab27
, IntersectionObserverArticle
assumes that its children do not change unless the number of children changes.
This is not the case with the notification overlay, which resulted in the
checkmark of notification cleaning mode not updating unless scrolling to make
notifications appear/disappear.
This change may negatively impact performances.
2018-02-10 20:59:50 +01:00
David Yip
f1f67c46c5
Use Html2Text to generate plaintext for keyword mutes. #236 .
...
This allows us to match URLs inside link hrefs.
2018-02-10 10:36:16 -06:00
David Yip
9105b0c954
Introduce html2text for extracting plaintext from statuses. #236 .
...
Unlike strip_tags, html2text will preserve text present in other nodes,
e.g. anchor tags:
[1] pry(main)> str = '<a href="http://www.example.com ">A link</a>'
=> "<a href=\"http://www.example.com \">A link</a>"
[2] pry(main)> Html2Text.convert(str)
=> "[A link](http://www.example.com )"
[3] pry(main)> include ActionView::Helpers::SanitizeHelper
=> Object
[4] pry(main)> strip_tags(str)
=> "A link"
Preserving the href of an anchor allows keyword mutes to also match on
URLs, which is something that the frontend regex filter can currently
do.
2018-02-10 10:36:16 -06:00
David Yip
53c86b29f0
Glitch::FilterHelper -> Glitch::KeywordMuteHelper. #234 .
...
The class helps out with keyword mutes, not just some general concept of
"filtering".
2018-02-10 10:36:15 -06:00
David Yip
d263e3bc2d
Fill out some examples for Glitch::FilterHelper. #234 .
...
Also add HTML entity decoding to Glitch::FilterHelper, which is needed
to e.g. match "<" to the tag-stripped version of "<p><3</p>" or
"<p><3</p>".
2018-02-10 02:40:27 -06:00
David Yip
29b5b46c87
Strip HTML from keyword mute input. #234 .
2018-02-10 02:40:27 -06:00
David Yip
b8efc3fc0b
Normalize simple_form.en.yml.
2018-02-09 09:41:57 -06:00
David Yip
020b40efdb
Merge remote-tracking branch 'origin/master' into merge-upstream
...
Conflicts:
.travis.yml
app/lib/user_settings_decorator.rb
app/models/user.rb
app/serializers/initial_state_serializer.rb
app/views/stream_entries/_detailed_status.html.haml
app/views/stream_entries/_simple_status.html.haml
config/locales/simple_form.en.yml
2018-02-09 09:25:53 -06:00
Jenkins
5ba2c300d8
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-02-08 23:17:14 +00:00
Jenkins
3405ea6dd9
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-02-05 02:17:12 +00:00
David Yip
e815d6803d
db/schema.rb: resolve erroneously-unresolved conflict
2018-02-04 17:04:22 -06:00
David Yip
a6fb1c58ee
Merge remote-tracking branch 'origin/master' into merge-upstream
...
Conflicts:
.env.production.sample
app/controllers/auth/confirmations_controller.rb
db/schema.rb
2018-02-04 16:36:19 -06:00
Jenkins
530fcc1c14
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-02-04 03:17:11 +00:00
David Yip
c14f59c542
Merge pull request #357 from KnzkDev/fix/detail-style
...
Fix detailed-status
2018-02-03 20:20:58 -06:00
ncls7615
15a5b3372a
Fix detailed-status
2018-02-04 10:35:09 +09:00
beatrix
fa361ccc5e
change referrer policy to same-origin
2018-02-03 14:49:00 -05:00
David Yip
4c1fd9a19c
Merge remote-tracking branch 'tootsuite/master' into merge-upstream
...
Conflicts:
app/javascript/styles/mastodon/components.scss
2018-02-02 08:39:52 -06:00
Jenkins
ad3a2dfb66
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-01-31 23:17:13 +00:00
David Yip
f4b2478af1
Merge remote-tracking branch 'origin/master' into merge-upstream
...
Conflicts:
app/views/layouts/mailer.html.haml
config/locales/ko.yml
2018-01-28 22:45:17 -06:00
David Yip
00ce2be148
Merge remote-tracking branch 'origin/master' into gs-master
...
Conflicts:
.travis.yml
2018-01-24 23:10:19 -06:00
Jenkins
0e10667fbe
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-01-24 19:17:11 +00:00
David Yip
1b4d79acf8
Merge pull request #346 from KnzkDev/fix/travis
...
Fix travis.yml
2018-01-24 13:09:13 -06:00
beatrix
5a4de1cf0f
Merge pull request #349 from codl/patch-1
...
remove escapes from server-side ɣaml handler
2018-01-24 08:56:38 -05:00
codl
9abb5becf4
remove escapes from server-side γaml handler
...
this matches a change that was made in the client-side equivalent
2018-01-24 14:23:25 +01:00
David Yip
c53d7196e6
Merge pull request #334 from ThibG/glitch-soc/cleanup-leftover-code
...
Remove some leftover code
2018-01-23 10:27:13 -06:00
Thibaut Girka
2107891edb
Remove some leftover code, I guess
2018-01-23 09:20:18 +01:00
cwm
0ddeed9377
add 'this.props' to fetchLists
2018-01-23 01:23:56 -06:00
ncls7615
16d5f9e162
Fix travis.yml
2018-01-23 15:50:59 +09:00
cwm
939075899e
remove unused openOnboardingModal from getting_started
2018-01-22 19:38:34 -06:00
cwm
00be9eb3fe
merge tootsuite pr #6313 into glitch
2018-01-22 19:05:13 -06:00
David Yip
a90d0419d9
Merge pull request #343 from glitch-soc/merge-upstream-20180121
...
Merge upstream
2018-01-21 18:00:08 -06:00
David Yip
48d79007f6
Merge remote-tracking branch 'origin/master' into merge-upstream-20180121
2018-01-21 16:26:50 -06:00
David Yip
81b78fac54
Update Vagrantfile to ubuntu/xenial64.
...
The version of Redis that ships with Ubuntu Trusty is too old to support
the HyperLogLog commands. I guess we could add a custom apt repo for
this, but it seems a lot easier to just use the latest Ubuntu LTS
release (i.e. xenial), which has a recent-enough Redis in its archives.
2018-01-21 16:09:40 -06:00
David Yip
1253279feb
Merge remote-tracking branch 'origin/master' into merge-upstream
...
Conflicts:
app/controllers/settings/two_factor_authentication/confirmations_controller.rb
2018-01-21 13:36:10 -06:00
David Yip
2c578a01d8
Merge remote-tracking branch 'origin/master' into gs-master
2018-01-20 16:42:57 -06:00
David Yip
e7a0840f8c
Merge pull request #336 from ThibG/glitch-soc/features/tag-warning
...
Display a warning when composing unlisted toots with something looking like a hashtag
2018-01-20 16:37:52 -06:00
David Yip
24b6e4121f
Merge pull request #342 from glitch-soc/merge-upstream
...
Merge upstream
2018-01-20 16:37:35 -06:00
David Yip
3cae362214
Merge new onboarding styles; delete refs to PNGs.
2018-01-20 11:23:06 -06:00
David Yip
38f6d8130d
Eliminate stray conflict markers.
2018-01-20 10:46:43 -06:00
David Yip
071c2c9c85
Merge remote-tracking branch 'origin/master' into merge-upstream
...
Conflicts:
app/javascript/styles/mastodon/components.scss
2018-01-20 10:45:43 -06:00
David Yip
2ca965c704
Merge remote-tracking branch 'origin/master' into merge-upstream
...
Conflicts:
app/javascript/styles/mastodon/components.scss
app/javascript/styles/mastodon/modal.scss
2018-01-19 15:22:10 -06:00
David Yip
b8c6656ce9
Merge pull request #339 from ThibG/glitch-soc/features/timeline-tweaks
...
Do not discard statuses obtained via websocket when API request finishes
2018-01-19 15:17:20 -06:00
Thibaut Girka
1619efd735
Do not discard statuses obtained via websocket when API request finishes
...
This backports 0b888acfd4
2018-01-19 21:59:12 +01:00
Thibaut Girka
1287b2782b
Display a warning when composing unlisted toots with something looking like a hashtag
...
This is a backport of b6af88192f
to the glitch flavour.
2018-01-19 12:59:33 +01:00
David Yip
2b2de41bc7
Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master
2018-01-18 23:40:37 -06:00
David Yip
26ecee79bf
Merge pull request #332 from glitch-soc/merge-upstream
...
Merge in home feed regeneration changes from upstream
2018-01-18 22:00:11 -06:00
David Yip
ae369bceb3
Merge pull request #333 from glitch-soc/win95-update
...
Update win95 theme from cybrespace/mastodon
2018-01-18 13:35:24 -06:00
David Yip
766d6aac44
Strip trailing whitespace on win95.scss
2018-01-18 10:54:50 -06:00
David Yip
d3f64812a6
Merge remote-tracking branch 'cybrespace/theme_win95' into win95-update
...
Conflicts:
app/javascript/styles/win95.scss
config/themes.yml
2018-01-18 10:54:12 -06:00
David Yip
3896cd5d79
Use absolute paths for new working/not-found SVGs
...
This allows these component styles to be used in i.e. the win95 skin.
2018-01-18 10:25:54 -06:00
David Yip
bcd86404da
Port 7badad7797
to glitch frontend
2018-01-18 10:25:37 -06:00
David Yip
1964a0f941
Merge remote-tracking branch 'origin/master' into merge-upstream
2018-01-18 09:17:58 -06:00
David Yip
e27eedbd08
Merge branch 'gs-master' into merge-upstream
2018-01-18 09:14:28 -06:00
David Yip
708ec07e27
Style fixes to make eslint happier, hopefully
2018-01-18 09:13:07 -06:00
David Yip
201e82686f
Merge remote-tracking branch 'origin/master' into merge-upstream
...
Conflicts:
app/javascript/styles/mastodon/components.scss
2018-01-17 18:37:09 -06:00
Jenkins
fe5c1f0803
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-01-17 22:17:14 +00:00
Jenkins
aa2bf07281
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-01-17 16:17:10 +00:00
kibi!
60ff086960
Fixed improper mailer import
2018-01-15 21:23:26 -08:00
kibi!
cda845ae0e
Fix mailer to use webpack core
2018-01-15 21:17:03 -08:00
David Yip
89a9d629f7
Merge remote-tracking branch 'origin/master' into gs-master
...
Conflicts:
Gemfile.lock
2018-01-15 22:17:48 -06:00
Jenkins
0c7dc6c781
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-01-15 06:17:15 +00:00
kibi!
8ee6ed358f
Increase priority of favstar gold
2018-01-14 16:05:44 -08:00
kibi!
1ee0e91fb6
Fixes to notification styling
2018-01-14 15:48:54 -08:00
kibi!
b9f4896830
Fixes to drawer and CWs
2018-01-14 15:31:00 -08:00
beatrix
cd6674606f
Merge pull request #329 from KnzkDev/scss-refactor
...
SCSS Refactor
2018-01-14 17:48:02 -05:00
beatrix
39f231f3da
Merge pull request #328 from glitch-soc/feature/glitchy-elephant-friend
...
Add glitchy elephant friend
2018-01-14 17:40:27 -05:00
kibi!
0fb3bd09e9
Oops this should have been a part of last commit
2018-01-14 14:21:41 -08:00
kibi!
1fa03e026a
Fixes onboarding modal ( #318 )
2018-01-14 14:13:24 -08:00
kibi!
a5931e1f48
Fixed autocollapse detection
2018-01-14 13:29:51 -08:00
David Yip
c2669f93d0
Fix eslint errors. #294 .
2018-01-14 05:56:43 -06:00
David Yip
756a9cd139
Run slightly less afoul of accessibility checks. #294 .
...
This makes the clickable element an interactive element, but doesn't add
alt text and makes it not-obvious that you can click the elefriend. On
one hand, this goes against good practice; on the other hand, it's not
*supposed* to be obvious that you can click the elefriend.
2018-01-14 05:07:08 -06:00
David Yip
e64cc311dd
Introduce a bit of luck into the elefriend selection. #294 .
2018-01-14 04:46:21 -06:00
David Yip
53cbc9933e
Add wave background; blend elefriend in a bit more. #294 .
2018-01-14 04:00:21 -06:00
David Yip
cd1377de7f
Bind click event to elefriend cycling. #294 .
2018-01-14 03:35:25 -06:00
David Yip
1dbb6b5e08
Set glitchy elephant friend variant in initial state. #294 .
...
Also lay some groundwork needed to interactively change the
glitchfriend.
The codebase uses "elefriend" because it's shorter and didn't require me
to realign the actions in actions/compose.js. Same idea, though.
2018-01-14 03:06:11 -06:00
David Yip
1e0b707018
Add the shrinking glitchy elefriend. #294 .
2018-01-13 21:27:39 -06:00
David Yip
835eec8a4c
Prototype out glitchy elephant friend. #294 .
...
Glitched elephant friends kindly provided by @ncls7615.
2018-01-13 21:27:14 -06:00
ncls7615
f9b08e2142
Fix collapsed toot style
2018-01-14 11:13:55 +09:00
ncls7615
1ebe66b78c
Fix un-fullwidth media style
2018-01-14 11:07:32 +09:00
ncls7615
be2bac05aa
Fix media detailed style
2018-01-14 10:38:51 +09:00
ncls7615
b5476f6c75
Fix confirmation modal bug
2018-01-14 09:51:01 +09:00
ncls7615
bc0524834e
Fix letterbox bug
2018-01-14 09:25:35 +09:00
ncls7615
6ecf81cacf
Improve scss refactor 5
2018-01-14 09:17:38 +09:00
ncls7615
64425dbb77
Improve scss refactor 4
2018-01-14 09:12:10 +09:00
ncls7615
a16d885ac9
Improve scss refactor 3
2018-01-14 08:47:59 +09:00
ncls7615
5f35b39f6f
Improve scss refactor 2
2018-01-14 07:48:18 +09:00
ncls7615
bb2ca23839
Improve scss refactor 1
2018-01-14 07:18:50 +09:00
ncls7615
a9be680807
Fix padded-blocks error
2018-01-14 04:12:41 +09:00
ncls7615
6a73c8c8a2
Initial scss refactor
2018-01-14 03:41:20 +09:00
beatrix
9526aababc
Merge pull request #324 from glitch-soc/load-public-on-admin
...
Load public javascripts on admin pages
2018-01-12 23:52:41 -05:00
Gô Shoemake
3a0b47982d
load public.js on vanilla#admin
2018-01-12 18:52:53 -08:00
Gô Shoemake
9b9b7fa005
Load packs/public.js for glitch#admin
2018-01-12 18:51:52 -08:00
David Yip
0210e59759
Merge remote-tracking branch 'remotes/origin/fix-column-headers-accessibility'
2018-01-12 20:10:58 -06:00
beatrix
4773481a90
Merge pull request #322 from m4sk1n/glitch-soc-pl
...
i18n: Update Polish translation
2018-01-12 18:16:31 -05:00
Marcin Mikołajczak
ee7217bc94
i18n: Update Polish translation
...
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2018-01-12 23:08:51 +01:00
David Yip
e2ce628724
Merge pull request #321 from KnzkDev/fix/dropdown-text
...
Fix dropdown item text
2018-01-12 09:09:10 -06:00
ncls7615
cf5789146b
Fix dropdown text
2018-01-12 23:18:25 +09:00
Jenkins
9fa79bc317
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-01-12 02:17:15 +00:00
David Yip
8c08c852bc
Merge pull request #320 from glitch-soc/dockerfile-stack-space
...
dockerfile: Give more stack space to /sbin/tini
2018-01-11 04:25:26 -06:00
David Yip
f13ebd02c9
dockerfile: Give more stack space to /sbin/tini.
...
/sbin/tini ends up running the Sass compiler, which seems to need a
larger thread stack size than the musl default. This patch incorporates
a fix from
https://raw.githubusercontent.com/jubel-han/dockerfiles/master/common/stack-fix.c ,
as described in https://github.com/sass/node-sass/issues/2031 .
2018-01-11 04:09:16 -06:00
David Yip
26f054253c
Merge pull request #319 from glitch-soc/317-attempt-to-switch-flavors-raises-actioncontroller-parametermissing
...
Fix #317 : Attempting to switch flavors raises ActionController::ParameterMissing
2018-01-10 12:49:43 -06:00
David Yip
395e64e858
Thank you, Officer Murphy
2018-01-10 12:10:43 -06:00
David Yip
514db316f7
The flavour parameter is unused, so omit it ( #317 )
2018-01-10 12:09:42 -06:00
David Yip
6fcb870d96
Allow for user object to be empty. Fixes #317 .
...
If a flavour has only one skin, the skin selector will be omitted. This
omits the user[setting_skin] field, and because that's the only
user[...] field on the page, the entire user object will not be present
in the request handler's params object.
This commit accounts for that scenario by avoiding params.require(:user)
and instead picking out what we need from the params hash.
2018-01-10 12:09:42 -06:00
David Yip
3ce1385b25
Add examples based on errors seen in #317
2018-01-10 12:09:41 -06:00
David Yip
095a00ef3d
Merge pull request #316 from glitch-soc/fix-async
...
Fix glitch async chunks
2018-01-09 18:30:45 -06:00
kibigo!
35be02f21d
Renamed glitch async chunks
2018-01-09 16:26:14 -08:00
David Yip
622c8fdb75
Merge pull request #314 from chriswmartin/merge-vanilla-updates-2
...
Merge vanilla updates into glitch - round 2
2018-01-09 17:01:23 -06:00
David Yip
991371af5f
Merge remote-tracking branch 'origin/master' into merge-upstream
...
Conflicts:
db/schema.rb
2018-01-09 14:16:45 -06:00
cwm
aef4b1af66
Refactor /api/web APIs to use the centralized axios instance (tootsuite pr #6223 )
2018-01-09 10:51:14 -06:00
cwm
f43c2f12f3
Fix overflowing audit logs (tootsuite pr #6184 )
2018-01-09 10:40:14 -06:00
cwm
9bdbe66316
Set background to the navigation of Getting Started column (tootsuite pr #6163 )
2018-01-09 10:37:27 -06:00
cwm
b535f24fe5
Use const instead of let for constant (tootsuite pr #6106 )
2018-01-09 10:35:36 -06:00
cwm
0d4dcb5fb2
change key to path in timeline settings containers
2018-01-09 09:58:40 -06:00
cwm
6d1c325167
Rename key to path in actions and reducers for settings (tootsuite pr #6105 )
2018-01-09 09:48:14 -06:00
cwm
7f4374d97d
Fix newlines-to-spaces functionality (tootsuite pr #6158 )
2018-01-09 08:52:14 -06:00
cwm
8a0e4bb9a4
Hide moved account's follow button in search result (tootsuite pr #5913 )
2018-01-09 08:50:55 -06:00
cwm
5963630c63
Prevent duplicate load of favourites (tootsuite pr #5931 )
2018-01-09 08:46:35 -06:00
Jenkins
e780d5951b
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-01-09 12:17:16 +00:00
David Yip
ce7f4aef16
Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master
2018-01-08 23:20:39 -06:00
David Yip
ec0bdd6c1a
Merge pull request #312 from glitch-soc/tag-sensitive-imgs
...
Show SENSITIVE tag on sensitive images (#267 )
2018-01-08 23:19:14 -06:00
David Yip
df04da098a
Merge pull request #311 from glitch-soc/dont-show-solo-skins
...
Don't show skins selector when there's only one (#256 )
2018-01-08 23:18:30 -06:00
Jenkins
7c719c567c
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-01-09 05:17:13 +00:00
David Yip
488381ae2f
Merge pull request #310 from glitch-soc/fix-thread-inheritance
...
Threads now inherit privacy directly (#309 )
2018-01-08 23:15:58 -06:00
kibigo!
60433d03f5
Add missing comma
2018-01-08 18:38:28 -08:00
kibigo!
5d2ef7a616
Show SENSITIVE tag on sensitive images ( #267 )
2018-01-08 18:25:29 -08:00
kibigo!
44792de49a
Don't show skins selector when there's only one ( #256 )
2018-01-08 16:45:32 -08:00
kibigo!
824a790e63
Threads now inherit privacy directly ( #309 )
2018-01-08 16:35:01 -08:00
Andrew
fe6663ef50
Minor style fixes
2018-01-08 11:49:08 -08:00
beatrix
90e568413b
Merge pull request #308 from KnzkDev/fix/list-editor
...
Fix list editor design
2018-01-08 13:08:11 -05:00
ncls7615
ef0b7d1e76
fix list editor scss
2018-01-09 02:50:24 +09:00
David Yip
65986b6f0b
Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master
2018-01-08 09:48:42 -06:00
David Yip
2dc4fbbd1a
When pulling out max_toot_chars, handle nulls
...
flavours/glitch/util/initial_state is used in places where we want to
exhibit different behavior based on user preferences. This means that
it's used in places where no preference is defined, i.e. on an
unauthenticated access. All values exported from that module must
therefore expect that case; previously, the max chars value didn't.
Addresses #306 .
2018-01-08 09:45:59 -06:00
Jenkins
f839ac694c
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-01-08 10:17:15 +00:00
Jenkins
722b3f567f
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-01-08 04:17:11 +00:00
David Yip
f7c4d4464b
Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master
2018-01-07 13:30:52 -06:00
David Yip
70c99a9f34
Use error pack when rendering error pages. Fixes #305 .
2018-01-07 13:30:17 -06:00
Jenkins
c2e1bfd9ae
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-01-07 15:17:13 +00:00
David Yip
5083311d64
Merge remote-tracking branch 'ykzts/fix-unintended-cache' into gs-master
2018-01-07 00:32:24 -06:00
Yamagishi Kazutoshi
2af307bce4
Fix unintended cache
2018-01-07 14:59:12 +09:00
Andrew
56312df73b
Z indexes and colors
2018-01-06 18:38:19 -08:00
Andrew
7a93acd803
To 2.1.2
2018-01-06 18:25:19 -08:00
Jenkins
bcbdd4f88d
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-01-07 02:17:10 +00:00
kibigo!
b5874c1428
Fixes to search dropdown
2018-01-06 15:34:01 -08:00
beatrix
61ef8d643e
fix typo in vanilla names.yml
2018-01-06 16:49:53 -05:00
Ondřej Hruška
9f29fd31ba
fixed ctrl enter
2018-01-06 19:58:04 +01:00
Ondřej Hruška
53caab0c0b
Fix the always-threaded bug
2018-01-06 19:55:53 +01:00
beatrix-bitrot
b75a1ce326
tighten csp
2018-01-06 18:49:03 +00:00
beatrix
d442cfa65c
Merge pull request #303 from KnzkDev/ja-for-thread-mode
...
Update ja.js for #296
2018-01-06 12:06:17 -05:00
ncls7615
f5a4201ad8
Update ja.js
2018-01-07 01:51:49 +09:00
beatrix
a251c42192
Merge pull request #296 from glitch-soc/thread-mode
...
Threaded mode~
2018-01-06 11:28:36 -05:00
beatrix
2ec9a75a1d
Merge pull request #302 from KnzkDev/fix/search-popout
...
Fix search popout
2018-01-06 11:25:59 -05:00
beatrix
fa92e88fb2
appease eslint
2018-01-06 10:30:49 -05:00
ncls7615
da98c33161
Fix search popout
2018-01-06 21:50:11 +09:00
David Yip
2eed4ace11
Read max_toot_chars from root object. Fixes #297 .
...
max_toot_chars is present in the root of the initial state object.
(Previously, we were trying to read it from the meta child object.)
2018-01-06 03:01:11 -06:00
kibigo!
c71d848855
my global .gitignore excluded this file ;_;
2018-01-05 21:40:02 -08:00
kibigo!
e4bc013d6f
Threaded mode~
2018-01-05 21:16:43 -08:00
kibigo!
6932b464e6
Fixed improper dropdown func binding for #293 + toot button spacing
2018-01-05 21:02:53 -08:00
kibigo!
ad10a80a99
Styling and autosuggest fixes for #293
2018-01-05 20:43:16 -08:00
kibigo!
8bf9d9362a
Fixes composer mounting issue with #293
2018-01-05 18:30:06 -08:00
Andrew
077f2e600c
Win95 to 2.1
2018-01-05 16:22:58 -08:00
Andrew
39c0b6ceb3
Updates and fixes to win95 theme
2018-01-05 16:22:58 -08:00
Andrew
ed574fbc09
Theme: Windows 95
2018-01-05 16:22:58 -08:00
David Yip
03aeab857f
Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master
2018-01-05 17:31:56 -06:00
beatrix
f441770e50
Merge pull request #290 from chriswmartin/web-push-updates
...
Web push updates
2018-01-05 18:29:57 -05:00
beatrix
b4e667f86b
Merge pull request #295 from chriswmartin/getting-started-key-fix
...
unique ColumnLink keys in getting_started
2018-01-05 18:29:40 -05:00
beatrix
faf20eeaa4
Merge pull request #293 from glitch-soc/compose-refactor
...
Compose refactor
2018-01-05 18:29:08 -05:00
Jenkins
f6adb409fd
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-01-05 22:17:12 +00:00
kibigo!
ac686d5a5d
Fixed overflow issue
2018-01-05 13:34:21 -08:00
kibigo!
ec620ae486
Styling fixes
2018-01-05 12:41:15 -08:00
beatrix
f41b33eb01
Merge pull request #243 from m4sk1n/glitch-pl
...
i18n: 🇵🇱
2018-01-05 12:36:53 -05:00
cwm
9fc08e4861
add key to lists div
2018-01-05 09:00:48 -06:00
cwm
6236577734
change how list ColumnLink keys are determined
2018-01-05 08:12:34 -06:00
kibigo!
d7ce339c2e
WIP <Compose> Refactor; Fin~
2018-01-04 21:17:30 -08:00
kibigo!
42f50049ff
WIP <Compose> Refactor; 1000 tiny edits
2018-01-04 18:33:13 -08:00
kibigo!
b4a3792201
WIP <Compose> Refactor; <ActionsModal>; dropdowns
2018-01-04 18:31:00 -08:00
kibigo!
083170bec7
WIP <Compose> Refactor; SCSS ed.
2018-01-04 18:23:46 -08:00
kibigo!
8713659dff
WIP <Compose> Refactor; <OnboardingModal> ed.
2018-01-04 18:21:59 -08:00
kibigo!
3c29f57404
WIP <Compose> Refactor; <Drawer> ed.
2018-01-04 18:21:59 -08:00
kibigo!
924ffe81d4
WIPgit status <Compose> Refactor; <Composer> ed.
2018-01-04 18:21:59 -08:00
Jenkins
c69a23ae46
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-01-04 23:17:11 +00:00
Nolan Darilek
3b016342c6
Fix accessibility of column headers
...
As a screen reader user new to Mastodon, I encountered the following issues with the column headers as designed:
* Jumping between them was difficult. FOr instance, passing my home timeline to reach notification settings was difficult to impossible, especially considering infinite scrolling.
* There doesn't appear to be any means for triggering the control via the keyboard. the `titleClick` handler only responds to mouse clicks.
* I didn't even realize there was a Settings toggle until I made this change.
Thanks for using ARIA in your designs. It's a huge help. But adding a `button` role doesn't add keyboard handling and other button behavior. Also, because the role was on the heading container, it obscured the controls within the container itself. This fix resolve that. It also exposes the headings as headings rather than buttons, enabling skipping columns by using screen readers' heading navigation commands.
Since I myself am blind, if this fix requires additional visual styling, I'd like help applying that so it can be merged. I'd consider it an essential accessibility fix for my and other blind users' existence on the platform. Thanks!
2018-01-04 10:25:26 -06:00
Marcin Mikołajczak
0f69a90588
i18n: Update Polish translation
...
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2018-01-04 14:42:58 +01:00
Jenkins
fc884d015a
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-01-03 20:17:13 +00:00
Jenkins
933840bebf
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-01-03 04:17:11 +00:00
David Yip
fa768abf5c
More ../ -> ~.
2018-01-02 00:26:44 -06:00
David Yip
54148b9a4a
Merge remote-tracking branch 'origin/master' into merge-upstream
...
Conflicts:
app/controllers/authorize_follows_controller.rb
app/javascript/styles/mastodon/components.scss
2018-01-02 00:11:41 -06:00
cwm
72b99f6ee4
bug fix (tootsuite pr #6120 )
2017-12-31 08:26:50 -06:00
Jenkins
fa9b7ece2e
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-12-31 09:17:15 +00:00
David Yip
d817c0a958
Merge pull request #291 from glitch-soc/merge-upstream
...
Merge with upstream @ f4b80e6511
2017-12-30 18:24:38 -06:00
David Yip
4cca1d1e7e
Merge remote-tracking branch 'origin/master' into merge-upstream
...
Conflicts:
app/controllers/auth/confirmations_controller.rb
2017-12-30 17:20:07 -06:00
David Yip
e4944d065b
Switch to tootsuite's elephant friend for the drawer
...
This version has a transparent background, which works better with the
wave.
2017-12-30 17:17:37 -06:00
David Yip
513d982f29
Use ~ notation in components for image references
...
This uses (more or less) absolute references to external assets, which
allows imported stylesheets (like components.scss) to work from other
locations that may not have the expected path structure (e.g. the win95
theme).
2017-12-30 17:15:20 -06:00
cwm
4ce44ba470
remove unused 'saveSettings' from column_settings_container
2017-12-30 16:42:26 -06:00
cwm
0dce26b82b
web push updates (tootsuite PRs #5879 , #5941 , #6047 )
2017-12-30 11:45:01 -06:00
David Yip
65c87ca0ae
Merge pull request #288 from chriswmartin/fix-gif-avatars
...
Fix GIF avatars not autoplaying when gif autoplay is enabled
2017-12-28 13:23:41 -06:00
cwm
832a93e67c
Fix GIF avatars not autoplaying ( fixes #287 , tootsuite pr #6000 )
2017-12-28 08:30:51 -06:00
David Yip
7174d1c955
Merge remote-tracking branch 'origin/master' into merge-upstream
...
Conflicts:
app/javascript/images/mastodon-drawer.png
app/javascript/styles/mastodon/components.scss
2017-12-26 22:24:19 -06:00
beatrix
7347bc7334
Merge pull request #286 from chriswmartin/merge-vanilla-updates-into-glitch
...
Merge various small vanilla updates into glitch
2017-12-26 17:03:29 -05:00
beatrix
e6ab869d95
Merge pull request #285 from chriswmartin/detailed-status-actions
...
Add mute, block, conversation mute actions to detailed status dropdown
2017-12-26 17:03:00 -05:00
cwm
20ad071931
Set direction style to reply indicator (tootsuite pr #6006 )
2017-12-26 14:20:41 -06:00
cwm
14243bf80a
Reduce motion for boost animation (tootsuite pr #5871 )
2017-12-26 14:04:52 -06:00
cwm
337c2e77ee
Fix layout for RTL (tootsuite pr #6014 , #6018 )
2017-12-26 13:49:53 -06:00
cwm
46565ed746
Fix focused background color of favourited direct toot (tootsuite pr #6021 )
2017-12-26 13:30:23 -06:00
cwm
815524412b
Move dropdown transform origin (tootsuite pr #6091 )
2017-12-26 13:28:19 -06:00
cwm
083571915f
onMuteNotifications validation (tootsuite pr #6092 )
2017-12-26 13:25:43 -06:00
cwm
2bbd22e91c
Rename settingKey to settingPath (tootsuite pr #6046 & #6098 )
2017-12-26 13:21:20 -06:00
Jenkins
6b85dba8da
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-12-26 18:17:16 +00:00
cwm
cc6a2ffd0a
use 'flavours/glitch/' prefix in new imports
2017-12-26 10:41:44 -06:00
cwm
22818d2a16
Add mute, block, conversation mute actions to detailed status dropdown menu
2017-12-26 10:13:38 -06:00
Jenkins
bed13f22e2
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-12-25 20:17:10 +00:00
Jenkins
f77c47d01b
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-12-24 15:17:12 +00:00
Jenkins
6d00ca1c71
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-12-22 04:17:14 +00:00
beatrix
4a7782d5c9
Merge pull request #280 from KnzkDev/add-en-ja
...
i18n: Add en and ja
2017-12-21 22:49:30 -05:00
ncls7615
fb57ec41df
Update and add some translate
2017-12-22 12:22:41 +09:00
ncls7615
4694dcfe16
Add more en and ja
2017-12-22 12:11:28 +09:00
ncls7615
02db8aa3a0
Add en and ja
2017-12-22 12:01:38 +09:00
beatrix
60d415bc5e
Merge pull request #266 from chriswmartin/getting-started-improvements
...
Getting started column improvements
2017-12-21 18:47:07 -05:00
beatrix
f78d169d71
Merge pull request #278 from KnzkDev/fix/acc-header-avatar
...
Fix account header avatar
2017-12-21 17:46:53 -05:00
ncls7615
191b625a27
Fix account header avatar
2017-12-22 07:12:49 +09:00
beatrix
a3cb5a6b64
Merge pull request #277 from glitch-soc/273-add-data-status-by-to-detailed-status
...
Add data-status-by back to DetailedStatus component. Fixes #273 .
2017-12-21 16:10:36 -05:00
David Yip
7bb99ca3cf
Add data-status-by back to DetailedStatus component. Fixes #273 .
2017-12-21 13:22:33 -06:00
cwm
d736739e8f
<kbd> instead of <code> in KeyboardShortcuts component (tootsuite pr #6049 )
2017-12-21 13:04:40 -06:00
cwm
7917d45396
remove themes.default from i18n-tasks unused check
2017-12-21 12:45:11 -06:00
beatrix
bc0152974f
Merge pull request #276 from glitch-soc/245-click-avatar-to-open-profile-in-new-tab
...
Wrap <Avatar> in account header in a link to that account's page (fixes #245 )
2017-12-21 08:30:22 -05:00
beatrix
4d34b3495d
Merge pull request #274 from glitch-soc/fix-packs-on-2fa-pages
...
Set packs on 2FA-related pages. Fixes #271 .
2017-12-21 08:30:05 -05:00
David Yip
dbd5f8b9a5
Wrap <Avatar> in account header in a link to that account's page. Fixes #245 .
2017-12-21 05:25:16 -06:00
David Yip
00d1f8eea1
Remove themes.default from i18n-tasks unused check
...
This translation key comes in from tootsuite, but the flavours system
does not use it.
2017-12-21 05:24:17 -06:00
David Yip
a1ddc89da6
Remove unused themes.default key in ko locale.
2017-12-20 20:02:50 -06:00
cwm
9042f9a813
add keyboard shortcuts to getting started ( fixes #275 )
2017-12-20 09:50:29 -06:00
David Yip
bf1eb0912c
Set packs on 2FA-related pages. Fixes #271 .
...
Specifically, this commit:
- changes S::TFA::{Confirmations,RecoveryCodes}Controller to derive from
S::BaseController, because this gives us the necessary actions and
packs
- prepends set_pack to Auth::SessionsController's action chain so that
it takes effect in time for render :two_factor
2017-12-20 03:15:54 -06:00
Jenkins
6f11aa8383
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-12-20 08:17:15 +00:00
beatrix
6cb47f17fc
Merge pull request #272 from KnzkDev/add-en-ja
...
i18n: Update some locale files
2017-12-19 10:35:02 -05:00
ncls7615
d3b2677775
Add en and ja
2017-12-19 20:16:48 +09:00
cwm
14aae9c05c
missed a semicolon
2017-12-17 22:21:15 -06:00
cwm
be50e45a74
use makeMapStateToProps
2017-12-17 22:00:25 -06:00
cwm
e4ebbf4f07
use list-ul icon in list header and web/lists
2017-12-17 21:25:18 -06:00
Jenkins
e7fa7fce25
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-12-17 03:17:14 +00:00
Jenkins
05a2a70ca2
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-12-16 15:17:12 +00:00
beatrix
e202efdf8a
Merge pull request #253 from glitch-soc/prevent-local-only-federation
...
prevent federation of local-only statuses
2017-12-16 09:26:48 -05:00
beatrix
5325c2ab3e
Merge pull request #270 from KnzkDev/fix/action_logs
...
Fix admin/action_logs page
2017-12-16 09:25:57 -05:00
ncls7615
9e8fa3caee
fix admin/action_logs page
2017-12-16 20:27:26 +09:00
kibigo!
e677dda07c
Fixes #244 to make search results scrollable
2017-12-15 12:49:23 -08:00
David Yip
82b2e224a2
Merge branch 'gs-master' into prevent-local-only-federation
...
Conflicts:
db/schema.rb
2017-12-15 12:20:56 -06:00
Jenkins
40afadfb01
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-12-15 18:17:14 +00:00
beatrix
e0a573a2ce
Merge pull request #269 from ncls7615/patch-1
...
Update ja.js
2017-12-15 09:12:54 -05:00
NCLS
e9a5bde9a0
Update ja.js
2017-12-15 19:43:10 +09:00
NCLS
61ed5b972c
Update ja.js
2017-12-15 19:38:13 +09:00
Jenkins
37254c4f5d
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-12-15 01:17:12 +00:00
David Yip
6abb0950c6
Examples for Status.as_public_timeline.
...
Also adjust the examples for Status.as_tag_timeline to match the
nomenclature used in .as_public_timeline (e.g. "account" -> "viewer").
2017-12-14 02:57:59 -06:00
David Yip
e35a350119
Examples for Status#set_locality and .as_tag_timeline.
...
This commit also:
- exposes the local-only emoji so that it can be used in examples
- allows local_only to be set explicitly, i.e. for timeline filtering
specs
2017-12-14 02:27:42 -06:00
Jenkins
e5a9831a56
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-12-13 23:17:15 +00:00
Jenkins
10f800ab46
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-12-13 20:17:13 +00:00
Jenkins
82236a3703
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-12-13 18:17:16 +00:00
cwm
17e53b931c
code style fixes
2017-12-12 23:07:12 -06:00
cwm
9719983f2d
move list items into an array, don't unnecessarily concat misc nav item
2017-12-12 22:50:20 -06:00
cwm
b6ded7119e
travis fixes
2017-12-12 08:50:31 -06:00
beatrix
65d083338d
Merge pull request #263 from KnzkDev/optimize-paperclip
...
Optimizing paperclip
2017-12-12 09:15:52 -05:00
beatrix
504c3d650f
Merge pull request #264 from KnzkDev/add-ja
...
i18n: Add ja translate
2017-12-12 08:49:19 -05:00
David Yip
be33247235
Remove themes.default from nl and pt-BR locales.
...
This translation has been supplanted by the flavours-related
translations.
2017-12-12 03:28:15 -06:00
David Yip
a057ed5cfe
Merge remote-tracking branch 'tootsuite/master' into merge-upstream
2017-12-12 02:54:13 -06:00
cwm
9b7208f4b4
readded connect for onboarding modal
2017-12-12 00:17:07 -06:00
cwm
b358483ef2
remove unneeded imports from getting_started_misc
2017-12-12 00:09:18 -06:00
cwm
37ced4c903
add components to getting started column
2017-12-12 00:01:17 -06:00
ncls7615
b93ad3d0e8
add ja
2017-12-12 13:13:54 +09:00
ncls7615
c0c4526283
add ja for fav conf
2017-12-12 13:05:48 +09:00
Gô Shoemake
04eaa1943f
Merge pull request #262 from chriswmartin/fix-oauth-pack
...
Add missing set pack to authorizations_controller
2017-12-11 19:34:19 -08:00
ncls7615
c95af71da5
optimize paperclip
2017-12-12 12:29:09 +09:00
cwm
0a52e37648
change pack to 'auth'
2017-12-11 18:14:41 -06:00
cwm
44992df257
load pack
2017-12-11 17:54:40 -06:00
Erin
2efffe77dc
reblog_service.rb: Status#local_only -> local_only?
2017-12-11 17:39:11 -06:00
Erin
c5a4eda694
move outbox filtering to Status#permitted_for (as per @ekiru)
2017-12-11 15:28:04 -06:00
Erin
3ec47e732b
post_status_service: stylistic change (local_only -> local_only?)
2017-12-11 15:27:31 -06:00
kibigo!
8aa527434c
Fixed index in webpack config
2017-12-11 10:45:21 -08:00
beatrix
7d024a6b68
Merge pull request #259 from KnzkDev/flavours-ja
...
i18n: Add ja translate for flavour/skin ux
2017-12-11 10:56:41 -05:00
ncls7615
d8206d1931
add ja
2017-12-12 00:28:33 +09:00
beatrix
771b950feb
Merge pull request #254 from glitch-soc/new-theme-ux
...
New flavour/skin UX
2017-12-11 09:36:14 -05:00
beatrix
0cd5f2a61f
Merge pull request #255 from KnzkDev/remove-picture
...
Remove getting-started picture
2017-12-11 09:08:13 -05:00
David Yip
204688e803
Add missing set_pack def/filter in OAuth::AuthorizedApplicationsController.
2017-12-11 00:17:30 -06:00
ncls7615
9d5ecdbf41
remove picture
2017-12-11 13:52:17 +09:00
David Yip
1138d0c321
Add Rake task to backfill local-only flag ( #253 )
2017-12-10 22:49:59 -06:00
kibigo!
ed7231947c
Added styling
2017-12-10 20:32:28 -08:00
kibigo!
bdca1614d5
Screenshot support for themes
2017-12-10 20:32:28 -08:00
kibigo!
dabf66e676
Moved flavour UI into own prefs tab
2017-12-10 20:32:27 -08:00
beatrix
08b0861b96
Merge pull request #250 from chriswmartin/fav-confirm-modal
...
add favourite confirmation modal
2017-12-10 23:10:19 -05:00
beatrix
01a3461bef
Merge pull request #252 from ncls7615/glitch-langfiles
...
i18n: Add translate and fix problems
2017-12-10 22:53:48 -05:00
Erin
288f1293ef
set local_only in a before_create callback instead of status service
2017-12-10 21:39:27 -06:00
Erin
0c46058a43
remove vestigial Status#local_only? definition
2017-12-10 21:25:36 -06:00
Erin
c1410af368
post_status_service.rb: save the status after setting local_only
2017-12-10 20:35:57 -06:00
Erin
24f36ca912
Status#not_local_only scope should match nils too
2017-12-10 20:35:42 -06:00
Erin
f080a9fac7
filter local-only toots from AP outboxes
2017-12-10 19:07:43 -06:00
ncls7615
d420e2f047
add comma
2017-12-11 09:50:52 +09:00
ncls7615
279231c5dd
" => '
2017-12-11 09:46:17 +09:00
ncls7615
a98b0a47ef
Merge branch 'master' of https://github.com/glitch-soc/mastodon into glitch-langfiles
...
# Conflicts:
# app/javascript/glitch/locales/ja.json
2017-12-11 09:43:21 +09:00
Erin
6bd18e43ba
filter local-only statuses from public pages
2017-12-10 17:23:01 -06:00
Erin
5ef65aab8f
replace reblog service check for an 👁️ with #local_only
2017-12-10 17:12:21 -06:00
Erin
cfbb95605b
set local_only flag on statuses in post_status_service
2017-12-10 17:04:32 -06:00
Erin
08519cd4f4
status: stub local_only?, add scope, add marked_local_only?
2017-12-10 17:04:28 -06:00
Erin
434c70fd98
add a local_only column to the statuses table
2017-12-10 16:41:25 -06:00
cwm
0466aa8d08
use single quotes in locale entry
2017-12-10 15:39:23 -06:00
cwm
072ab191cc
pulled master, moved locale entry to new location
2017-12-10 15:22:15 -06:00
cwm
eec5d350fd
removed unneeded actions_modal div
2017-12-10 15:14:56 -06:00
beatrix
26c9b9fa27
Merge pull request #246 from glitch-soc/theme-intl8n
...
Internationalization for flavours and skins
2017-12-10 15:41:22 -05:00
kibigo!
64b839b769
Removed MORE theme localizns
2017-12-10 11:38:30 -08:00
kibigo!
cd107e92cb
Move ja localization to new locaiton
2017-12-10 11:09:59 -08:00
kibigo!
6b7085a33e
Linting fixes
2017-12-10 11:08:04 -08:00
kibigo!
1c728df92e
Only localize js when there's a theme
2017-12-10 11:08:04 -08:00
kibigo!
b28cd6769c
Javascript intl8n flavour support
2017-12-10 11:08:04 -08:00
kibigo!
8394430081
Removed unused theme localization key
2017-12-10 11:08:04 -08:00
kibigo!
d08d0f9f33
Ruby intl8n for themes
2017-12-10 11:08:04 -08:00
cwm
066458a659
removed one last app settings addition
2017-12-10 09:25:44 -06:00
cwm
7a8711ccac
removed app settings additions
2017-12-10 09:10:47 -06:00
ncls7615
0e56797792
add and fix
2017-12-10 17:33:22 +09:00
beatrix
282f48ddd1
Merge pull request #248 from chriswmartin/glitch-theme-lists
...
add lists to glitch flavour!
2017-12-10 00:53:37 -05:00
beatrix
ef53c972b1
Merge pull request #237 from dexamphetamine/jpn-localization
...
i18n: add ja glitch strings
2017-12-09 23:34:13 -05:00
amphetamine
eb2b971a52
i18n: add ja glitch strings
2017-12-09 19:39:41 -08:00
cwm
8606e53384
moved locales to glitch, created add settings entry
2017-12-09 15:15:11 -06:00
cwm
fbd2a0127c
ran i18n-tasks normalize for simple_form.en.yml
2017-12-09 13:00:07 -06:00
cwm
c5a688d70e
remove trailing spaces
2017-12-09 12:41:24 -06:00
cwm
7284e36fbd
fixed fav setting change
2017-12-09 12:17:20 -06:00
cwm
22cdbca82c
fixes, functioning now
2017-12-09 12:06:00 -06:00
cwm
a489e5d5cd
added a few more things
2017-12-09 11:21:41 -06:00
cwm
baf9ea8018
remove keyboard shortcuts from getting started because thats a different thing
2017-12-09 10:32:46 -06:00
cwm
abe95b614b
add initial components based off of tootsuite pr #1507
2017-12-09 10:26:22 -06:00
cwm
02d71c6a11
fix a missing semicolon and mixed tabs/spaces that travis was complaining about
2017-12-08 21:09:53 -06:00
cwm
4a5401a58e
merge tootsuite prs #5895 and #5889 into glitch flavour
2017-12-08 20:50:39 -06:00
cwm
28423dd046
merge tootsuite pr #5904 into glitch flavour
2017-12-08 20:45:18 -06:00
cwm
b165950ca7
add keyboard shortcut to getting started, add missing list style
2017-12-08 20:30:45 -06:00
cwm
47157e07b2
merged tootsuite pr #5811 into glitch flavour
2017-12-08 20:13:08 -06:00
cwm
f44c8fd130
merged tootsuite pr #5750 into glitch flavour
2017-12-08 19:40:49 -06:00
Jenkins
776867ea73
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-12-08 13:17:14 +00:00
kibigo!
717b7d555c
Skins shouldn't apply to fallback flavours
2017-12-07 14:49:54 -08:00
kibigo!
753535c3c7
Fixed webpack skin folder globbing
2017-12-07 14:33:49 -08:00
kibigo!
9cdd81e9dd
Glitch doesn't have a home stylesheet anymore
2017-12-07 14:32:52 -08:00
kibigo!
96126a5b01
Packaged local_settings styles in common
2017-12-07 13:36:18 -08:00
David Yip
67d625c42d
Fix hide reblogs in glitch frontend ( #5909 )
...
This applies 432761f375
to the glitch copy
of the Mastodon frontend.
2017-12-06 22:35:45 -06:00
David Yip
ddb61decce
Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master
2017-12-06 22:34:42 -06:00
David Yip
935c1944e2
Merge pull request #241 from glitch-soc/no-dm-option
...
Add option to remove DMs from home (#126 )
2017-12-06 22:20:55 -06:00
Jenkins
744447b3c0
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-12-07 04:17:14 +00:00
kibigo!
2f2467ce8e
Add option to remove DMs from home ( #126 )
2017-12-06 17:50:27 -08:00
beatrix
de56209951
Merge pull request #240 from glitch-soc/copy-api-changes
...
Apply Javascript changes in tootsuite/mastodon#5887 to glitch flavour (#239 )
2017-12-06 19:59:15 -05:00
David Yip
133f5b3b53
Apply Javascript changes in tootsuite/mastodon#5887 to glitch flavour ( #239 )
2017-12-06 18:23:28 -06:00
Jenkins
c63e6c9a2c
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-12-07 00:17:14 +00:00
kibigo!
061211a1e3
Fix common packs when other pack also there
2017-12-06 15:34:19 -08:00
David Yip
161d286df2
Use settings pack for InvitesController ( #229 )
2017-12-06 17:20:04 -06:00
beatrix
81b0145759
Merge pull request #229 from glitch-soc/glitch-theme
...
Advanced Next-Level Flavours And Skins For Mastodon™
2017-12-06 17:44:07 -05:00
David Yip
017fc81caf
Prepend check_enabled_deletion to Settings::DeletesController ( #229 )
...
The specs for Settings::DeletesController include an example that
sets Settings.open_deletion to false and expects the "if deletion is not
available, redirect to root" logic to run. However, this spec does not
set up a user, which means that the spec (intentionally or otherwise)
expects this redirection to work with unauthenticated access.
We should preserve that behavior. To do so, we prepend the deletion
check to the action chain set up by Settings::BaseController, so that
said check occurs before the authenticate_user! check.
2017-12-06 16:19:43 -06:00
David Yip
f1cbea77a4
Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master
2017-12-06 15:40:59 -06:00
beatrix
21e28a5caa
Merge pull request #238 from ncls7615/config-locales-ja
...
i18n: Update Japanese translation
2017-12-06 16:24:16 -05:00
NCLS
fde91988ab
Update ja.yml
2017-12-07 06:10:15 +09:00
Jenkins
8ca91cef45
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-12-06 20:17:13 +00:00
kibigo!
5bed0f10ed
Various fixes
2017-12-04 21:58:10 -08:00
David Yip
a807e3b71b
current_theme -> current_flavour ( #229 )
2017-12-04 11:35:35 -06:00
David Yip
d9800a5647
Merge branch 'gs-master' into glitch-theme
2017-12-04 11:07:01 -06:00
Jenkins
f2f2f10320
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-12-04 12:17:13 +00:00
kibigo!
1c74ede69e
Fixed a name + localizations
2017-12-04 00:19:39 -08:00
kibigo!
7c75702d05
Fixed image require
2017-12-03 23:52:13 -08:00
kibigo!
bc4fa6b198
Rename themes -> flavours ? ?
2017-12-03 23:26:40 -08:00
kibigo!
d216547382
Fixed typos
2017-12-03 22:30:45 -08:00
Jenkins
757f52ff2e
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-12-03 21:17:13 +00:00
Jenkins
933eafdcd3
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-12-02 14:17:11 +00:00
kibigo!
541fe9b110
Skins support
2017-11-30 19:29:47 -08:00
Jenkins
ad46bc9772
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-11-30 03:17:12 +00:00
Jenkins
d020ed1e05
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-11-29 22:17:13 +00:00
David Yip
84840e8d8c
Merge pull request #232 from glitch-soc/hotkeys-glitch
...
Implement status hotkeys + spoiler expanding
2017-11-28 17:34:03 -06:00
David Yip
3614912be2
Normalize pl translation.
2017-11-28 12:17:36 -06:00
David Yip
95c270f5b1
Merge remote-tracking branch 'origin/master' into gs-master
2017-11-28 11:45:13 -06:00
David Yip
7463d80ff4
Merge remote-tracking branch 'tootsuite/master'
2017-11-27 22:33:26 -06:00
David Yip
8bad6bdd00
Normalize config/locales/en.yml.
2017-11-27 22:32:31 -06:00
kibigo!
6a48efe16c
Adds spoiler hotkey support to detailed statuses
2017-11-27 14:05:03 -08:00
kibigo!
f3c3df62ab
Implement status hotkeys + spoiler expanding
2017-11-27 13:30:01 -08:00
Jenkins
63d47e04c4
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-11-27 20:17:12 +00:00
David Yip
e77c3996a5
Merge remote-tracking branch 'origin/master' into gs-master
2017-11-27 11:29:04 -06:00
Jenkins
5de42665d7
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-11-27 05:17:11 +00:00
Jenkins
86f4f8e158
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-11-25 05:17:15 +00:00
Jenkins
167fe2ab08
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-11-24 01:17:20 +00:00
Jenkins
faad820458
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-11-23 21:17:14 +00:00
Jenkins
41c71565c2
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-11-23 02:17:12 +00:00
kibigo!
2585649b20
Styling fixes
2017-11-21 19:00:07 -08:00
kibigo!
12c0011fee
Update statuses on hidden toggle ( Fixes #227 )
2017-11-21 18:27:34 -08:00
kibigo!
8812bab687
Minor fixes
2017-11-21 18:17:38 -08:00
Jenkins
2a5af9c10c
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-11-21 17:17:11 +00:00
Marcin Mikołajczak
3c83b7e06e
i18n: Update Polish translation - front-end added ( #231 )
...
* i18n: Update Polish translation
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
* i18n: Update Polish translation
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2017-11-21 17:53:13 +01:00
beatrix
b7a7eb84dd
update code of conduct email address
2017-11-21 11:01:28 -05:00
Marcin Mikołajczak
1a07b83c69
i18n: Update Polish translation - back-end ( #230 )
...
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2017-11-21 16:36:22 +01:00
kibigo!
bdbbd06dad
Finalized theme loading and stuff
2017-11-20 22:13:37 -08:00
Jenkins
8f3e5f6128
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-11-21 05:17:12 +00:00
Jenkins
a36a2c1796
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-11-19 15:17:12 +00:00
David Yip
e45cb0837b
Update .following_map examples with show-reblogs information.
2017-11-19 02:56:45 -06:00
David Yip
d083f7741a
Merge remote-tracking branch 'tootsuite/master'
2017-11-19 01:30:29 -06:00
beatrix
bcda3f85ce
Merge pull request #226 from glitch-soc/glitch-theme
...
Glitch/Vanilla themes
2017-11-18 20:32:17 -05:00
kibigo!
321fa41930
Merge remote-tracking branch 'cybre/theme_win95' into glitch-theme
2017-11-18 15:18:00 -08:00
kibigo!
a9ed857171
WIP static themeing
2017-11-18 15:12:52 -08:00
kibigo!
92cc79be72
Enabled vanilla thmee
2017-11-18 11:06:04 -08:00
kibigo!
08a01dd037
Public pack fix
2017-11-18 11:05:39 -08:00
kibigo!
672ace5a20
Media styling
2017-11-18 11:05:23 -08:00
kibigo!
f51f7b0e06
Font styles are now packagified
2017-11-18 11:05:00 -08:00
beatrix
dec960c828
Merge pull request #208 from yipdw/keyword-mute
...
Run keyword mutes on hashtags
2017-11-18 12:06:40 -05:00
Jenkins
eed50514be
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-11-18 06:17:14 +00:00
kibigo!
a618df7998
Sets default theme to glitch
2017-11-17 19:32:04 -08:00
kibigo!
fc2c8b50dd
Removed glitch tests
2017-11-17 19:29:17 -08:00
kibigo!
e19fc6a9f8
Restore vanilla components
2017-11-17 19:29:16 -08:00
kibigo!
45c44989c8
Forking glitch theme
2017-11-17 19:29:16 -08:00
beatrix
5a9982b425
Merge pull request #223 from glitch-soc/glitchsoc/feature/configurable-status-size
...
Make character limit configurable (from tootsuite/mastodon#5697 )
2017-11-17 19:02:40 -05:00
David Yip
284e2cde81
Merge pull request #224 from yipdw/merge-upstream
...
Merge upstream (tootsuite/mastodon#5703 )
2017-11-17 17:58:13 -06:00
David Yip
130aa90d55
Update annotations on Follow, FollowRequest, and Mute.
...
Follow and FollowRequest had conflicts in their schema annotations, so I
ran latest migrations and let annotate_models fix them up.
2017-11-17 17:41:15 -06:00
David Yip
1ab12ba38e
Merge remote-tracking branch 'origin/master' into merge-upstream
2017-11-17 17:40:00 -06:00
David Yip
6f8ccbfcdf
Merge pull request #222 from yipdw/merge/tootsuite/master
...
Merge upstream (e28b33c.. 94c5a11
)
2017-11-17 14:35:16 -06:00
David Yip
dc16d73bf5
Merge remote-tracking branch 'lambadalambda/feature/configurable-status-size' into glitchsoc/feature/configurable-status-size
2017-11-17 14:28:16 -06:00
beatrix
b006bb82af
Merge pull request #221 from glitch-soc/local-only-policy
...
Update StatusPolicy to check current_account for local_only? toots.
2017-11-17 15:17:49 -05:00
Jenkins
94c5a11cda
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-11-17 20:17:12 +00:00
David Yip
45f18b8f49
Merge pull request #218 from glitch-soc/themed-prefetching
...
Themed preloading
2017-11-17 14:01:23 -06:00
David Yip
f6355f6ffb
Update StatusPolicy to check current_account for local_only? toots.
...
StatusPolicy#account was renamed to StatusPolicy#current_account in
upstream. This commit renames the local-only changes to match and
augments the #show? policy spec with what we expect for local-only
toots.
2017-11-17 09:07:21 -06:00
David Yip
2a386ad88d
Add trailing comma in mapStateToProps
...
Consistency, eslint, etc.
2017-11-17 00:24:22 -06:00
David Yip
fbf76feb37
Merge pull request #219 from glitch-soc/no-spin
...
Remove 'spin' theme
2017-11-17 00:14:24 -06:00
David Yip
392945f9a3
Throw layout, isWide, navbarUnder back into mapStateToProps.
...
This gets wide view, auto layout, and navbar-under-mobile working again.
2017-11-17 00:11:01 -06:00
kibigo!
4dd19054d6
Removes spin theme
2017-11-16 21:54:12 -08:00
kibigo!
585758a373
Themed prefetching
2017-11-16 21:37:08 -08:00
David Yip
b28b405b97
Merge remote-tracking branch 'origin/master' into gs-master
2017-11-16 22:52:37 -06:00
Surinna Curtis
ee560abdbe
Merge pull request #216 from glitch-soc/merge-upstream-3023725
...
Merge upstream at commit 3023725
2017-11-16 01:38:26 -06:00
Surinna Curtis
35fbdc36f9
Merge tootsuite/master at 3023725936
2017-11-16 01:21:16 -06:00
David Yip
88627fd7aa
Merge pull request #217 from monsterpit-daggertooth/fix-streaming-host-env
...
Allow streaming server to take bindhost from HOST env
2017-11-15 23:40:07 -06:00
David Yip
c2a92dffc9
Add some examples for Glitch::KeywordMute::TagMatcher. #208 .
2017-11-15 23:31:49 -06:00
Daggertooth
7e17e764a5
Allow streaming server to take bindhost from HOST env
2017-11-15 21:20:35 -06:00
David Yip
08652baab0
Replace =~ with #matches?. #208 .
...
=~ made sense when we were passing it through to a regex, but we're no
longer doing that: TagMatcher looks at individual tags and returns a
value that *looks* like what you get out of #=~ but really isn't that
meaningful. Probably a good idea to not subvert convention like this
and instead use a name with guessable intent.
2017-11-15 18:27:25 -06:00
David Yip
8fc54890e5
Prefix cache keys with the matcher type. #208 .
...
We already know about one regex limitation, which is that they cannot
segment words in e.g. Japanese, Chinese, or Thai. It may also end up
that regex matching is too slow compared to other methods.
However, the regex is an implementation detail. We still want the
ability to switch between "occurs anywhere" and "match whole word", and
caching the matcher result is likely to still be important (since the
matcher itself won't change nearly as often as status ingress rate).
Therefore, we ought to be able to change the cache keys to reflect a
change of data structure.
(Old cache keys expire within minutes, so they shouldn't be too big of
an issue. Old cache keys could also be explicitly removed by an
instance administrator.)
2017-11-15 18:12:31 -06:00
David Yip
cb4ef24ac9
Match keyword mute filter on hashtags. #208 .
...
It is reasonable to expect someone to enter #foo to mute hashtag #foo.
However, tags are recorded on statuses without the preceding #.
To adjust for this, we build a separate tag matcher and use
Tag::HASHTAG_RE to extract a hashtag from the hashtag syntax.
2017-11-15 18:12:29 -06:00
David Yip
431503bae2
Also run the keyword matcher on a status' tags. #208 .
2017-11-15 18:12:26 -06:00
beatrix
04508868b0
Merge pull request #212 from aschmitz/feat/mute-reblogs
...
Allow hiding reblogs on a per-follow basis
2017-11-15 12:01:17 -05:00
Lain Iwakura
ca5440b93d
Rename MAX_CHARS to MAX_TOOT_CHARS to be more specific.
2017-11-14 17:56:38 +01:00
Lain Iwakura
dae8916544
Code style fixes.
2017-11-14 16:54:04 +01:00
Lain Iwakura
d11b1a1aa7
Handle character limit in initial state in frontend.
2017-11-14 16:24:10 +01:00
Lain Iwakura
a4dcabc11b
Return character limit in API and initial state.
2017-11-14 16:23:12 +01:00
Lain Iwakura
6cd192b9fb
Make character limit configurable.
2017-11-14 16:22:34 +01:00
Andrew
c238444188
Updates and fixes to win95 theme
2017-11-14 01:22:48 -08:00
David Yip
bfd9230d61
Merge pull request #214 from glitch-soc/keyword-mute
...
Maintain case-insensitivity when merging multiple matchers (#213 )
2017-11-13 12:33:19 -06:00
David Yip
656d54e945
Maintain case-insensitivity when merging multiple matchers ( #213 )
...
When given two regexps, Regexp.union preserves the options set (or not
set) on each regex; this meant that none of the multiline (m),
case-insensitivity (i), or extended syntax (x) options were set. Our
regexps are written expecting the m, i, and x options were set on all of
them, so we need to make sure that we preserve that behavior.
2017-11-13 11:06:02 -06:00
aschmitz
9a42f7cbed
Actually filter blocked reblogs from feed
...
And even a relevant test. Whoops.
2017-11-11 22:10:49 -06:00
aschmitz
48c705bbad
Don't update follower counts on reblog toggle
2017-11-11 21:42:22 -06:00
aschmitz
5128c4261e
Updates per code review
...
Thanks, @valerauko!
2017-11-11 14:37:23 -06:00
aschmitz
b95c48748c
Per-user reblog hiding implementation/fixes/tests
...
Note that this will only hide/show *future* reblogs by a user, and does
nothing to remove/add reblogs that are already in the timeline. I don't
think that's a particularly confusing behavior, and it's a lot easier
to implement (similar to mutes, I believe).
2017-11-10 22:04:54 -06:00
aschmitz
4944515020
"Show reblogs" per-follower UI/database changes
...
TODO:
* Tests (particularly for FollowRequests).
* Anything to respect the setting when putting reblogs in timelines.
2017-11-09 08:41:10 -06:00
David Yip
e1b7785788
Merge pull request #209 from glitch-soc/update-mastodongo
...
Mastodon GO! -> v0.1.1
2017-11-06 23:12:58 -06:00
kibigo!
bc8532359b
Mastodon GO! -> v0.1.1
2017-11-06 20:00:03 -08:00
David Yip
a617060dfc
Merge pull request #206 from glitch-soc/autocollapse-boost
...
Autocollapse boosts option
2017-11-05 21:02:37 -06:00
kibigo!
e0298d66f8
Autocollapse boosts option
2017-11-05 15:05:12 -08:00
beatrix
73bf0ea7d1
Merge pull request #204 from glitch-soc/with-mastodon-go
...
Introducing: Mastodon GO!
2017-11-04 09:14:08 -04:00
kibigo!
276432790a
Introducing: Mastodon GO!
2017-11-04 05:48:42 -07:00
beatrix
254b74c71f
add memorial to production.rb
...
in memory of Natalie Nguyen
let her name ring through the ether
2017-11-03 12:34:50 -04:00
David Yip
870d71b78b
Merge branch 'master' into gs-master
2017-10-27 09:45:25 -05:00
Andrew
2827f852c0
Theme: Windows 95
2017-10-26 23:22:48 -07:00
Jenkins
656f5b6f87
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-10-26 15:08:34 +00:00
David Yip
dd28b94cf0
Merge remote-tracking branch 'origin/master' into gs-master
2017-10-26 09:18:27 -05:00
beatrix
a2612d0d38
Merge pull request #179 from glitch-soc/keyword-mute
...
Keyword muting
2017-10-25 17:37:48 -04:00
beatrix
31814ddda0
Merge pull request #198 from glitch-soc/gs-direct-timeline
...
Direct messages timeline from tootsuite/mastodon#4514
2017-10-25 17:37:06 -04:00
David Yip
42f2045c21
Merge remote-tracking branch 'STJrInuyasha/feature/direct-timeline' into gs-direct-timeline
2017-10-25 16:01:20 -05:00
Jenkins
5f0268ab84
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-10-25 16:17:14 +00:00
David Yip
e40fe4092d
Remove nil check in Glitch::KeywordMute#=~.
...
@regex can no longer be nil, so we don't need to check it.
2017-10-24 19:03:59 -05:00
David Yip
d9485e6497
Assume Glitch::KeywordMute#destroy! works and error out if it doesn't.
...
There's nothing useful we can display if the destroy action messes up,
so might as well assert it does and complain loudly if it doesn't.
2017-10-24 18:56:57 -05:00
David Yip
d5c8ebe205
Use edit template for displaying errors in update.
2017-10-24 18:56:44 -05:00
David Yip
d03b48cea0
Also filter notifications containing muted keywords.
2017-10-24 18:51:27 -05:00
David Yip
9226257a1b
Override Action View name inference in settings/keyword_mutes.
...
Glitch::KeywordMute's name is inferred as glitch_keyword_mutes, and in
templates this turns into e.g. settings/glitch/keyword_mutes. Going
along with this convention means a lot of file movement, though, and for
a UI that's as temporary and awkward as this one I think it's less
effort to slap a bunch of as: options everywhere.
We'll do the Right Thing when we build out the API and frontend UI.
2017-10-24 18:40:28 -05:00
David Yip
641f90e73a
Fix example description.
...
This example actually checks matches at the end of a string.
2017-10-24 18:33:02 -05:00
David Yip
f5a3283976
Switch to Regexp.union for building the mute expression.
...
Also make the keyword-building methods private: they always probably
should have been private, but now I have encoded enough fun and games
into them that it now seems wrong for them to *not* be private.
2017-10-24 18:31:34 -05:00
Ondřej Hruška
516eeeb43d
option to add title to <Button>, use for toot buttons ( #197 )
2017-10-24 19:08:07 +02:00
David Yip
664c9aa708
Merge pull request #196 from glitch-soc/fix-imports
...
Added app/javascript for imports
2017-10-23 23:34:43 -05:00
kibigo!
119d477c8b
Added app/javascript for imports
2017-10-23 20:22:48 -07:00
David Yip
8410d33b49
Only cache the regex text, not the regex itself.
...
It is possible to cache a Regexp object, but I'm not sure what happens
if e.g. that object remains in cache across two different Ruby versions.
Caching a string seems to raise fewer questions.
2017-10-23 19:31:59 -05:00
David Yip
4f01e6e8d5
Merge remote-tracking branch 'origin/master' into gs-master
2017-10-22 22:57:41 -05:00
Matthew Walsh
a76b024228
Changes to match other timelines in 2.0
2017-10-22 18:45:35 -07:00
Matthew Walsh
3db80f75a6
Added a timeline for Direct statuses
...
* Lists all Direct statuses you've sent and received
* Displayed in Getting Started
* Streaming server support for direct TL
2017-10-22 18:35:14 -07:00
David Yip
af8f06413e
KeywordMute matcher: more closely mimic Regexp#=~ behavior.
...
Regexp#=~ returns nil if it does not match. An empty mute set does not
match any status, so KeywordMute::Matcher#=~ ought to return nil also.
2017-10-22 01:12:21 -05:00
David Yip
1a60445a5f
Address unused translation errors.
2017-10-22 01:05:56 -05:00
David Yip
4c84513e04
Use current_account from ApplicationController.
...
This avoids copy-pasting definitions of set_account.
2017-10-22 01:02:52 -05:00
David Yip
4b68e82a19
Don't add \b to whole-word keywords that don't start with word characters.
...
Ditto for ending with \b.
Consider muting the phrase "(hot take)". I stipulate it is reasonable
to enter this with the default "match whole word" behavior. Under the
old behavior, this would be encoded as
\b\(hot\ take\)\b
However, if \b is before the first character in the string and the first
character in the string is not a word character, then the match will
fail. Ditto for after. In our example, "(" is not a word character, so
this will not match statuses containing "(hot take)", and that's a very
surprising behavior.
To address this, we only add leading and trailing \b to keywords that
start or end with word characters.
2017-10-22 00:38:54 -05:00
David Yip
19826774f0
keyword mutes: also check spoiler (CW) text and reblogged statuses.
2017-10-22 00:38:53 -05:00
David Yip
ad86c86fa8
Apply keyword mutes to reblogs.
2017-10-21 15:44:47 -05:00
David Yip
670e6a33f8
Move KeywordMute into Glitch namespace.
...
There are two motivations for this:
1. It looks like we're going to add other features that require
server-side storage (e.g. user notes).
2. Namespacing glitchsoc modifications is a good idea anyway: even if we
do not end up doing (1), if upstream introduces a keyword-mute feature
that also uses a "KeywordMute" model, we can avoid some merge
conflicts this way and work on the more interesting task of
choosing which implementation to use.
2017-10-21 14:54:36 -05:00
David Yip
cd04e3df58
Fill in create, edit, update, and destroy for keyword mutes interface.
...
Also add a destroy-all action, which can be useful if you're flushing an
old list entirely to start a new one.
2017-10-21 14:54:36 -05:00
David Yip
4a64181461
Allow keywords to match either substrings or whole words.
...
Word-boundary matching only works as intended in English and languages
that use similar word-breaking characters; it doesn't work so well in
(say) Japanese, Chinese, or Thai. It's unacceptable to have a feature
that doesn't work as intended for some languages. (Moreso especially
considering that it's likely that the largest contingent on the Mastodon
bit of the fediverse speaks Japanese.)
There are rules specified in Unicode TR29[1] for word-breaking across
all languages supported by Unicode, but the rules deliberately do not
cover all cases. In fact, TR29 states
For example, reliable detection of word boundaries in languages such
as Thai, Lao, Chinese, or Japanese requires the use of dictionary
lookup, analogous to English hyphenation.
So we aren't going to be able to make word detection work with regexes
within Mastodon (or glitchsoc). However, for a first pass (even if it's
kind of punting) we can allow the user to choose whether they want word
or substring detection and warn about the limitations of this
implementation in, say, docs.
[1]: https://unicode.org/reports/tr29/
https://web.archive.org/web/20171001005125/https://unicode.org/reports/tr29/
2017-10-21 14:54:36 -05:00
David Yip
2e03a10059
Spike out index and new views for keyword mutes controller.
2017-10-21 14:54:36 -05:00
David Yip
4fa2f7e82d
Set up /settings/keyword_mutes. #164 .
...
This should eventually be accessible via the API and the web frontend,
but I find it easier to set up an editing interface using Rails
templates and the like. We can always take it out if it turns out we
don't need it.
2017-10-21 14:54:36 -05:00
David Yip
b4b657eb1d
Invalidate cached matcher objects on KeywordMute commit. #164 .
2017-10-21 14:54:36 -05:00
David Yip
693c66dfde
Use more idiomatic string concatentation. #164 .
...
The intent of the previous concatenation was to minimize object
allocations, which can end up being a slow killer. However, it turns
out that under MRI 2.4.x, the shove-strings-in-an-array-and-join method
is not only arguably more common but (in this particular case) actually
allocates *fewer* objects than the string concatenation.
Or, at least, that's what I gather by running this:
words = %w(palmettoes nudged hibernation bullish stockade's tightened Hades
Dixie's formalize superego's commissaries Zappa's viceroy's apothecaries
tablespoonful's barons Chennai tollgate ticked expands)
a = Account.first
KeywordMute.transaction do
words.each { |w| KeywordMute.create!(keyword: w, account: a) }
GC.start
s1 = GC.stat
re = String.new.tap do |str|
scoped = KeywordMute.where(account: a)
keywords = scoped.select(:id, :keyword)
count = scoped.count
keywords.find_each.with_index do |kw, index|
str << Regexp.escape(kw.keyword.strip)
str << '|' if index < count - 1
end
end
s2 = GC.stat
puts s1.inspect, s2.inspect
raise ActiveRecord::Rollback
end
vs this:
words = %w( palmettoes nudged hibernation bullish stockade's tightened Hades Dixie's
formalize superego's commissaries Zappa's viceroy's apothecaries tablespoonful's
barons Chennai tollgate ticked expands
)
a = Account.first
KeywordMute.transaction do
words.each { |w| KeywordMute.create!(keyword: w, account: a) }
GC.start
s1 = GC.stat
re = [].tap do |arr|
KeywordMute.where(account: a).select(:keyword, :id).find_each do |m|
arr << Regexp.escape(m.keyword.strip)
end
end.join('|')
s2 = GC.stat
puts s1.inspect, s2.inspect
raise ActiveRecord::Rollback
end
Using rails r, here is a comparison of the total_allocated_objects and
malloc_increase_bytes GC stat data:
total_allocated_objects malloc_increase_bytes
string concat 3200241 -> 3201428 (+1187) 1176 -> 45216 (44040)
array join 3200380 -> 3201299 (+919) 1176 -> 36448 (35272)
2017-10-21 14:54:36 -05:00
David Yip
a4851100fd
Make use of the regex attr_reader. #164 .
...
It would also have been valid to get rid of the attr_reader, but I like
being able to reach inside KeywordMute::Matcher without resorting to
instance_variable_get tomfoolery.
2017-10-21 14:54:36 -05:00
David Yip
9f609bc94e
Fix case-insensitive match scenario; test some word ornamentation. #164 .
2017-10-21 14:54:36 -05:00
David Yip
603cf02b70
Rework KeywordMute interface to use a matcher object; spec out matcher. #164 .
...
A matcher object that builds a match from KeywordMute data and runs it
over text is, in my view, one of the easier ways to write examples for
this sort of thing.
2017-10-21 14:54:36 -05:00
David Yip
4745d6eeca
Spec out KeywordMute interface. #164 .
2017-10-21 14:54:21 -05:00
David Yip
9093e2de7a
Add KeywordMute model.
...
Gist of the proposed keyword mute implementation:
Keyword mutes are represented server-side as one keyword per record.
For each account, there exists a keyword regex that is generated as one
big alternation of all keywords. This regex is cached (in Redis, I
guess) so we can quickly get it when filtering in FeedManager.
2017-10-21 14:53:41 -05:00
Ondřej Hruška
d589dd7cd0
Compose buttons bar redesign + generalize dropdown ( #194 )
...
* Generalize compose dropdown for re-use
* wip stuffs
* new tootbox look and removed old doodle button files
* use the house icon for ...
2017-10-21 20:24:53 +02:00
beatrix
a7be86e875
hide mentions of muted accounts (in home col) ( #190 )
...
* hide mentions of muted accounts (in home col)
also cleans up some old crap
* add test
2017-10-20 10:49:54 -04:00
beatrix
b15dd05514
Merge pull request #191 from glitch-soc/garglamel-yaml
...
ƔAML update
2017-10-19 19:29:52 -04:00
kibigo!
21bafc6555
Updates to bio metadata script
2017-10-19 16:11:53 -07:00
beatrix
f5e2469485
Merge pull request #189 from glitch-soc/scrollable-compose-area
...
Make the compose area optionally scrollable
2017-10-19 12:28:47 -04:00
David Yip
9423553e5c
Make the compose area optionally scrollable.
...
On desktop, the compose text box grows to accommodate the content. On
mobile, the text box does not grow to accommodate text context, but does
grow to accommodate images. It is possible in both cases to overflow
the available area, which makes accessing other UI elements (e.g.
visibility setttings) difficult.
This commit makes the compose area optionally scrollable, which allows
those UI elements to remain available even if they go off-screen.
2017-10-19 10:59:50 -05:00
David Yip
90770f6d59
Merge pull request #185 from glitch-soc/fix-null-status
...
workaround for null status
2017-10-18 17:01:31 -05:00
beatrix
c756651278
Merge pull request #188 from glitch-soc/merge-upstream-2-0-0
...
Merge with upstream v2.0.0
2017-10-18 17:57:42 -04:00
Ondřej Hruška
eb907a5bab
formatting fix for eslint
2017-10-18 23:44:06 +02:00
David Yip
39c9cdf7fe
Remove unused filesAttached property.
2017-10-18 13:20:45 -05:00
David Yip
86cf4468af
Update stylesheet imports in glitch components.
...
Commit 6e54719474
moved the Mastodon
variables and mixins deeper in the directory hierarchy; this commit
brings the glitch components in line with that change.
2017-10-18 11:52:34 -05:00
David Yip
42e8c8eb0e
Merge tag 'v2.0.0' into gs-master
2017-10-18 11:52:04 -05:00
Ondřej Hruška
4421f6598f
Fix dual toot button wrong behavior after compose re-design
2017-10-16 23:32:13 +02:00
Ondřej Hruška
64a5e9a1de
workaround for null status
2017-10-16 23:09:39 +02:00
beatrix
7364b26e4b
Merge pull request #184 from tootsuite/master
...
Fix reduced motion breaking public galleries (#5423 )
2017-10-16 17:05:42 -04:00
David Yip
313ba202ef
Merge pull request #182 from glitch-soc/wide-tootbox-panel
...
Full-width tootbox panel to make room for buttons
2017-10-16 15:49:22 -05:00
David Yip
7c44ad6355
Merge pull request #181 from glitch-soc/upstream-merge-again
...
Merge upstream, pull in fixes for tootsuite/mastodon#{5409,5417}
2017-10-16 15:46:12 -05:00
Ondřej Hruška
37ff061d9b
satisfy eslint and jest
2017-10-16 22:24:44 +02:00
Ondřej Hruška
3d7de06db4
rem a comment
2017-10-16 22:12:38 +02:00
Ondřej Hruška
26f08f0791
double-decker tootbox
2017-10-16 22:10:14 +02:00
Ondřej Hruška
8b9ee5f16b
Merge remote-tracking branch 'upstream/master' into upstream-merge-again
2017-10-16 21:13:47 +02:00
Ondřej Hruška
4b397adb5b
fix some lint errors
2017-10-16 21:13:34 +02:00
David Yip
65154869df
Merge remote-tracking branch 'upstream/master' into upstream-merge-again
2017-10-16 09:54:16 -05:00
David Yip
7e9d93472c
Merge remote-tracking branch 'upstream/master' into gs-master
2017-10-16 09:27:01 -05:00
David Yip
dbb1fce94d
Merge remote-tracking branch 'upstream/master' into gs-master
2017-10-16 09:23:59 -05:00
David Yip
6cd5b3bbe5
Merge remote-tracking branch 'origin/master' into gs-master
2017-10-16 01:29:02 -05:00
David Yip
f72ad67a39
Merge pull request #180 from STJrInuyasha/glitch-soc/avatar-unification
...
Avatar unification, mk.II
2017-10-16 00:49:05 -05:00
Matthew Walsh
56094cb4bd
1.6 changed files for unified avatar styling -- updated to restore unity
2017-10-15 21:14:21 -07:00
David Yip
22df18e902
Merge pull request #173 from glitch-soc/zerowidthmoji
...
use zerowidth spaces with emojis
2017-10-15 20:04:19 -05:00
Ondřej Hruška
cdc22d23b9
Doodle improvements 2 ( #176 )
...
* Fix some doodle bugs and added Background color functionality
* added protections against accidental doodle erase, screen size changing
* resolve react warning about 'selected' on <option>
2017-10-14 12:24:35 +02:00
Ondřej Hruška
531dadad86
Doodle palette, options, fill tool ( #172 )
2017-10-14 00:58:38 +02:00
Ondřej Hruška
723890b6fa
use zerowidth spaces for emojis
2017-10-14 00:48:53 +02:00
David Yip
daa04c39b6
Merge pull request #168 from glitch-soc/doodles
...
Initial doodle support
2017-10-13 11:48:53 -05:00
Ondřej Hruška
2af964ef20
Fixed a bug where the canvas would get transparent bg upon erase
2017-10-13 18:13:00 +02:00
Ondřej Hruška
33e806217f
Initial doodle support
2017-10-13 18:07:01 +02:00
Ondřej Hruška
df626fdd43
Fix the notification bug with newlines
2017-10-12 21:28:17 +02:00
David Yip
6a2b1ba91e
Another tabs-vs-spaces fix, but with ~feeling~
2017-10-12 09:36:26 -05:00
David Yip
fe1c20cfb9
Fix tabs-vs-spaces issue pointed out by eslint.
2017-10-12 09:23:06 -05:00
David Yip
edd1a00faf
Restore variable assignment in MuteService#call.
...
291feba6f1
made MuteService return the
result of Account#mute!; this commit restores that behavior.
2017-10-12 04:27:45 -05:00
David Yip
13e05fece2
Merge tag 'v2.0.0rc2' into gs-master
2017-10-12 04:22:59 -05:00
Ondřej Hruška
eeaa8fba43
Fix our media gallery not having alt text and tooltips
2017-10-11 22:02:24 +02:00
Ondřej Hruška
b0b5ff1b0f
workaround for scrollIntoView bug ???
2017-10-11 21:49:22 +02:00
Ondřej Hruška
bd51a16150
add duck beaks in haml
2017-10-11 21:34:00 +02:00
Ondřej Hruška
0bf9261e65
Merge remote-tracking branch 'upstream/master'
2017-10-11 21:27:17 +02:00
kibigo!
3cc6255a7e
Removed length check which now happens in reducer
2017-10-11 11:50:11 -07:00
kibigo!
35e2cad4eb
Fixed header emojification
2017-10-11 11:00:28 -07:00
kibigo!
8d6b9ba494
Merge upstream 2.0ish #165
2017-10-11 10:43:10 -07:00
beatrix
f0a2a6c875
try to tighten up local only toot stuff, like... properly ( #163 )
...
* try to tighten up local only toot stuff, like... properly
* try to un-break tests
2017-10-09 09:56:17 -04:00
Ondřej Hruška
92a3181dc6
improve static page metadata look
2017-10-08 10:46:59 +02:00
beatrix
7cc0da756d
Merge pull request #161 from DJSundog/audio-uploads-feature
...
Audio uploads feature
2017-10-07 20:13:53 -04:00
DJ Sundog
85d5da86df
raise Mastodon::ValidationError if audio file duration is over 60 secs
2017-10-07 16:14:34 -07:00
DJ Sundog
e10cff8226
update indentation
2017-10-07 13:55:11 -07:00
DJ Sundog
979b0d66a7
update indentation
2017-10-07 13:53:46 -07:00
DJ Sundog
6ca03a7f58
add faststart to audio transcoding
2017-10-07 19:59:22 +00:00
DJ Sundog
96ba3482b9
adding support for audio uploads, transcoded to mp4 videos
2017-10-07 19:54:10 +00:00
kibigo!
6610d57f91
Basic static metadata styling
2017-10-06 22:22:34 -07:00
Ondřej Hruška
1a8011648f
Merge pull request #160 from glitch-soc/ugly-fix-notif-clearing
...
workaround for notif clearing
2017-10-06 09:34:12 +02:00
Ondřej Hruška
37e141bccb
comment out unused stuff with Video
2017-10-06 09:23:28 +02:00
Ondřej Hruška
dcd8ff5308
fix haml quotes in a bid to make travis less grumpy
2017-10-06 09:07:04 +02:00
Ondřej Hruška
f82e90bf11
workaround for notif clearing
2017-10-05 21:55:02 +02:00
beatrix
b1217242fc
Merge pull request #125 from glitch-soc/data-column
...
Add data-column="..." to all columns
2017-09-30 15:02:21 -04:00
beatrix
5dec67d964
Merge pull request #159 from glitch-soc/closed-instance-landing-page-login-form
...
add login form to landing page if regs are closed
2017-09-30 15:01:32 -04:00
Ondřej Hruška
ce3e0faf4d
add login form to landing page if regs are closed
2017-09-29 16:41:18 +02:00
beatrix
c027a7bd4d
Merge pull request #157 from glitch-soc/merging-upstream
...
ABRACA-HRRRRRRRRRRRNGGGGGGGHHH!!!!!!!!!!!!!!!!!!!
2017-09-28 21:48:28 -04:00
kibigo!
53f829dfa8
HAML fix
2017-09-28 18:16:04 -07:00
kibigo!
cf1f83ca2a
Fixed lingering upstream Theme code
2017-09-28 17:45:16 -07:00
kibigo!
1522795853
new HAML for statuses
2017-09-28 17:18:12 -07:00
Ondřej Hruška
e9f9e3cc89
unbreak onboarding modal
2017-09-28 11:13:37 +02:00
Ondřej Hruška
cf24ce7e03
remove wrong emojify usage in old glitch components
2017-09-28 11:03:23 +02:00
Ondřej Hruška
74e4fc8f8a
fix custom emoji not shown in statuses
2017-09-28 10:13:16 +02:00
Ondřej Hruška
9a5418942c
fix some js errors due to number->string change of status ID
2017-09-28 10:04:20 +02:00
Ondřej Hruška
daad07b1d5
Merge remote-tracking branch 'origin/better-themeing' into merging-upstream
2017-09-28 09:20:59 +02:00
Ondřej Hruška
83bda6c1a8
Merge commit 'b9f59ebcc68e9da0a7158741a1a2ef3564e1321e' into merging-upstream
2017-09-28 09:18:35 +02:00
Ondřej Hruška
fcf0d2078e
Skip-merge commit '0401a24558294b6941c30c922af3f2063dfd305e' into merging-upstream
2017-09-28 09:12:47 +02:00
Ondřej Hruška
9330ea1f4d
Merge commit '4aea3f88a6d30f102a79c2da7fcfac96465ba1a8' into merging-upstream
2017-09-28 09:12:17 +02:00
Ondřej Hruška
06e299cef5
Revert "autoscroll emoji suggestions box"
...
This reverts commit c89cce0219
.
2017-09-28 08:56:32 +02:00
Ondřej Hruška
8a24ad5828
Revert "Merge pull request #149 from glitch-soc/mojon-suggest"
...
This reverts commit fa3587645d
, reversing
changes made to 15c9c2fd7e
.
2017-09-28 08:55:53 +02:00
kibigo!
f7ca205f38
Fixed webpack config code
2017-09-25 19:35:54 -07:00
kibigo!
86e617a839
Better themeing support!!
2017-09-25 19:24:32 -07:00
Ondřej Hruška
210e6776fc
Fix intl warning with disabled secondary toot btn
...
- Moved building the secondary btn text into the if to avoid trying to translate 'none' visibility
2017-09-23 23:41:25 +02:00
Ondřej Hruška
1924a71b5a
Make secondary toot button work nicer with file attachments & revert to the original behavior if it's disabled
2017-09-23 23:38:24 +02:00
Ondřej Hruška
67f8277526
Add secondary toot button (opt-in) ( #153 )
...
Add secondary toot button + other toot button enhancements.
Squashing so it's easy to revert if needed.
2017-09-23 23:11:02 +02:00
Ondřej Hruška
169d83f532
Remove "extra clickable spaces" made obsolete by status re-design
2017-09-23 00:33:35 +02:00
Ondřej Hruška
31dd261375
applied blackle's fix for gallery offset with full-width media
2017-09-22 21:47:14 +02:00
kibigo!
c2b479efec
Long display names now ellipsis properly
2017-09-21 16:55:32 -07:00
kibigo!
a94dc21c79
Styling fixes for header redesign
2017-09-21 16:46:18 -07:00
David Yip
9512db920c
Merge pull request #148 from glitch-soc/better-header
...
Improvements to status headers and content
2017-09-21 16:11:03 -05:00
Ondřej Hruška
c89cce0219
autoscroll emoji suggestions box
2017-09-21 15:31:24 +02:00
beatrix
fa3587645d
Merge pull request #149 from glitch-soc/mojon-suggest
...
Emoji and Hashtag autocomplete
2017-09-20 23:02:23 -04:00
kibigo!
9ed51cecd0
Fixed notification appearance
2017-09-20 14:52:01 -07:00
Ondřej Hruška
514edd3c23
fulltext mojo suggestions
2017-09-20 22:13:09 +02:00
Ondřej Hruška
a3760b7729
TURBO shortcode search
2017-09-20 21:57:33 +02:00
Ondřej Hruška
cbf00168f1
add scrollbar to mojon suggestions list when too long
2017-09-20 21:53:08 +02:00
Ondřej Hruška
4f9a493d9d
cache allShortcodes
2017-09-20 21:39:22 +02:00
Ondřej Hruška
8c0733a14e
typo in comment
2017-09-20 21:28:44 +02:00
Ondřej Hruška
36a35be2ad
Appease Travis
2017-09-20 20:34:11 +02:00
Ondřej Hruška
3783062450
Emoji and Hashtag autocomplete
2017-09-20 20:21:09 +02:00
kibigo!
15c9c2fd7e
Pinned toots; embeds
2017-09-20 02:50:53 -07:00
kibigo!
227dbb6adb
Added GIF hover-to-play support
2017-09-20 02:19:36 -07:00
kibigo!
769f62d96f
Improvements to status headers
2017-09-20 01:57:08 -07:00
kibigo!
003bfd094e
Fixed disabled boost SVG ( #106 )
2017-09-20 00:40:54 -07:00
kibigo!
fae8dce738
Fixed #133 (only parse links in status text)
2017-09-20 00:20:11 -07:00
Surinna Curtis
b0487488a7
Re-center hidden media text vertical
2017-09-16 11:44:31 -05:00
David Yip
f5d6bdd9c0
Merge pull request #147 from yipdw/sync/upstream
...
Fix error when following locked accounts (#4896 )
2017-09-16 11:37:53 -05:00
Eugen Rochko
ad8e856a5b
Fix error when following locked accounts ( #4896 )
...
(cherry picked from commit 0ef9d45d05
)
2017-09-16 11:10:33 -05:00
Surinna Curtis
7ebd6ed03c
Apply white-space: nowrap to account relationships icons
2017-09-14 07:37:39 -05:00
Surinna Curtis
59936b7a98
Tweak title text for mute notifications toggle to be clearer
2017-09-13 22:54:14 -05:00
Surinna Curtis
fd9a171129
fix typos in the migration
2017-09-13 22:35:48 -05:00
Surinna Curtis
6ba35630bc
Add migration to default Mute#hide_notifications? to true
2017-09-13 22:26:43 -05:00
Surinna Curtis
79d8911116
Fixed a typo that was breaking the account mute API endpoint
2017-09-13 21:47:30 -05:00
Surinna Curtis
d880b3182b
minor code style fixes oops
2017-09-13 21:47:30 -05:00
Surinna Curtis
f9d7b8a94f
Refactor handling of default params for muting to make code cleaner
2017-09-13 21:47:30 -05:00
Surinna Curtis
211f0a9513
add an explanatory comment to AccountInteractions
2017-09-13 21:47:30 -05:00
Surinna Curtis
4a527154b7
fix a missing import
2017-09-13 21:47:30 -05:00
Surinna Curtis
df71eadaae
In probably dead code, replace a dispatch of muteAccount that was skipping the modal with launching the mute modal.
2017-09-13 21:47:30 -05:00
Surinna Curtis
323d437a09
satisfy eslint
2017-09-13 21:47:30 -05:00
Surinna Curtis
3278c08c29
make the hide/unhide notifications buttons work
2017-09-13 21:47:30 -05:00
Surinna Curtis
0284fd723b
Allow modifying the hide_notifications of a mute with the /api/v1/accounts/:id/mute endpoint
2017-09-13 21:47:30 -05:00
Surinna Curtis
0e0703dbd8
Show whether muted users' notifications are muted in account lists
2017-09-13 21:47:30 -05:00
Surinna Curtis
7dbcc7ed3d
Expose whether a mute hides notifications in the api/v1/relationships endpoint
2017-09-13 21:47:30 -05:00
Surinna Curtis
83b3a0389c
Add more specs for the /api/v1/mutes/details endpoint
2017-09-13 21:47:30 -05:00
Surinna Curtis
af2d793398
Define a serializer for /api/v1/mutes/details
2017-09-13 21:47:30 -05:00
Surinna Curtis
70592cdaba
Add a /api/v1/mutes/details route that just returns the array of mutes.
2017-09-13 21:47:30 -05:00
Surinna Curtis
30b5254a5d
Put the label for the hide notifications checkbox in a label element.
2017-09-13 21:47:30 -05:00
Surinna Curtis
0a207be99d
add trailing newlines to files for Pork :)
2017-09-13 21:47:30 -05:00
Surinna Curtis
500c465226
specs for MuteService notifications params
2017-09-13 21:47:30 -05:00
Surinna Curtis
2ea9b164d3
Satisfy eslint.
2017-09-13 21:47:30 -05:00
Surinna Curtis
b1576c52df
Convert profile header mute to use mute modal
2017-09-13 21:47:30 -05:00
Surinna Curtis
4612f7caea
Break out a separate mute modal with a hide-notifications checkbox.
2017-09-13 21:47:30 -05:00
Surinna Curtis
0c547faf92
Less gross passing of notifications flag
2017-09-13 21:47:30 -05:00
Surinna Curtis
eaaf2170fe
API support for muting notifications (and specs)
2017-09-13 21:47:30 -05:00
Surinna Curtis
6f7d00bfdd
Add support for muting notifications in MuteService
2017-09-13 21:47:30 -05:00
Surinna Curtis
5c2e1869f0
specs testing that hide_notifications in mutes actually hides notifications
2017-09-13 21:47:30 -05:00
Surinna Curtis
0f2af2a974
Add specs for how mute! interacts with muting_notifications?
2017-09-13 21:47:30 -05:00
Surinna Curtis
27f8d7069b
block notifications in notify_service from hard muted accounts
2017-09-13 21:47:30 -05:00
Surinna Curtis
44207b6af6
Add muting_notifications? and a notifications argument to mute!
2017-09-13 21:47:30 -05:00
Surinna Curtis
27e55da853
Add a hide_notifications column to mutes
2017-09-13 21:47:30 -05:00
Surinna Curtis
3cac5bc2c3
Fix a spuriously failing spec that assumed we required short bios like upstream
2017-09-10 19:43:52 -05:00
Surinna Curtis
29c44fa5fa
Remove unused imports
2017-09-10 16:00:26 -05:00
Surinna Curtis
7a9c7d4e0b
Merge pull request #143 from yipdw/sync/upstream
...
Merge with upstream's 1.6.0
2017-09-10 14:10:30 -05:00
David Yip
932571fa22
Merge tag 'v1.6.0' into sync/upstream
2017-09-10 13:04:27 -05:00
beatrix
c9df53044a
Merge pull request #142 from glitch-soc/sync/upstream-1.6.0rc4
...
Merge with 1.6.0rc4
STRAP IN BUCKAWOO HERE WE GO AGAIN
2017-09-10 13:34:14 -04:00
David Yip
67ad453373
Merge tag 'v1.6.0rc4' into sync/upstream-1.6.0rc4
...
Conflicts:
app/javascript/mastodon/features/getting_started/index.js
app/javascript/packs/public.js
app/javascript/styles/components.scss
2017-09-09 23:56:21 -05:00
beatrix
3dff74eecf
Merge pull request #141 from yipdw/sync/upstream
...
Sync with upstream @ v1.6.0rc3
ohhhhhhhhhhh heck here we go
2017-09-09 20:11:48 -04:00
David Yip
14e1fb8d36
Add missing import (patch by @MightyPork)
2017-09-09 14:28:20 -05:00
David Yip
514fc908a3
Merge tag 'v1.6.0rc3' into sync/upstream
2017-09-09 14:28:08 -05:00
David Yip
b9f7bc149b
Merge branch 'origin/master' into sync/upstream
...
Conflicts:
app/javascript/mastodon/components/status_list.js
app/javascript/mastodon/features/notifications/index.js
app/javascript/mastodon/features/ui/components/modal_root.js
app/javascript/mastodon/features/ui/components/onboarding_modal.js
app/javascript/mastodon/features/ui/index.js
app/javascript/styles/about.scss
app/javascript/styles/accounts.scss
app/javascript/styles/components.scss
app/presenters/instance_presenter.rb
app/services/post_status_service.rb
app/services/reblog_service.rb
app/views/about/more.html.haml
app/views/about/show.html.haml
app/views/accounts/_header.html.haml
config/webpack/loaders/babel.js
spec/controllers/api/v1/accounts/credentials_controller_spec.rb
2017-09-09 14:27:47 -05:00
aschmitz
e18ed4bbc7
Fix StatusLengthValidator tests
...
This fixes the StatusLengthValidator tests to use
StatusLengthValidator::MAX_CHARS to derive the length of the strings
tested, and so makes them resilient to changes in MAX_CHARS (such as the
one that made these tests fail, with it being changed from 500 to 512).
This seems a bit odd for some types of tests, but appears to make sense
here, where the testing goes beyond `status.length > MAX_CHARS`.
2017-09-02 11:37:40 -05:00
Surinna Curtis
667df47168
Remove workaround for fixed bug in SettingToggle
...
SettingToggle was toggling itself in response to keydown of space, and then the keyup was doing it again
2017-08-31 22:41:49 -05:00
Surinna Curtis
173a970752
UploadArea should only preventDefault for Escape
...
This will make accessibility for some things less effortful, since we won't have to define a prior event handler to do whatever should be happening by default.
2017-08-31 22:32:03 -05:00
Ondřej Hruška
cb42dd8497
Fix onboarding modal & add re-open button ( #129 )
...
* Added a button to open the onboarding modal
* Fixed onboarding modal
* added a show-me-around getting-started menu button
2017-08-08 21:42:29 +02:00
Ondřej Hruška
4dc0ddc601
fix regression - collapse button not working
2017-08-07 22:46:24 +02:00
Ondřej Hruška
7a1ca8b0df
Merge remote-tracking branch 'upstream/master'
2017-08-07 22:43:52 +02:00
Ondřej Hruška
b8791ae79b
always put @handles on a new line. undo some needless changes from prev cmmt
2017-08-07 21:59:49 +02:00
Ondřej Hruška
b9a2ceca35
removed ellipsis from .display-name
2017-08-07 21:24:19 +02:00
kibigo!
70c5eccc12
Compatibility regex for user profiles
2017-08-06 15:10:06 -07:00
Ondřej Hruška
eb7fc34708
Merge pull request #124 from glitch-soc/data-avatar-of
...
all checks have failed woooooo \*merges*
2017-08-06 21:49:26 +02:00
Ondřej Hruška
b6bf04ece2
Added data-column="{account|local|federated|favourites|hashtag|home|notifications|mutes|blocks|getting-started|follow-requests}" to Column
2017-08-06 21:27:47 +02:00
Ondřej Hruška
91836d577e
Add data-avatar-of="@..." to all user avatars
2017-08-06 21:24:13 +02:00
Ondřej Hruška
7de0fa698d
Updated glitch files to use the new Avatar class correctly
2017-08-06 21:23:59 +02:00
Ondřej Hruška
811d895f7b
Merged upstream PR #4526
2017-08-06 21:23:36 +02:00
Ondřej Hruška
7b42d14f45
fix bug with data attrib for boost in home TL
2017-08-04 22:38:58 +02:00
Ondřej Hruška
f34f33c19e
Add data- attributes to statuses for userstyle selectors ( #117 )
...
* Add data- attributes to statuses for userstyle selectors
* use const and template string, replace reblog->boosted and favourite->favourited
* more template strings because sorin-sama said so
2017-08-04 22:11:46 +02:00
kibigo!
8b58153583
Fixed onClick column links
2017-08-01 13:46:52 -07:00
kibigo!
8150689b48
Merge upstream ( #111 )
2017-08-01 13:20:29 -07:00
Gô Shoemake
b61e3daf98
Multiple frontend support ( #110 )
...
* Initial multiple frontend support
* Removed unnecessary require()
* Moved styles/images out of common
2017-07-30 19:28:21 +02:00
Ondřej Hruška
6ff084dbbb
Improved notifications cleaning UI with set operations ( #109 )
...
* added notification cleaning drawer
* bugfix
* fully implemented set operations for notif cleaning
* i18n for notif cleaning drawer & improved logic slightly. Also added a confirm dialog
* - notif dismiss "overlay" now shoves the notif aside to avoid overlap
- added focus ring to header buttons
- removed notif overlay entirely from DOM if mode is disabled
* removed comment
* CSS tuning - inconsistent division lines fix
2017-07-30 12:36:28 -04:00
David Yip
9aaf3218d2
Add commit_hash to instance presenter double ( #107 )
...
glitch-soc's about page grabs said value from InstancePresenter; the
double needs to emulate that.
2017-07-28 19:25:30 -04:00
Ondřej Hruška
cb69e35b3b
Add visibility icon to Detailed status
2017-07-27 00:41:28 +02:00
Ondřej Hruška
e82021e0e6
Merge pull request #97 from glitch-soc/LESS_UGLY_LANDING_PAGE_TEXT_CSS
...
Landing page CSS fixes
2017-07-25 23:32:59 +02:00
Ondřej Hruška
8925731c98
Improve landing page CSS and text contrast
2017-07-25 23:30:31 +02:00
Ondřej Hruška
4c233b4f3a
Add .fa-external-link to instance list link
2017-07-25 23:30:13 +02:00
Ondřej Hruška
b7cf758fbe
Fix JS errors and add back commit hash
2017-07-25 21:54:12 +02:00
Ondřej Hruška
7e5691804d
Merge git://github.com/tootsuite/mastodon into tootsuite-master
2017-07-25 21:36:22 +02:00
Ondřej Hruška
852acbd738
amend 3ba7c1e7
to actually do what I wanted to do *facepalm*
2017-07-22 22:32:03 +02:00
Ondřej Hruška
6913426e48
Merge pull request #92 from tootsuite/master
...
tiny upstream merge
2017-07-22 22:20:17 +02:00
Ondřej Hruška
3ba7c1e725
Textarea does not auto-expand on mobile anymore (autofocus only on desktop)
2017-07-22 21:48:56 +02:00
Ondřej Hruška
9b74a12045
Adjust margins for mobile with navbar-under
2017-07-22 20:41:21 +02:00
Ondřej Hruška
74a0cc6a11
Added settings toggle to move the navbar at the bottom in mobile view ( #93 )
2017-07-22 19:51:34 +02:00
beatrix-bitrot
984d2d4cb6
Merge that good fresh upstream shit
2017-07-22 01:16:53 +00:00
Ondřej Hruška
0244019ca1
Fixed horrible outline around notif clearing checkbox & moved the overlay to a more sr-friendly place
2017-07-21 21:12:43 +02:00
Ondřej Hruška
604654ccb4
New notification cleaning mode ( #89 )
...
This PR adds a new notification cleaning mode, super perfectly tuned for accessibility, and removes the previous notification cleaning functionality as it's now redundant.
* w.i.p. notif clearing mode
* Better CSS for selected notification and shorter text if Stretch is off
* wip for rebase ~
* all working in notif clearing mode, except the actual removal
* bulk delete route for piggo
* cleaning + refactor. endpoint gives 422 for some reason
* formatting
* use the right route
* fix broken destroy_multiple
* load more notifs after succ cleaning
* satisfy eslint
* Removed CSS for the old notif delete button
* Tabindex=0 is mandatory
In order to make it possible to tab to this element you must have tab index = 0. Removing this violates WCAG and makes it impossible to use the interface without good eyesight and a mouse. So nobody with certain mobility impairments, vision impairments, or brain injuries would be able to use this feature if you don't have tabindex=0
* Corrected aria-label
Previous label implied a different behavior from what actually happens
* aria role localization & made the overlay behave like a checkbox
* checkboxes css and better contrast
* color tuning for the notif overlay
* fanceh checkboxes etc and nice backgrounds
* SHUT UP TRAVIS
2017-07-21 20:33:16 +02:00
beatrix
0efd7e7406
disable about page timeline
2017-07-20 17:26:00 -04:00
beatrix
e7edb4d1ee
Merge pull request #87 from tootsuite/master
...
merge upstream
2017-07-20 11:24:32 -04:00
kibigo!
d235224692
Restructured local settings internals
2017-07-19 20:41:28 -07:00
kibigo!
0a678cf377
Fix for stylesheet split
2017-07-18 11:28:52 -07:00
Surinna Curtis
7a77f7b3bb
Add sourceRoot/includePaths to loaders
...
Use the settings modal as an example/testcase
2017-07-18 11:27:48 -07:00
Ondřej Hruška
df74e26baf
Merge branch 'tootsuite-master'
2017-07-18 18:59:00 +02:00
Ondřej Hruška
d69fa9e1f4
Merge changes from upstream with the CSS reload fix
2017-07-18 18:58:47 +02:00
Ondřej Hruška
c727eae441
Updated from tootsuite
2017-07-17 20:03:57 +02:00
kibigo!
d0aad1ac85
Documentation and cleanup
2017-07-16 17:13:16 -07:00
kibigo!
21b04af524
Fixes lack of <tbody> in header metadata table
2017-07-16 16:49:12 -07:00
Ondřej Hruška
3ea02314b9
split added glitch locales from vanilla ( #82 )
...
* Locale script now accepts overrides and new keys from glitch/locales
* Revert glitchsoc changes to mastodon/locales to prevent future merge conflicts
2017-07-16 01:15:25 +02:00
kibigo!
4715161a93
FIXED STUFF FROM THE MERGE SORRY ;_;
2017-07-15 15:42:39 -07:00
kibigo!
144db8ea1d
poke and visible docs url
2017-07-15 15:34:46 -07:00
kibigo!
bc4202d00b
Ported updates from #64
2017-07-15 15:10:06 -07:00
kibigo!
09cfc079b0
Merge upstream ( #81 )
2017-07-15 14:33:15 -07:00
Ondřej Hruška
08d021916d
Fixed issue #72 - bad css in report dialog
2017-07-15 16:45:39 +02:00
Ondřej Hruška
99f24ab0c7
Raise search results count to 10 for test
...
reference: https://mastodon.xyz/users/lx/updates/278054
2017-07-15 15:42:24 +02:00
Ondřej Hruška
3a526e2369
Fix broken letterboxing in media previews
2017-07-15 15:38:18 +02:00
Gô Shoemake
51e3ac2534
Added link to docs website
2017-07-14 09:42:50 -07:00
Ondřej Hruška
75aafc932e
Added buttons and menu items to dismiss individual notifications ( #76 )
...
* Added DELETE verb for notifications
* Added notification dismiss button to status dropdown
* Added reveal-on-hover notif dismiss button, added FollowNotification component
2017-07-14 11:03:43 -04:00
kibigo!
6ce806f913
Fixed faulty import on notifs
2017-07-13 03:36:12 -07:00
kibigo!
35fda84ba8
Documentation pt. I
2017-07-13 03:26:08 -07:00
kibigo!
5770d461b2
Moved glitch containers and commented unused files
2017-07-13 02:40:16 -07:00
kibigo!
2e0645c26c
Updated readme and contrib docs
2017-07-12 23:55:55 -07:00
Ondřej Hruška
66b1174d25
Fix CW auto-expanding if collapsed toots are disabled
2017-07-12 19:52:36 +02:00
kibigo!
183f993b01
Linting fixes
2017-07-12 02:36:40 -07:00
Surinna Curtis
e53fbb4a09
local-only/compose advanced options tweaks.
...
Squashed commit of the following:
commit b9877e37f72fdd8134936e1014033b07cb6c3671
Author: Surinna Curtis <ekiru.0@gmail.com>
Date: Wed Jul 12 00:50:10 2017 -0500
account for the eye in the chars left count for local-only toots
commit 56ebfa96542e16daa1986cc45e07974801ee12dc
Author: Surinna Curtis <ekiru.0@gmail.com>
Date: Wed Jul 12 00:21:02 2017 -0500
factor out an AdvancedOptionsToggle to avoid unnecessary re-renders
commit 04cec44ab8744e4e0f52da488c9ec24b1b1422ef
Author: Surinna Curtis <ekiru.0@gmail.com>
Date: Wed Jul 12 00:20:24 2017 -0500
s/changeComposeAdvancedOption/toggleComposeAdvancedOption/g
commit af5815dee750d1aa8b797a9305e5ab3ce6774e3f
Author: Surinna Curtis <ekiru.0@gmail.com>
Date: Tue Jul 11 23:55:19 2017 -0500
clicking anywhere on the whole advanced option toggles
2017-07-12 02:14:17 -07:00
kibigo!
79d898ae0a
Merge upstream!! #64 <3 <3
2017-07-12 02:03:17 -07:00
kibigo!
bcf7ee48e9
Importing vanillin from upstream ;) ;)
2017-07-12 01:10:17 -07:00
kibigo!
297921fce5
Moved glitch files to their own location ;)
2017-07-12 01:02:51 -07:00
DJ Sundog
74eff5456c
First lame pass at adding optional git commit hash display on /about/… ( #67 )
...
* First lame pass at adding optional git commit hash display on /about/more page.
Currently, this is implemented by checking for the existence of a file called CURRENT_RELEASE in the home directory of the user running Mastodon. If the file exists, its contents are added.
I've modified my update process to include the following before precompiling assets:
git log -1 | head -n 1 | cut -d " " -f2 > ~/CURRENT_RELEASE
That puts the current commit hash into the file ~/CURRENT_RELEASE, but you figured that out because you're a smart cookie.
As I am quite sure this is a horrible methodology for implementing this, I look forward to any improvements you have to offer!
* Updated to handle instances that share a user - the CURRENT_RELEASE file now lives in the instance's base directory.
This also requires modifying the update hook to `git log -1 | head -n 1 | cut -d " " -f2 > CURRENT_RELEASE`
2017-07-11 20:32:16 -04:00
Ondřej Hruška
60d27b4302
Fixed #66 disabling collapse collapses all toots
2017-07-11 20:48:31 +02:00
Ondřej Hruška
08d19778d5
Fix extra clickable spaces for narrow screen
2017-07-11 17:53:50 +02:00
Ondřej Hruška
9f7a5aac1e
Toot context menu is now centered
2017-07-10 10:21:20 -04:00
Ondřej Hruška
945c5812d3
Added extra clickable area in status gutter
2017-07-10 09:29:20 -04:00
Ondřej Hruška
667b567606
Make avatar in compose navbar hover-to-play
2017-07-10 10:26:46 +02:00
Ondřej Hruška
8e2b1f79e4
Small indent fix in components.scss
2017-07-09 14:00:13 +02:00
Ondřej Hruška
345290a905
Avatar in the detail column no longer autoplays
2017-07-09 07:54:33 -04:00
Ondřej Hruška
2fb78fefc6
Fix fullwidth media CSS bugs with NSFW video, and bad spoiler margin on static pages ( #60 )
...
* Fix fullwidth style not applied to NSFW video correctly
* Fix botched video .media-spoiler margin on static pages
2017-07-09 09:07:14 +02:00
Ondřej Hruška
dc2b8bdecd
Added a toggle for full-width media previews
2017-07-08 06:46:12 -04:00
Ondřej Hruška
e3c2183c12
New design for visibility icons
2017-07-07 23:07:16 -04:00
kibigo!
86f8df7903
Fixed avis on static pages
2017-07-07 15:56:05 -07:00
Ondřej Hruška
d41cec90cf
Added toot visibility icons and removed Boost btn changing icon
2017-07-07 06:31:11 -04:00
Ondřej Hruška
7859e6ad45
Fix back button to never go to a different website using history len check
2017-07-07 05:59:15 -04:00
Surinna Curtis
3464bb30f8
replies to local-only toots default to local-only, and fix some regex bugs
2017-07-06 22:30:51 -05:00
Ondřej Hruška
d87d70e89a
Fixed js type error in advanced_options_dropdown.js
2017-07-06 14:46:45 -07:00
kibigo!
0c7ee5c792
Fixed non-status notification styling
2017-07-05 19:26:19 -07:00
kibigo!
bba75c15f1
Statuses redux!
...
- Better unified reblogs, statuses, and notifications
- Polished up collapsed toots greatly
- Apologies to bea if this makes everything more difficult
2017-07-05 18:51:23 -07:00
Ondřej Hruška
4cbbea5881
Improved CSS for drawer to restore original looks (full height)
2017-07-05 07:21:36 -04:00
Ondřej Hruška
167c392efd
Fix drawer clipping dropdowns
2017-07-05 07:21:36 -04:00
Surinna Curtis
193f354d3e
a real default for advanced options long description
2017-07-05 00:09:20 -05:00
Surinna Curtis
6b67b91eb1
satisfy eslint
2017-07-04 21:33:53 -07:00
Surinna Curtis
6b77424660
some adjustments to open/active for advanced options dropdown
2017-07-04 21:33:53 -07:00
Surinna Curtis
301c185878
highlight … button if any options enabled
2017-07-04 21:33:53 -07:00
Surinna Curtis
cb7f54891f
Revert "change active/hover display on advanced options"
...
This reverts commit ade773cb0a8c0c4b862074f7ee8e607023bc8bbe.
2017-07-04 21:33:53 -07:00
Surinna Curtis
f6ce1a9592
toggles for advanced options
2017-07-04 21:33:53 -07:00
Surinna Curtis
aee64b996c
change active/hover display on advanced options
2017-07-04 21:33:53 -07:00
Surinna Curtis
0c71c0ccc8
reset advanced options when appropriate
2017-07-04 21:33:53 -07:00
Surinna Curtis
49e82c1e0f
add an eye when submitting a toot with do_not_federate enabled
2017-07-04 21:33:53 -07:00
Surinna Curtis
556cede00f
Local-only option and dropdown all working
2017-07-04 21:33:53 -07:00
Surinna Curtis
b73ee36949
Reduce advanced options dropdown width
2017-07-04 21:33:53 -07:00
Surinna Curtis
dd49c10cdb
Further improvements to dropdown html
2017-07-04 21:33:53 -07:00
Surinna Curtis
85d5249479
The beginnings of an advanced options dropdown
2017-07-04 21:33:53 -07:00
Surinna Curtis
ff9f2088f7
Move layout override into app settings modal
...
Squashed commit of the following:
commit 3842f879865818a3299f8283f8ed1b43c5566500
Author: Surinna Curtis <ekiru.0@gmail.com>
Date: Mon Jul 3 19:57:39 2017 -0500
Fix some style issues
commit 08628a0234392ecac90e869a1272f429de0b6db2
Author: Surinna Curtis <ekiru.0@gmail.com>
Date: Mon Jul 3 19:35:22 2017 -0500
Improved styling and layout of select app settings
commit 1787a7c20f2bf7101c6d6830450564178314a737
Author: Surinna Curtis <ekiru.0@gmail.com>
Date: Mon Jul 3 17:13:53 2017 -0500
remove the layout selector ui from the drawer
commit 7d93b180b1e615e2c36210ad6f119fe80a2778d8
Author: Surinna Curtis <ekiru.0@gmail.com>
Date: Mon Jul 3 17:01:51 2017 -0500
Add layout setting to app settings modal
2017-07-03 21:51:00 -05:00
adbelle
15227c713d
Remove color lightening for search results section
...
This will cause it to match the shading of the container behind it.
2017-06-30 18:38:36 -04:00
adbelle
30736f4886
Add opaque background to search results section
2017-06-30 18:38:36 -04:00
kibigo!
c58877862d
createBio function added
2017-06-30 15:03:31 -07:00
beatrix
0e310f1ee3
put travis thing in readme.md
2017-06-30 12:36:10 -04:00
beatrix-bitrot
7dd4d9de96
try fix failing controller spec caused by long bios
2017-06-30 16:27:52 +00:00
kibigo!
46f83bb28b
Styling fixes to media spoilers
2017-06-30 02:56:19 -07:00
kibigo!
ec2daae71c
Media display improvements
...
- built in fullwidth styling
- letterbox settings toggle
- media no longer counts towards height when making toot-collapsing
measurements
2017-06-30 02:18:25 -07:00
kibigo!
b525caf40a
Fixing an aspect of #32 which had previously escaped my attention
2017-06-29 23:39:57 -07:00
kibigo!
fc65b691df
Images now behind CWs on static pages
2017-06-29 22:59:28 -07:00
kibigo!
651c3d643c
Images behind CWs in detailed statuses too
2017-06-29 22:48:22 -07:00
kibigo!
cc4cba8afd
Improvements to image icon appearance on SHOW MORE
2017-06-29 01:43:15 -07:00
kibigo!
99889ea57d
Tiny Status improvements
...
- Media toots are no longer auto-collapsed if the media is behind a CW
- Display names no longer appear clickable when a toot is collapsed
- Fixed #36 by adding reduplicating the media icon inside the SHOW
MORE/LESS
2017-06-28 23:23:05 -07:00
kibigo!
19690d3e33
Fixes #32 bug with revealing sensitive media
2017-06-28 22:57:30 -07:00
kibigo!
0b371da971
Fixed improper centering of columns-area
2017-06-28 22:18:22 -07:00
kibigo!
2d8ebdcc72
Initial store for local settings is now Immutable all the way down
2017-06-28 22:11:21 -07:00
kibigo!
595c6de32c
Added App Setttings Modal
2017-06-28 22:00:54 -07:00
kibigo!
6cbbdc805f
Fixed Regexp.new syntax
2017-06-28 15:16:13 -07:00
kibigo!
7b1d233f4f
Linear gradient no longer extends under metadata on account pages
2017-06-28 01:10:28 -07:00
kibigo!
03f9648377
Improvements to static metadata styling, especially for mobile
2017-06-28 00:57:32 -07:00
kibigo!
6107e95404
Backend YAML Processing + Profile Metadata on Static Pages
2017-06-28 00:27:44 -07:00
kibigo!
36805a39db
Moved reblog wrapper outside of <Status>
2017-06-27 18:34:30 -07:00
kibigo!
ab4632a41e
Allow line-breaks in bio metadata
2017-06-27 16:20:35 -07:00
beatrix-bitrot
ddafde942c
Merge remote-tracking branch 'upstream/master'
2017-06-27 20:46:13 +00:00
kibigo!
e6300de142
Profile metadata improvements
2017-06-27 05:48:26 -07:00
Surinna Curtis
a6f5111c79
Eyes with variation-selector-16 now also do local-only
2017-06-26 20:51:11 -05:00
kibigo!
59503a88ae
Disable account linking on collapsed toots too
2017-06-26 15:41:09 -07:00
kibigo!
5df7bc3a8b
Disable links on collapsed toots
2017-06-26 15:22:03 -07:00
kibigo!
c806fef865
Notifications collapsed by default
2017-06-26 14:28:43 -07:00
beatrix-bitrot
49ba78d6f8
fix account spec broken by change to 500char bios
2017-06-26 20:55:44 +00:00
Surinna Curtis
7b53d4bbca
Bio length on client side mostly doesn't count metadata
2017-06-26 09:34:31 -05:00
Surinna Curtis
4f36aad6e8
don't count bio metadata against bio length on server
2017-06-26 09:34:31 -05:00
kibigo!
56ca33a6d3
Time needs to be just a little wider to accomodate minutes
2017-06-25 19:38:58 -07:00
kibigo!
aeff898137
We want wrapping here, sorry 😥
2017-06-25 19:26:59 -07:00
kibigo!
b323e00bf3
Merge branch 'master' of https://github.com/glitch-soc/mastodon
2017-06-25 19:19:52 -07:00
kibigo!
a520b118e4
Expand toot by clicking on body [fixed!]
2017-06-25 19:19:45 -07:00
beatrix-bitrot
93fc8aa14c
keyword muting and local only tooting WIP
2017-06-26 02:19:21 +00:00
beatrix-bitrot
c0a665865e
update bio length to 500
2017-06-26 02:18:52 +00:00
kibigo!
38a1299975
Stick images inside of CWs
2017-06-25 19:15:03 -07:00
kibigo!
96e1f75679
Fixes to overflows wrt drawer/column
2017-06-25 18:05:28 -07:00
kibigo!
3a99552f0c
Fixed bad drawer custom.css
2017-06-25 17:55:48 -07:00
kibigo!
22cc5c0dec
Improvements to action bar positioning
2017-06-25 17:35:27 -07:00
Surinna Curtis
efa425206c
Move status action bar left
...
This also resolves the issues where sometimes the timestamps wrap and also sits unpleasantly close to the … button.
2017-06-25 18:24:50 -05:00
kibigo!
e60f27d649
Clicking on a collapsed toot just uncollapses it.
2017-06-25 16:09:32 -07:00
kibigo!
6a50e73089
Auto-uncollapse when expanding CW
2017-06-25 15:52:55 -07:00
kibigo!
b1f9892e63
[custom.scss] More media height fixes
2017-06-25 15:29:23 -07:00
kibigo!
d6e3918d92
Disables CW [Show More/Less] links in collapsed toots
2017-06-25 15:25:19 -07:00
kibigo!
6909bbdc9e
[custom.scss] max-height of media now a fixed value
2017-06-25 14:44:52 -07:00
kibigo!
ddc6b85912
Color adjustment to media icons
2017-06-25 14:25:35 -07:00
kibigo!
4bc237fcfe
Adds media icons to toots
2017-06-25 14:22:11 -07:00
kibigo!
efacfec3ed
Media previews for collapsed toots
2017-06-25 13:57:52 -07:00
kibigo!
8ea779e59a
Patching rebase errors
2017-06-25 12:51:31 -07:00
Shel Raphen
7eda83a36a
Glitchsocification
2017-06-25 19:21:51 +00:00
kibigo!
af178d0ba6
Removed no-longer-necessary custom style
2017-06-24 21:28:30 -07:00
Gô Shoemake
e4326b3f12
Merge pull request #26 from ekiru/feature/manual-column-layout-setting
...
User-controlled multi-column/single-column overrides
2017-06-24 20:44:43 -07:00
kibigo!
b8a5052d53
Better style handling at small sizes
2017-06-24 20:36:19 -07:00
kibigo!
7427680e75
Allowed little media rules
2017-06-24 20:14:58 -07:00
kibigo!
ca0d30c04b
OKAY THIS WORKS THIS WORKS
2017-06-24 20:04:46 -07:00
kibigo!
da05cde721
Better settings handling with localSettings (new!)
2017-06-24 19:56:37 -07:00
kibigo!
4c37f629bc
Don't change layout of static pages
2017-06-24 18:30:59 -07:00
kibigo!
ddba5d3b8c
Use Redux store to keep track of layout
2017-06-24 18:30:30 -07:00
Surinna Curtis
ceb545c080
Pass in correct "singleColumn" prop value when auto-columns is not used.
2017-06-24 15:29:46 -05:00
Surinna Curtis
a70468aa56
Support overriding media queries for deciding between single-column/multi-column layouts with a class
2017-06-24 15:29:46 -05:00
beatrix-bitrot
8b23bf7cbd
clean up old avatar class
2017-06-24 03:51:01 +00:00
Matthew Walsh
f1a60d4b81
Unified avatar styling
...
Avatars now have consistent styling across all pages; border radius can be adjusted with a SASS variable ($ui-avatar-border-size)
2017-06-24 03:03:27 +00:00
kibigo!
2513d92c54
Un-hide dropdown menu ;P
2017-06-23 19:39:44 -07:00
kibigo!
414dfb3955
ESLint improvements for Profile Metadata
2017-06-23 18:43:30 -07:00
Gô Shoemake
67adbcc60c
Reblog support for collapsed toots
2017-06-23 18:23:26 -07:00
beatrix-bitrot
453b9c6e7e
missing punctuation
2017-06-23 22:01:04 +00:00
beatrix
d9b9bb8c5e
glitch the getting started image
2017-06-23 21:50:45 +00:00
kibigo!
40ecbfd4a9
Very minor styling improvements to toot-collapsing
2017-06-23 21:50:45 +00:00
kibigo!
4fe45dda9a
Updates height upon collapsing
2017-06-23 21:50:45 +00:00
kibigo!
4bd7482a7a
Minor collapsing button improvements~
2017-06-23 21:50:45 +00:00
kibigo!
93c52301ad
Collapsable toots [1/??] ☕ ️
2017-06-23 21:50:45 +00:00
kibigo!
0d3ec19e89
✨ Profile Metadata HACK 😈
2017-06-23 21:45:14 +00:00
Go Shoemake
62a75891ab
Fixes drawer so stuff doesn't overflow
2017-06-23 21:45:14 +00:00
Charlotte Fields
b27842dc70
cybre cleanup
2017-06-23 21:45:14 +00:00
Chronister
39b6b37b74
cybrespace to 1.4.2
2017-06-23 21:45:14 +00:00
Chronister
65528fc54e
All cybrespace changes through 5/28
2017-06-23 21:45:14 +00:00
Charlotte Fields
382572c213
adding cybre changes
2017-06-23 21:45:14 +00:00
beatrix-bitrot
9bc593d675
update local modifications for cors and cp
2017-06-23 21:45:14 +00:00
beatrix-bitrot
09f7ad3614
silly readme update to test automated deploys
2017-06-23 21:45:14 +00:00
beatrix-bitrot
7c2ea42cd5
update README.md
2017-06-23 21:45:14 +00:00
beatrix
ea785d0baf
Update README.md
2017-06-23 21:45:14 +00:00
Beatrix Bitrot
a337c5dbe5
CORS tweaks
2017-06-23 21:45:14 +00:00