tmm576
30af4ee65f
Hide floating action button on search and getting started pages ( #9826 )
6 years ago
ThibG
3b3a4d8a17
Fix public hashtag timeline width on mobile, fix scrollbar width compensation ( #9824 )
...
* Fix hashtag timeline width being potentially larger than window width
* Add automatic computation of scrollbar width
6 years ago
Aditoo17
f2f9d50a13
I18n: Update Czech translation ( #9814 )
...
* I18n: Update Czech translation
* I18n: Update Czech translation
* I18n: Update Czech translation
Small fix
6 years ago
Eugen Rochko
bc642ac24b
Redesign public hashtag page to use a masonry layout ( #9822 )
6 years ago
Eugen Rochko
4ab42287c0
Use summary as summary for converted ActivityPub objects ( #9823 )
...
Fix #8609
6 years ago
ThibG
530d29148c
Merge pull request #887 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
6 years ago
Eugen Rochko
59e3a7f87b
Fix `tootctl domains crawl` with JSON format output crash ( #9820 )
...
Fix #9817
6 years ago
ThibG
a4f07bad95
Reduce chances of race conditions when processing deleted toots ( #9815 )
...
* Reduce chances of race conditions when processing deleted toots
* Prevent race condition when processing deleted toots
6 years ago
Thibaut Girka
5684cd090c
[Glitch] make draggingOver state off correctly
...
Port d6433b3931
to glitch-soc
6 years ago
Thibaut Girka
92830029ca
[Glitch] Make hashtag search results link to the hashtag URL
...
Port 6cfb357940
to glitch-soc
6 years ago
Thibaut Girka
ad32896a93
[Glitch] Fix hashtag timeline on mobile
...
Port c5b8824a3e
to glitch-soc
6 years ago
Thibaut Girka
dbe311f0e9
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- config/locales/simple_form.pl.yml
6 years ago
Daigo 3 Dango
5363c724fc
User ruby2.6.0 on Heroku ( #9818 )
6 years ago
Moritz Heiber
ecf40d09ed
Disable Same-Site cookie implementation to fix SSO issues on WebKit browsers ( #9819 )
6 years ago
Renato "Lond" Cerqueira
a12f6d10cc
Weblate translations (2019-01-15) ( #9813 )
...
* Translated using Weblate (Occitan)
Currently translated at 100,0% (356 of 356 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/oc/
* Translated using Weblate (Occitan)
Currently translated at 99,5% (748 of 752 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/oc/
* Translated using Weblate (Arabic)
Currently translated at 98,6% (351 of 356 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/
* Translated using Weblate (Arabic)
Currently translated at 92,3% (694 of 752 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/
* Translated using Weblate (Korean)
Currently translated at 99,4% (354 of 356 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ko/
* Translated using Weblate (Persian)
Currently translated at 89,3% (318 of 356 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fa/
* Translated using Weblate (Portuguese)
Currently translated at 64,6% (230 of 356 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt/
* Translated using Weblate (Dutch)
Currently translated at 99,4% (354 of 356 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/
* Translated using Weblate (Chinese (Simplified))
Currently translated at 77,2% (275 of 356 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/zh_Hans/
* Translated using Weblate (Hebrew)
Currently translated at 61,5% (219 of 356 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/he/
* Translated using Weblate (Galician)
Currently translated at 99,2% (353 of 356 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/gl/
* Translated using Weblate (Chinese (Hong Kong))
Currently translated at 77,5% (276 of 356 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/zh_Hant_HK/
* Translated using Weblate (French)
Currently translated at 99,4% (354 of 356 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/
* Translated using Weblate (Polish)
Currently translated at 94,9% (338 of 356 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pl/
* Translated using Weblate (Norwegian (old code))
Currently translated at 65,7% (234 of 356 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/no/
* Translated using Weblate (Catalan)
Currently translated at 99,4% (354 of 356 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ca/
* Translated using Weblate (German)
Currently translated at 99,2% (353 of 356 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/de/
* Translated using Weblate (Czech)
Currently translated at 99,4% (354 of 356 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cs/
* Translated using Weblate (Romanian)
Currently translated at 11,7% (88 of 752 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ro/
* Translated using Weblate (Telugu)
Currently translated at 13,0% (98 of 752 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/te/
* Translated using Weblate (Corsican)
Currently translated at 99,4% (354 of 356 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/co/
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 91,8% (690 of 752 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/
* Translated using Weblate (French)
Currently translated at 100,0% (107 of 107 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fr/
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 98,6% (351 of 356 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt_BR/
* Translated using Weblate (Spanish)
Currently translated at 87,1% (310 of 356 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/es/
* Translated using Weblate (Romanian)
Currently translated at 99,2% (353 of 356 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ro/
* Translated using Weblate (French)
Currently translated at 100,0% (356 of 356 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/
* Translated using Weblate (Polish)
Currently translated at 100.0% (356 of 356 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pl/
* Translated using Weblate (Polish)
Currently translated at 95.1% (715 of 752 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pl/
* Translated using Weblate (Polish)
Currently translated at 91.6% (98 of 107 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/pl/
* Translated using Weblate (Polish)
Currently translated at 96.8% (61 of 63 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/pl/
* Translated using Weblate (Polish)
Currently translated at 100.0% (63 of 63 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/pl/
* Translated using Weblate (Polish)
Currently translated at 100.0% (107 of 107 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/pl/
* Translated using Weblate (Japanese)
Currently translated at 89.4% (672 of 752 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/
* Translated using Weblate (French)
Currently translated at 98.9% (744 of 752 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/
* Translated using Weblate (Polish)
Currently translated at 97.9% (736 of 752 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pl/
* Translated using Weblate (Slovak)
Currently translated at 94.3% (709 of 752 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/
* Translated using Weblate (Welsh)
Currently translated at 82.8% (623 of 752 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cy/
* Translated using Weblate (Japanese)
Currently translated at 98.9% (352 of 356 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/
* Translated using Weblate (Galician)
Currently translated at 100,0% (356 of 356 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/gl/
* Translated using Weblate (Japanese)
Currently translated at 89,2% (671 of 752 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/
* Translated using Weblate (Slovak)
Currently translated at 96,3% (724 of 752 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/
* Translated using Weblate (Korean)
Currently translated at 100.0% (356 of 356 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ko/
* Translated using Weblate (Galician)
Currently translated at 98.9% (744 of 752 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/
* Translated using Weblate (Korean)
Currently translated at 95.9% (721 of 752 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ko/
* Translated using Weblate (Galician)
Currently translated at 100,0% (752 of 752 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/
* Translated using Weblate (Korean)
Currently translated at 96,1% (723 of 752 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ko/
* Translated using Weblate (Korean)
Currently translated at 100.0% (752 of 752 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ko/
* Translated using Weblate (Corsican)
Currently translated at 100.0% (356 of 356 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/co/
* Translated using Weblate (Greek)
Currently translated at 99.9% (751 of 752 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 91.8% (690 of 752 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/
* Translated using Weblate (German)
Currently translated at 100,0% (356 of 356 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/de/
* Translated using Weblate (Corsican)
Currently translated at 99,9% (751 of 752 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/co/
* Translated using Weblate (French)
Currently translated at 98,9% (744 of 752 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/
* Translated using Weblate (German)
Currently translated at 99,9% (751 of 752 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/
* Translated using Weblate (Czech)
Currently translated at 100.0% (356 of 356 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cs/
* Translated using Weblate (Dutch)
Currently translated at 100,0% (107 of 107 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/nl/
* Translated using Weblate (Czech)
Currently translated at 99,9% (751 of 752 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/
* Translated using Weblate (Dutch)
Currently translated at 100,0% (356 of 356 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/
* Translated using Weblate (German)
Currently translated at 100.0% (356 of 356 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/de/
* Translated using Weblate (Czech)
Currently translated at 99.9% (751 of 752 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/
* Translated using Weblate (Dutch)
Currently translated at 98.3% (739 of 752 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/
* Translated using Weblate (Japanese)
Currently translated at 89.5% (673 of 752 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/
* Translated using Weblate (Slovak)
Currently translated at 99.3% (747 of 752 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/
* Translated using Weblate (Dutch)
Currently translated at 100.0% (356 of 356 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/
* Translated using Weblate (Slovak)
Currently translated at 100.0% (356 of 356 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/
* Translated using Weblate (Japanese)
Currently translated at 98.9% (352 of 356 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/
* Translated using Weblate (German)
Currently translated at 100.0% (107 of 107 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/de/
* Translated using Weblate (Slovak)
Currently translated at 100.0% (107 of 107 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sk/
* Translated using Weblate (Catalan)
Currently translated at 100,0% (356 of 356 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ca/
* Translated using Weblate (Catalan)
Currently translated at 100,0% (752 of 752 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/
* Translated using Weblate (German)
Currently translated at 100.0% (356 of 356 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/de/
* Translated using Weblate (Indonesian)
Currently translated at 32.3% (243 of 752 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/id/
* Translated using Weblate (Welsh)
Currently translated at 89.8% (675 of 752 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cy/
* Translated using Weblate (Welsh)
Currently translated at 94.4% (336 of 356 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cy/
* Translated using Weblate (Japanese)
Currently translated at 89.5% (673 of 752 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/
* Translated using Weblate (Occitan)
Currently translated at 99.9% (751 of 752 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/oc/
* Translated using Weblate (Slovak)
Currently translated at 99.7% (750 of 752 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/
* Translated using Weblate (Welsh)
Currently translated at 94.4% (336 of 356 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cy/
* Translated using Weblate (Slovak)
Currently translated at 99.7% (750 of 752 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/
* Translated using Weblate (Slovak)
Currently translated at 100.0% (356 of 356 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/
* Translated using Weblate (Dutch)
Currently translated at 100,0% (752 of 752 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/
* Translated using Weblate (Japanese)
Currently translated at 90,7% (682 of 752 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 93,5% (703 of 752 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/
* Translated using Weblate (Dutch)
Currently translated at 100.0% (752 of 752 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/
* Translated using Weblate (Dutch)
Currently translated at 100.0% (356 of 356 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/
* Translated using Weblate (Dutch)
Currently translated at 100.0% (107 of 107 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/nl/
* Normalize translations
* Add missing plurals, fix interpolations
* Translated using Weblate (Japanese)
Currently translated at 90.7% (682 of 752 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/
* Normalize translations
6 years ago
Eugen Rochko
ee5e24807f
Add `tootctl domains crawl` ( #9809 )
6 years ago
ThibG
6cfb357940
Make hashtag search results link to the hashtag URL ( #9810 )
...
Currently, middle-clicking on a hashtag search result will open a new
instance of the WebUI, which is inconsistent with middle-clicking on
an account result, or a hashtag in a toot.
6 years ago
ThibG
c5b8824a3e
Fix hashtag timeline on mobile ( #9806 )
...
Instead of forcing 90vh for the scrollable part of the timeline's height as
in #9781 (which may be off), use `display: flex`, exactly like on desktop.
6 years ago
ThibG
2648645d05
Display a double reply arrow on public pages for toots that are replies ( #9808 )
6 years ago
Renato "Lond" Cerqueira
5c5e14c816
Fix undefined method error in sidekiq ( #9807 )
...
* Fix undefined method error in sidekiq
Body can be not nil but still be empty, which causes a
`NoMethodError: undefined method `[]' for nil:NilClass` further in the
code. This checks for an empty body to avoid the issue.
* Fix codeclimate issue
6 years ago
dependabot[bot]
b4e6384aea
Bump aws-sdk-s3 from 1.30.0 to 1.30.1 ( #9799 )
...
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby ) from 1.30.0 to 1.30.1.
- [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/commits )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
dependabot[bot]
a04b2bc728
Bump pg from 1.1.3 to 1.1.4 ( #9798 )
...
Bumps [pg](https://bitbucket.org/ged/ruby-pg ) from 1.1.3 to 1.1.4.
- [Changelog](https://bitbucket.org/ged/ruby-pg/src/default/History.rdoc )
- [Commits](https://bitbucket.org/ged/ruby-pg/branches/compare/v1.1.4..v1.1.3 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
ThibG
077639c274
Merge pull request #886 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
6 years ago
dependabot[bot]
5ac425ad28
Bump sidekiq-unique-jobs from 5.0.10 to 6.0.8 ( #9801 )
...
Bumps [sidekiq-unique-jobs](https://github.com/mhenrixon/sidekiq-unique-jobs ) from 5.0.10 to 6.0.8.
- [Release notes](https://github.com/mhenrixon/sidekiq-unique-jobs/releases )
- [Changelog](https://github.com/mhenrixon/sidekiq-unique-jobs/blob/master/CHANGELOG.md )
- [Commits](https://github.com/mhenrixon/sidekiq-unique-jobs/compare/v5.0.10...v6.0.8 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
dependabot[bot]
12307c5648
Bump nokogiri from 1.10.0 to 1.10.1 ( #9802 )
...
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri ) from 1.10.0 to 1.10.1.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases )
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.md )
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.10.0...v1.10.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
dependabot[bot]
f074d2f690
Bump nsa from 0.2.4 to 0.2.7 ( #9800 )
...
Bumps [nsa](https://github.com/localshred/nsa ) from 0.2.4 to 0.2.7.
- [Release notes](https://github.com/localshred/nsa/releases )
- [Commits](https://github.com/localshred/nsa/commits )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
dependabot[bot]
944de8a6c9
Bump dotenv-rails from 2.5.0 to 2.6.0 ( #9803 )
...
Bumps [dotenv-rails](https://github.com/bkeepers/dotenv ) from 2.5.0 to 2.6.0.
- [Release notes](https://github.com/bkeepers/dotenv/releases )
- [Changelog](https://github.com/bkeepers/dotenv/blob/master/Changelog.md )
- [Commits](https://github.com/bkeepers/dotenv/commits )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
Hinaloe
d6433b3931
make draggingOver state off correctly ( #9797 )
...
* make draggingOver stat off correctly
* ignore safari and Edge
* Revert "ignore safari and Edge"
This reverts commit b9b93ea3674877670161207a3f9b3a4f82b68a2d.
* Revert "make draggingOver stat off correctly"
This reverts commit f5fd6b94dc1d4b812e0b910b2b4f35792c3ea3a1.
* clear drag stack when drop
6 years ago
Thibaut Girka
4cec7a77c3
[Glitch] Adjust admin UI right panel size
...
Port 9ee9cb549b
to glitch-soc
6 years ago
Thibaut Girka
2c5f0f12ac
[Glitch] change height on narrow view to take 100% of screen
...
Port 1183246043
to glitch-soc
6 years ago
Thibaut Girka
278ff1318f
[Glitch] Add attachment list fallback to public pages
...
Port JS changes from 4fb94c758e
to glitch-soc
6 years ago
Thibaut Girka
eff1c94744
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
ThibG
4fb94c758e
Add attachment list fallback to public pages ( #9780 )
...
* Add attachment list fallback to public pages
Fixes #6714
* Refactor attachments lists
6 years ago
Jeong Arm
9ee9cb549b
Adjust admin UI right panel size ( #9768 )
...
* Adjust admin UI right panel size
* Fix typo
6 years ago
ThibG
2cfa55185a
Merge pull request #885 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
6 years ago
Mateusz Bugowski
1183246043
change height on narrow view to take 100% of screen ( #9781 )
...
* change height on narrow view to take 100% of screen
* add empty line before @media
6 years ago
ThibG
c3a657223f
Hide CWed content in notifications and fix sensitive images without CWs ( #9778 )
...
Fixes #9634
6 years ago
ysksn
c059999ab3
Add a spec for Admin::ActionLog ( #9775 )
6 years ago
dependabot[bot]
43ff92dfc8
Bump sidekiq from 5.2.3 to 5.2.5 ( #9765 )
...
Bumps [sidekiq](https://github.com/mperham/sidekiq ) from 5.2.3 to 5.2.5.
- [Release notes](https://github.com/mperham/sidekiq/releases )
- [Changelog](https://github.com/mperham/sidekiq/blob/master/Changes.md )
- [Commits](https://github.com/mperham/sidekiq/compare/v5.2.3...v5.2.5 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
dependabot[bot]
b7ace49a73
Bump webpush from 0.3.5 to 0.3.6 ( #9783 )
...
Bumps [webpush](https://github.com/zaru/webpush ) from 0.3.5 to 0.3.6.
- [Release notes](https://github.com/zaru/webpush/releases )
- [Changelog](https://github.com/zaru/webpush/blob/master/CHANGELOG.md )
- [Commits](https://github.com/zaru/webpush/compare/v0.3.5...v0.3.6 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
ysksn
09c3c96607
Add specs for Admin::AccountAction ( #9767 )
6 years ago
Thibaut Girka
394525e329
[Glitch] Postpone scroll-to-detailed status after react components are loaded
...
Port 70801b850c
to glitch-soc
6 years ago
Thibaut Girka
7cc800d0df
[Glitch] Redesign admin instances area
...
Port SCSS changes from 1c6588accc
6 years ago
Thibaut Girka
e03813cf0a
[Glitch] Stop gifv timeline preview explicitly when open the media gallery
...
Port cf3c0fc38c
to glitch-soc
6 years ago
Thibaut Girka
147f4f9fd2
[Glitch] refactored account.js
...
Port 57c91fbbed
to glitch-soc
6 years ago
Thibaut Girka
ec441e0299
[Glitch] Fix embed play icons regression
...
Port bd5a8c7765
to glitch-soc
6 years ago
Thibaut Girka
2b2584a37b
[Glitch] Display fallback link card thumbnail when none is given
...
Port 1512af2811
to glitch-soc
6 years ago
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.
6 years ago
Thibaut Girka
fb0c906c71
Revert "Revert "Add handler for Move activity ( #9629 )""
...
This reverts commit bb96a74637
.
6 years ago
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
6 years ago