75187f908a
[Glitch] Fix not showing custom emojis in share page emoji picker
...
Port b037f6cec5
2019-02-10 21:54:43 +01:00
b3fc70d13e
[Glitch] Add featured hashtags to profiles
...
Port SCSS changes from d2d4d38f22
2019-02-10 21:50:42 +01:00
07f0cf8573
[Glitch] Allow multiple files upload through web UI, including drag & drop
...
Port 640966f3fc
2019-02-10 21:44:14 +01:00
5946d76d0a
[Glitch] Add missing rejection handling for Promises
...
Port missing parts from d88504ec84
2019-02-10 21:44:14 +01:00
538bae9f53
[Glitch] Add WebP support
...
Port bcf34e31bd
2019-02-10 21:13:17 +01:00
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.
2019-02-10 21:10:09 +01:00
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>
2019-02-10 18:17:34 +01:00
5e94fb5386
i18n: add Japanese translations ( #10000 )
...
* Add Japanese translations.
* Probably change to more general "統合" than "マージ" .
2019-02-10 21:04:59 +09:00
5adc3f5676
Fix URL linkifier grabbing full-width spaces and quotations ( #9997 )
...
Fix #9993
Fix #5654
2019-02-09 20:13:11 +01:00
ae8392a11d
Enable "displaying application used to post" setting by default ( #9994 )
...
related: https://github.com/tootsuite/mastodon/pull/9897#issuecomment-461093615
2019-02-09 17:33:41 +01:00
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 )
2019-02-09 03:39:38 +01:00
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.
2019-02-06 23:36:43 +01:00
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>
2019-02-06 16:46:37 +01:00
a9078c18eb
Fix CW unfolding not triggering re-layout in public hashtag page
2019-02-06 15:32:48 +01:00
d55233da9a
Fix unfolding CWs on public hashtag page
...
Fixes #909
2019-02-06 14:37:57 +01:00
4a8a8bcb8a
Fix Tombstone.delete_all ArgumentError ( #9978 )
2019-02-06 02:50:52 +01:00
f308fb56ab
Rename from instance to server. ( #9938 )
2019-02-05 19:11:24 +01:00
72f55c7cdf
i18n: Update Polish translation 🇵 ( #9974 )
...
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2019-02-05 15:13:34 +01:00
96f3621ad9
Do not use apk cache and upgrade ( #9966 )
2019-02-05 15:13:19 +01:00
bda1a39dd2
Replace LibreSSL by OpenSSL ( #9975 )
2019-02-05 15:12:45 +01:00
fdb8fa6f2b
Hide misleading “You will be sent a confirmation e-mail” hint from admin view ( #9973 )
...
Thanks @wryk for noticing this issue.
2019-02-05 15:11:35 +01:00
3d54d631a4
Fix it as tagged_request of accounts_controller is not addressable_uri ( #9976 )
2019-02-05 15:11:11 +01:00
c00cf2b83b
Update Dockerfile ( #9965 )
2019-02-05 05:11:51 +01:00
9ce59ef31d
[UI] Fix whitespace being applied to div instead of p ( #9968 )
...
* fix large line breaks
* fix ascii art posts
2019-02-05 04:46:18 +01:00
06a8ca8937
Fix pinned statuses being shown in a featured hashtag ( #9971 )
2019-02-05 00:27:18 +01:00
b037f6cec5
Fix not showing custom emojis in share page emoji picker ( #9970 )
2019-02-04 23:14:57 +01:00
d280cc15be
Fix authorized applications list page design ( #9969 )
2019-02-04 22:25:42 +01:00
18af20b9cf
Use video filesize limit with gifv ( #9924 )
2019-02-04 04:46:05 +01:00
be6c12fbea
change "finish tutorial" text to "finish toot-orial" ( #9905 )
2019-02-04 04:45:29 +01:00
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
2019-02-04 04:25:59 +01:00
1f303e5591
Add option to overwrite imported data ( #9962 )
...
* Add option to overwrite imported data
Fix #7465
* Add import for domain blocks
2019-02-03 03:59:51 +01:00
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>
2019-02-03 03:40:40 +01:00
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>
2019-02-03 03:40:22 +01:00
dcf363a623
Remove redundant “options” from “Compose box options”
...
Thanks @ariasuni.
2019-02-03 01:02:39 +01:00
43b2f021eb
Minor description corrections
2019-02-03 00:30:34 +01:00
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
2019-02-02 20:22:05 +01:00
174fcfe6d6
Re-enable ignored translations that is needed ( #7842 )
...
Some of strings should be translated.
2019-02-02 19:37:16 +01:00
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
2019-02-02 19:18:15 +01:00
9cad360caa
Create Redisable#redis ( #9633 )
...
* Create Redisable
* Use #redis instead of Redis.current
2019-02-02 19:11:38 +01:00
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.
2019-02-02 19:01:18 +01:00
bcf34e31bd
Add WebP support ( #9879 )
...
* Add WebP support
* Remove the changes to the tooltip
refs: https://github.com/tootsuite/mastodon/pull/9879#pullrequestreview-199312528
2019-02-02 12:25:04 +01:00
73558377c9
Upgrade new Web Share Target API ( #9963 )
...
* Update manifest.json for new Web Share Target API.
* fix code formatting
2019-02-02 01:26:49 +01:00
e04845c06c
Merge pull request #904 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-02-01 18:24:36 +01:00
252a765368
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
fba0f7dae7
[Glitch] Replace unlock-alt icon with unlock
...
Port 4fb1d8129d
2019-02-01 16:15:44 +01:00
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
2019-02-01 16:12:20 +01:00
b0e7af725a
Do not mark toots as sensitive if they don't have any media attached
2019-02-01 15:55:28 +01:00
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.
2019-02-01 12:37:28 +01:00
42bd0e3a51
More corrections for the Slovak translation ( #9959 )
2019-02-01 09:18:40 +09:00
9cef8f1eb7
Fix link color in high-contrast theme, add underlines ( #9949 )
...
Improve sorting of default themes in the dropdown
2019-02-01 00:15:38 +01:00
Thibaut Girka