b7fbcb21b3
[Glitch] Add featured hashtags to profiles
...
Port SCSS changes from 364f2ff9aa
2019-02-10 21:50:42 +01:00
7ed2aeb6e9
[Glitch] Allow multiple files upload through web UI, including drag & drop
...
Port 750c67660d
2019-02-10 21:44:14 +01:00
a963ea67dd
[Glitch] Add missing rejection handling for Promises
...
Port missing parts from 2c51bc0ca5
2019-02-10 21:44:14 +01:00
6b2eefc7bf
[Glitch] Add WebP support
...
Port 5092d17f29
2019-02-10 21:13:17 +01:00
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
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>
2019-02-10 18:17:34 +01:00
fb90ec894e
i18n: add Japanese translations ( #10000 )
...
* Add Japanese translations.
* Probably change to more general "統合" than "マージ" .
2019-02-10 21:04:59 +09:00
016ad37bc8
Fix URL linkifier grabbing full-width spaces and quotations ( #9997 )
...
Fix #9993
Fix #5654
2019-02-09 20:13:11 +01:00
a666d1e7ed
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
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 )
2019-02-09 03:39:38 +01:00
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.
2019-02-06 23:36:43 +01:00
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>
2019-02-06 16:46:37 +01:00
1a70fca168
Fix CW unfolding not triggering re-layout in public hashtag page
2019-02-06 15:32:48 +01:00
3ce34ce7a2
Fix unfolding CWs on public hashtag page
...
Fixes #909
2019-02-06 14:37:57 +01:00
e186bd2fb0
Fix Tombstone.delete_all ArgumentError ( #9978 )
2019-02-06 02:50:52 +01:00
46e806cd2f
Rename from instance to server. ( #9938 )
2019-02-05 19:11:24 +01:00
3eb17a3bea
i18n: Update Polish translation 🇵 ( #9974 )
...
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2019-02-05 15:13:34 +01:00
26c1aba658
Do not use apk cache and upgrade ( #9966 )
2019-02-05 15:13:19 +01:00
11d1502853
Replace LibreSSL by OpenSSL ( #9975 )
2019-02-05 15:12:45 +01:00
1ac9a3f4bb
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
5bffb53a76
Fix it as tagged_request of accounts_controller is not addressable_uri ( #9976 )
2019-02-05 15:11:11 +01:00
5c873a4ed7
Update Dockerfile ( #9965 )
2019-02-05 05:11:51 +01:00
76d41475a8
[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
2557cb2f95
Fix pinned statuses being shown in a featured hashtag ( #9971 )
2019-02-05 00:27:18 +01:00
e02a13f64e
Fix not showing custom emojis in share page emoji picker ( #9970 )
2019-02-04 23:14:57 +01:00
88f35f339d
Fix authorized applications list page design ( #9969 )
2019-02-04 22:25:42 +01:00
c78d64d9c3
Use video filesize limit with gifv ( #9924 )
2019-02-04 04:46:05 +01:00
f86413fce2
change "finish tutorial" text to "finish toot-orial" ( #9905 )
2019-02-04 04:45:29 +01:00
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
2019-02-04 04:25:59 +01:00
d14c276e58
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
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>
2019-02-03 03:40:40 +01:00
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>
2019-02-03 03:40:22 +01:00
c9d261753a
Remove redundant “options” from “Compose box options”
...
Thanks @ariasuni.
2019-02-03 01:02:39 +01:00
a0a8203a0b
Minor description corrections
2019-02-03 00:30:34 +01:00
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
2019-02-02 20:22:05 +01:00
582f86ab32
Re-enable ignored translations that is needed ( #7842 )
...
Some of strings should be translated.
2019-02-02 19:37:16 +01:00
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
2019-02-02 19:18:15 +01:00
bcfff65195
Create Redisable#redis ( #9633 )
...
* Create Redisable
* Use #redis instead of Redis.current
2019-02-02 19:11:38 +01:00
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.
2019-02-02 19:01:18 +01:00
5092d17f29
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
b253d3e0c2
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
1cd7b15532
Merge pull request #904 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-02-01 18:24:36 +01:00
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
2e93f87c9f
[Glitch] Replace unlock-alt icon with unlock
...
Port 6513f6c953
2019-02-01 16:15:44 +01:00
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
f611da4899
Do not mark toots as sensitive if they don't have any media attached
2019-02-01 15:55:28 +01:00
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
3de63b3c35
More corrections for the Slovak translation ( #9959 )
2019-02-01 09:18:40 +09:00
ad8c71c985
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
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
2019-02-01 00:14:05 +01:00
Thibaut Girka