Thibaut Girka
d96df46a63
[Glitch] Rename from instance to server.
...
Port f308fb56ab
to glitch-soc
6 years ago
Thibaut Girka
75187f908a
[Glitch] Fix not showing custom emojis in share page emoji picker
...
Port b037f6cec5
to glitch-soc
6 years ago
Thibaut Girka
b3fc70d13e
[Glitch] Add featured hashtags to profiles
...
Port SCSS changes from d2d4d38f22
6 years ago
Thibaut Girka
07f0cf8573
[Glitch] Allow multiple files upload through web UI, including drag & drop
...
Port 640966f3fc
to glitch-soc
6 years ago
Thibaut Girka
5946d76d0a
[Glitch] Add missing rejection handling for Promises
...
Port missing parts from d88504ec84
to glitch-soc
6 years ago
Thibaut Girka
538bae9f53
[Glitch] Add WebP support
...
Port bcf34e31bd
to glitch-soc
6 years ago
Thibaut Girka
1c37ad108c
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]
a3d1413871
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
5e94fb5386
i18n: add Japanese translations ( #10000 )
...
* Add Japanese translations.
* Probably change to more general "統合" than "マージ" .
6 years ago
Eugen Rochko
5adc3f5676
Fix URL linkifier grabbing full-width spaces and quotations ( #9997 )
...
Fix #9993
Fix #5654
6 years ago
rinsuki
ae8392a11d
Enable "displaying application used to post" setting by default ( #9994 )
...
related: https://github.com/tootsuite/mastodon/pull/9897#issuecomment-461093615
6 years ago
Hinaloe
cce3319bc2
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
d66346eb0c
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]
84c2532862
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
a9078c18eb
Fix CW unfolding not triggering re-layout in public hashtag page
6 years ago
Thibaut Girka
d55233da9a
Fix unfolding CWs on public hashtag page
...
Fixes #909
6 years ago
abcang
4a8a8bcb8a
Fix Tombstone.delete_all ArgumentError ( #9978 )
6 years ago
mayaeh
f308fb56ab
Rename from instance to server. ( #9938 )
6 years ago
marcin mikołajczak
72f55c7cdf
i18n: Update Polish translation 🇵 ( #9974 )
...
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
6 years ago
J0WI
96f3621ad9
Do not use apk cache and upgrade ( #9966 )
6 years ago
J0WI
bda1a39dd2
Replace LibreSSL by OpenSSL ( #9975 )
6 years ago
ThibG
fdb8fa6f2b
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
3d54d631a4
Fix it as tagged_request of accounts_controller is not addressable_uri ( #9976 )
6 years ago
ashleyhull-versent
c00cf2b83b
Update Dockerfile ( #9965 )
6 years ago
trwnh
9ce59ef31d
[UI] Fix whitespace being applied to div instead of p ( #9968 )
...
* fix large line breaks
* fix ascii art posts
6 years ago
Eugen Rochko
06a8ca8937
Fix pinned statuses being shown in a featured hashtag ( #9971 )
6 years ago
rinsuki
b037f6cec5
Fix not showing custom emojis in share page emoji picker ( #9970 )
6 years ago
rinsuki
d280cc15be
Fix authorized applications list page design ( #9969 )
6 years ago
rinsuki
18af20b9cf
Use video filesize limit with gifv ( #9924 )
6 years ago
mike castleman
be6c12fbea
change "finish tutorial" text to "finish toot-orial" ( #9905 )
6 years ago
Eugen Rochko
d2d4d38f22
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
1f303e5591
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]
49c71bc1a2
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]
4e8e5bdda9
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
dcf363a623
Remove redundant “options” from “Compose box options”
...
Thanks @ariasuni.
6 years ago
Marek Ľach
43b2f021eb
Minor description corrections
6 years ago
tmm576
640966f3fc
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
174fcfe6d6
Re-enable ignored translations that is needed ( #7842 )
...
Some of strings should be translated.
6 years ago
ThibG
dfb101cd45
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
9cad360caa
Create Redisable#redis ( #9633 )
...
* Create Redisable
* Use #redis instead of Redis.current
6 years ago
Jakub Mendyk
234e8105da
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 (硫酸鶏)
bcf34e31bd
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
73558377c9
Upgrade new Web Share Target API ( #9963 )
...
* Update manifest.json for new Web Share Target API.
* fix code formatting
6 years ago
ThibG
e04845c06c
Merge pull request #904 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
6 years ago
Eugen Rochko
252a765368
Fix link color in high-contrast theme, add underlines ( #9949 )
...
Improve sorting of default themes in the dropdown
6 years ago
Thibaut Girka
fba0f7dae7
[Glitch] Replace unlock-alt icon with unlock
...
Port 4fb1d8129d
to glitch-soc
6 years ago
Thibaut Girka
aaf98669a5
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
b0e7af725a
Do not mark toots as sensitive if they don't have any media attached
6 years ago
Thibaut Girka
afdf789d06
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
42bd0e3a51
More corrections for the Slovak translation ( #9959 )
6 years ago