Thibaut Girka
a963ea67dd
[Glitch] Add missing rejection handling for Promises
...
Port missing parts from 2c51bc0ca5
to glitch-soc
6 years ago
Thibaut Girka
6b2eefc7bf
[Glitch] Add WebP support
...
Port 5092d17f29
to glitch-soc
6 years ago
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.
6 years ago
dependabot[bot]
3031b8a8f2
Bump parallel_tests from 2.27.1 to 2.28.0 ( #9985 )
...
Bumps [parallel_tests](https://github.com/grosser/parallel_tests ) from 2.27.1 to 2.28.0.
- [Release notes](https://github.com/grosser/parallel_tests/releases )
- [Commits](https://github.com/grosser/parallel_tests/compare/v2.27.1...v2.28.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
mayaeh
fb90ec894e
i18n: add Japanese translations ( #10000 )
...
* Add Japanese translations.
* Probably change to more general "統合" than "マージ" .
6 years ago
Eugen Rochko
016ad37bc8
Fix URL linkifier grabbing full-width spaces and quotations ( #9997 )
...
Fix #9993
Fix #5654
6 years ago
rinsuki
a666d1e7ed
Enable "displaying application used to post" setting by default ( #9994 )
...
related: https://github.com/tootsuite/mastodon/pull/9897#issuecomment-461093615
6 years ago
Hinaloe
157d3af46c
Only URLs extract with pre-escaped text ( #9991 )
...
* [test] add japanese hashtag testcase
* Only URLs extract with pre-escaped text
( https://github.com/tootsuite/mastodon/issues/9989 )
6 years ago
ThibG
d09ce6d81b
Fix IntersectionObserverArticle not hiding some out-of-view items ( #9982 )
...
IntersectionObserverArticle is made to save on RAM by avoiding fully rendering
items that are far out of view. However, it did not work for items spawned
outside the intersection observer.
6 years ago
dependabot[bot]
e28fe2ef26
Bump microformats from 4.0.7 to 4.1.0 ( #9980 )
...
Bumps [microformats](https://github.com/microformats/microformats-ruby ) from 4.0.7 to 4.1.0.
- [Release notes](https://github.com/microformats/microformats-ruby/releases )
- [Commits](https://github.com/microformats/microformats-ruby/compare/v4.0.7...v4.1.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
Thibaut Girka
1a70fca168
Fix CW unfolding not triggering re-layout in public hashtag page
6 years ago
Thibaut Girka
3ce34ce7a2
Fix unfolding CWs on public hashtag page
...
Fixes #909
6 years ago
abcang
e186bd2fb0
Fix Tombstone.delete_all ArgumentError ( #9978 )
6 years ago
mayaeh
46e806cd2f
Rename from instance to server. ( #9938 )
6 years ago
marcin mikołajczak
3eb17a3bea
i18n: Update Polish translation 🇵 ( #9974 )
...
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
6 years ago
J0WI
26c1aba658
Do not use apk cache and upgrade ( #9966 )
6 years ago
J0WI
11d1502853
Replace LibreSSL by OpenSSL ( #9975 )
6 years ago
ThibG
1ac9a3f4bb
Hide misleading “You will be sent a confirmation e-mail” hint from admin view ( #9973 )
...
Thanks @wryk for noticing this issue.
6 years ago
Takeshi Umeda
5bffb53a76
Fix it as tagged_request of accounts_controller is not addressable_uri ( #9976 )
6 years ago
ashleyhull-versent
5c873a4ed7
Update Dockerfile ( #9965 )
6 years ago
trwnh
76d41475a8
[UI] Fix whitespace being applied to div instead of p ( #9968 )
...
* fix large line breaks
* fix ascii art posts
6 years ago
Eugen Rochko
2557cb2f95
Fix pinned statuses being shown in a featured hashtag ( #9971 )
6 years ago
rinsuki
e02a13f64e
Fix not showing custom emojis in share page emoji picker ( #9970 )
6 years ago
rinsuki
88f35f339d
Fix authorized applications list page design ( #9969 )
6 years ago
rinsuki
c78d64d9c3
Use video filesize limit with gifv ( #9924 )
6 years ago
mike castleman
f86413fce2
change "finish tutorial" text to "finish toot-orial" ( #9905 )
6 years ago
Eugen Rochko
364f2ff9aa
Add featured hashtags to profiles ( #9755 )
...
* Add hashtag filter to profiles
GET /@:username/tagged/:hashtag
GET /api/v1/accounts/:id/statuses?tagged=:hashtag
* Display featured hashtags on public profile
* Use separate model for featured tags
* Update featured hashtag counters on-write
* Limit featured tags to 10
6 years ago
Eugen Rochko
d14c276e58
Add option to overwrite imported data ( #9962 )
...
* Add option to overwrite imported data
Fix #7465
* Add import for domain blocks
6 years ago
dependabot[bot]
c5071f2d78
Bump capybara from 3.12.0 to 3.13.2 ( #9935 )
...
Bumps [capybara](https://github.com/teamcapybara/capybara ) from 3.12.0 to 3.13.2.
- [Release notes](https://github.com/teamcapybara/capybara/releases )
- [Changelog](https://github.com/teamcapybara/capybara/blob/master/History.md )
- [Commits](https://github.com/teamcapybara/capybara/compare/3.12.0...3.13.2 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
dependabot[bot]
7e33d6d192
Bump httplog from 1.2.0 to 1.2.1 ( #9942 )
...
Bumps [httplog](https://github.com/trusche/httplog ) from 1.2.0 to 1.2.1.
- [Release notes](https://github.com/trusche/httplog/releases )
- [Changelog](https://github.com/trusche/httplog/blob/master/CHANGELOG.md )
- [Commits](https://github.com/trusche/httplog/compare/v1.2.0...v1.2.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
Thibaut Girka
c9d261753a
Remove redundant “options” from “Compose box options”
...
Thanks @ariasuni .
6 years ago
Marek Ľach
a0a8203a0b
Minor description corrections
6 years ago
tmm576
750c67660d
Allow multiple files upload through web UI, including drag & drop ( #9856 )
...
* Allow drag and drop uploads of multiple files to compose
* Calculate aggregate upload progress for single action
* Allow multiple uploads to compose through traditional input, consolidate update file limit logic, provide file limit feedback
6 years ago
Jeong Arm
582f86ab32
Re-enable ignored translations that is needed ( #7842 )
...
Some of strings should be translated.
6 years ago
ThibG
ed30110618
Make displaying application used to toot opt-in ( #9897 )
...
* Make storing and displaying application used to toot opt-in
* Revert to storing application info, and display it to the author via API
6 years ago
ysksn
bcfff65195
Create Redisable#redis ( #9633 )
...
* Create Redisable
* Use #redis instead of Redis.current
6 years ago
Jakub Mendyk
6a5e3da6b0
Allow most kinds of characters in URL query ( fixes #8408 ) ( #8447 )
...
* Allow unicode characters in URL query strings
Fixes #8408
* Alternative approach to unicode support in urls
Adds PoC/idea to approch this problem.
6 years ago
Acid Chicken (硫酸鶏)
5092d17f29
Add WebP support ( #9879 )
...
* Add WebP support
* Remove the changes to the tooltip
refs: https://github.com/tootsuite/mastodon/pull/9879#pullrequestreview-199312528
6 years ago
gol-cha
b253d3e0c2
Upgrade new Web Share Target API ( #9963 )
...
* Update manifest.json for new Web Share Target API.
* fix code formatting
6 years ago
ThibG
1cd7b15532
Merge pull request #904 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
6 years ago
Eugen Rochko
663593b508
Fix link color in high-contrast theme, add underlines ( #9949 )
...
Improve sorting of default themes in the dropdown
6 years ago
Thibaut Girka
2e93f87c9f
[Glitch] Replace unlock-alt icon with unlock
...
Port 6513f6c953
to glitch-soc
6 years ago
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
6 years ago
Thibaut Girka
f611da4899
Do not mark toots as sensitive if they don't have any media attached
6 years ago
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.
6 years ago
Marek Ľach
3de63b3c35
More corrections for the Slovak translation ( #9959 )
6 years ago
Eugen Rochko
ad8c71c985
Fix link color in high-contrast theme, add underlines ( #9949 )
...
Improve sorting of default themes in the dropdown
6 years ago
Eugen Rochko
1f95190202
Refactor icons in web UI to use Icon component ( #9951 )
...
* Refactor uses of icons to an Icon component in web UI
* Refactor options passed to the Icon component
* Make tests work with absolute component paths
6 years ago
Marek Ľach
3383ed7573
Update the Slovak translation ( #9958 )
6 years ago
Marek Ľach
0167659f5f
Distinguish error messaging for mystyped URLs and deleted accounts ( #9957 )
6 years ago