ThibG
d9418d08e3
Merge pull request #1278 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2020-02-06 22:48:26 +01:00
ThibG
d0a1423daf
[Glitch] Fix dates (without time) being rendered as datetimes in public pages
...
Port f7deab10a5
2020-02-06 21:41:50 +01:00
fuyu
0c266be79b
[Glitch] Don't display toggle reveal button in video modal when full screen
...
Port b8db3b4cdf
2020-02-06 21:39:26 +01:00
Thibaut Girka
ba1a34ca89
Merge branch 'master' into glitch-soc/merge-upstream
2020-02-06 21:36:38 +01:00
Thibaut Girka
5967127dae
Add environment variable to specify extra data hosts
...
Fixes #1276
2020-02-06 12:15:15 +01:00
ThibG
b30a87bc1c
Fix typo in about page ( #13038 )
2020-02-03 23:29:42 +01:00
Eugen Rochko
273aa806d3
Fix punycode being returned in some entities instead of unicode in REST API ( #13035 )
2020-02-03 21:16:37 +01:00
Eugen Rochko
d0fe0d348b
Fix remote convertible media attachments not being saved ( #13032 )
...
Because the file name was set after loading the file, Paperclip
was flagging the differing file extension as content type spoofing
Fix #12938
2020-02-03 18:45:56 +01:00
Eugen Rochko
9c2d10cd0c
Fix punycode being rendered instead of unicode in some places ( #13030 )
2020-02-03 18:44:54 +01:00
ThibG
f7deab10a5
Fix dates (without time) being rendered as datetimes in public pages ( #13034 )
2020-02-03 17:48:56 +01:00
Eugen Rochko
5c4b1db54a
Change signature verification to ignore signatures with invalid host ( #13033 )
...
Instead of returning a signature verification error, pretend there
was no signature (i.e., this does not allow access to resources that
need a valid signature), so public resources can still be fetched
Fix #13011
2020-02-03 17:48:23 +01:00
Eugen Rochko
0c14bb9c69
New Crowdin translations ( #12953 )
...
* New translations en.json (Romanian)
[ci skip]
* New translations en.json (Russian)
[ci skip]
* New translations en.json (Persian)
[ci skip]
* New translations en.json (Serbian (Cyrillic))
[ci skip]
* New translations en.json (Serbian (Latin))
[ci skip]
* New translations en.json (Slovenian)
[ci skip]
* New translations en.json (Lithuanian)
[ci skip]
* New translations en.json (Macedonian)
[ci skip]
* New translations en.json (Malay)
[ci skip]
* New translations en.json (Marathi)
[ci skip]
* New translations en.json (Norwegian)
[ci skip]
* New translations en.json (Occitan)
[ci skip]
* New translations en.json (Estonian)
[ci skip]
* New translations en.json (Portuguese)
[ci skip]
* New translations en.yml (Portuguese, Brazilian)
[ci skip]
* New translations en.json (Malayalam)
[ci skip]
* New translations en.json (Icelandic)
[ci skip]
* New translations en.json (Kabyle)
[ci skip]
* New translations en.json (German)
[ci skip]
* New translations en.json (Arabic)
[ci skip]
* New translations en.json (Breton)
[ci skip]
* New translations en.json (Indonesian)
[ci skip]
* New translations en.json (Slovak)
[ci skip]
* New translations en.json (Norwegian Nynorsk)
[ci skip]
* New translations en.json (Chinese Simplified)
[ci skip]
* New translations en.json (Dutch)
[ci skip]
* New translations en.json (Corsican)
[ci skip]
* New translations en.json (Chinese Traditional)
[ci skip]
* New translations en.json (Chinese Traditional, Hong Kong)
[ci skip]
* New translations en.json (Bulgarian)
[ci skip]
* New translations en.json (Croatian)
[ci skip]
* New translations en.json (Czech)
[ci skip]
* New translations en.json (Danish)
[ci skip]
* New translations en.json (Esperanto)
[ci skip]
* New translations en.json (Catalan)
[ci skip]
* New translations en.json (Albanian)
[ci skip]
* New translations en.json (Asturian)
[ci skip]
* New translations en.json (Bengali)
[ci skip]
* New translations en.json (Basque)
[ci skip]
* New translations en.json (Welsh)
[ci skip]
* New translations en.json (Ukrainian)
[ci skip]
* New translations en.json (Telugu)
[ci skip]
* New translations en.json (Turkish)
[ci skip]
* New translations en.json (Urdu (Pakistan))
[ci skip]
* New translations en.json (Tamil)
[ci skip]
* New translations en.json (Vietnamese)
[ci skip]
* New translations en.json (Thai)
[ci skip]
* New translations en.json (Spanish)
[ci skip]
* New translations en.json (Spanish, Argentina)
[ci skip]
* New translations en.json (Swedish)
[ci skip]
* New translations en.yml (Galician)
[ci skip]
* New translations en.json (German)
[ci skip]
* New translations en.json (Portuguese)
[ci skip]
* New translations en.json (Kabyle)
[ci skip]
* New translations en.yml (Kabyle)
[ci skip]
* New translations en.json (French)
[ci skip]
* New translations en.json (Galician)
[ci skip]
* New translations en.json (Persian)
[ci skip]
* New translations en.json (Russian)
[ci skip]
* New translations en.yml (Galician)
[ci skip]
* New translations en.yml (Kabyle)
[ci skip]
* New translations en.json (Turkish)
[ci skip]
* New translations en.yml (Galician)
[ci skip]
* New translations en.json (German)
[ci skip]
* New translations en.yml (Kabyle)
[ci skip]
* New translations en.json (Spanish)
[ci skip]
* New translations en.yml (Kabyle)
[ci skip]
* New translations simple_form.en.yml (Kabyle)
[ci skip]
* New translations doorkeeper.en.yml (Kabyle)
[ci skip]
* New translations en.yml (Galician)
[ci skip]
* New translations en.json (Greek)
[ci skip]
* New translations en.yml (Greek)
[ci skip]
* New translations en.json (Korean)
[ci skip]
* New translations en.yml (Greek)
[ci skip]
* New translations en.json (Norwegian)
[ci skip]
* New translations doorkeeper.en.yml (Norwegian)
[ci skip]
* New translations en.json (Basque)
[ci skip]
* New translations en.yml (Basque)
[ci skip]
* New translations simple_form.en.yml (Basque)
[ci skip]
* New translations en.yml (Occitan)
[ci skip]
* New translations en.json (Occitan)
[ci skip]
* New translations en.yml (Occitan)
[ci skip]
* New translations doorkeeper.en.yml (Occitan)
[ci skip]
* New translations en.yml (Norwegian)
[ci skip]
* New translations en.yml (Norwegian)
[ci skip]
* New translations en.yml (Norwegian)
[ci skip]
* New translations en.json (Japanese)
[ci skip]
* New translations en.yml (Norwegian)
[ci skip]
* New translations en.json (Corsican)
[ci skip]
* New translations en.json (Indonesian)
[ci skip]
* New translations en.json (Catalan)
[ci skip]
* New translations en.yml (Tamil)
[ci skip]
* New translations en.json (Tamil)
[ci skip]
* New translations en.json (Kazakh)
[ci skip]
* New translations devise.en.yml (Tamil)
[ci skip]
* New translations en.json (Hungarian)
[ci skip]
* New translations en.json (Kabyle)
[ci skip]
* New translations en.json (Kabyle)
[ci skip]
* New translations en.yml (Kabyle)
[ci skip]
* New translations simple_form.en.yml (Portuguese, Brazilian)
[ci skip]
* New translations en.json (Finnish)
[ci skip]
* New translations en.json (Finnish)
[ci skip]
* New translations simple_form.en.yml (Finnish)
[ci skip]
* New translations en.json (Spanish, Argentina)
[ci skip]
* New translations en.json (Portuguese, Brazilian)
[ci skip]
* New translations en.yml (Norwegian Nynorsk)
[ci skip]
* New translations doorkeeper.en.yml (Norwegian Nynorsk)
[ci skip]
* New translations en.json (Norwegian Nynorsk)
[ci skip]
* New translations en.yml (Persian)
[ci skip]
* New translations en.yml (Portuguese)
[ci skip]
* New translations en.yml (Russian)
[ci skip]
* New translations en.yml (Galician)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
* New translations en.yml (Catalan)
[ci skip]
* New translations en.yml (German)
[ci skip]
* New translations en.yml (Corsican)
[ci skip]
* New translations en.json (Esperanto)
[ci skip]
* New translations en.yml (Esperanto)
[ci skip]
* New translations en.yml (Esperanto)
[ci skip]
* New translations en.json (Icelandic)
[ci skip]
* New translations en.yml (Icelandic)
[ci skip]
* New translations en.yml (Esperanto)
[ci skip]
* New translations simple_form.en.yml (Esperanto)
[ci skip]
* New translations en.yml (Spanish, Argentina)
[ci skip]
* New translations en.yml (Portuguese, Brazilian)
[ci skip]
* New translations en.json (Dutch)
[ci skip]
* New translations en.yml (Dutch)
[ci skip]
* New translations en.yml (Esperanto)
[ci skip]
* New translations en.yml (French)
[ci skip]
* New translations en.yml (Dutch)
[ci skip]
* New translations en.yml (Dutch)
[ci skip]
* New translations en.yml (Hungarian)
[ci skip]
* New translations en.yml (Dutch)
[ci skip]
* New translations en.yml (Kabyle)
[ci skip]
* New translations en.json (Turkish)
[ci skip]
* New translations en.yml (Turkish)
[ci skip]
* New translations en.yml (Dutch)
[ci skip]
* New translations en.json (Estonian)
[ci skip]
* New translations en.yml (Estonian)
[ci skip]
* New translations doorkeeper.en.yml (Dutch)
[ci skip]
* New translations simple_form.en.yml (Dutch)
[ci skip]
* New translations en.yml (Estonian)
[ci skip]
* New translations simple_form.en.yml (Dutch)
[ci skip]
* New translations simple_form.en.yml (Estonian)
[ci skip]
* New translations simple_form.en.yml (Dutch)
[ci skip]
* New translations en.yml (Japanese)
[ci skip]
* New translations en.yml (Korean)
[ci skip]
* New translations en.yml (Greek)
[ci skip]
* New translations en.json (Dutch)
[ci skip]
* New translations en.yml (Asturian)
[ci skip]
* New translations simple_form.en.yml (Asturian)
[ci skip]
* New translations en.yml (Asturian)
[ci skip]
* New translations en.json (Asturian)
[ci skip]
* New translations en.yml (Asturian)
[ci skip]
* New translations en.json (Asturian)
[ci skip]
* New translations en.json (Asturian)
[ci skip]
* New translations en.yml (Asturian)
[ci skip]
* New translations en.json (Asturian)
[ci skip]
* New translations en.yml (Asturian)
[ci skip]
* New translations en.json (Asturian)
[ci skip]
* New translations en.yml (Asturian)
[ci skip]
* New translations en.json (Asturian)
[ci skip]
* New translations doorkeeper.en.yml (Asturian)
[ci skip]
* New translations en.yml (Japanese)
[ci skip]
* New translations doorkeeper.en.yml (Asturian)
[ci skip]
* New translations en.json (Asturian)
[ci skip]
* New translations en.yml (Japanese)
[ci skip]
* New translations en.yml (Indonesian)
[ci skip]
* New translations en.yml (Kazakh)
[ci skip]
* New translations en.yml (Tamil)
[ci skip]
* New translations devise.en.yml (Tamil)
[ci skip]
* New translations devise.en.yml (Tamil)
[ci skip]
* New translations devise.en.yml (Tamil)
[ci skip]
* New translations en.json (Kabyle)
[ci skip]
* New translations en.yml (Kabyle)
[ci skip]
* New translations en.yml (Kabyle)
[ci skip]
* New translations en.json (Thai)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations devise.en.yml (Tamil)
[ci skip]
* New translations devise.en.yml (Tamil)
[ci skip]
* New translations devise.en.yml (Tamil)
[ci skip]
* New translations devise.en.yml (Tamil)
[ci skip]
* New translations devise.en.yml (Tamil)
[ci skip]
* New translations devise.en.yml (Tamil)
[ci skip]
* New translations en.json (Persian)
[ci skip]
* New translations devise.en.yml (Persian)
[ci skip]
* New translations devise.en.yml (Persian)
[ci skip]
* New translations en.yml (Esperanto)
[ci skip]
* New translations en.json (Korean)
[ci skip]
* New translations en.yml (Korean)
[ci skip]
* New translations simple_form.en.yml (Korean)
[ci skip]
* New translations en.json (Ukrainian)
[ci skip]
* New translations en.yml (Ukrainian)
[ci skip]
* New translations devise.en.yml (Tamil)
[ci skip]
* New translations devise.en.yml (Tamil)
[ci skip]
* New translations simple_form.en.yml (Dutch)
[ci skip]
* New translations en.yml (Dutch)
[ci skip]
* New translations simple_form.en.yml (Dutch)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations simple_form.en.yml (Thai)
[ci skip]
* New translations devise.en.yml (Tamil)
[ci skip]
* New translations devise.en.yml (Tamil)
[ci skip]
* New translations en.json (Tamil)
[ci skip]
* New translations en.json (Tamil)
[ci skip]
* New translations en.json (Chinese Simplified)
[ci skip]
* New translations en.yml (Chinese Simplified)
[ci skip]
* New translations en.yml (Basque)
[ci skip]
* New translations en.json (Occitan)
[ci skip]
* New translations simple_form.en.yml (Occitan)
[ci skip]
* New translations simple_form.en.yml (Occitan)
[ci skip]
* New translations en.yml (Kabyle)
[ci skip]
* New translations en.json (Kabyle)
[ci skip]
* New translations en.yml (Kabyle)
[ci skip]
* New translations doorkeeper.en.yml (Kabyle)
[ci skip]
* New translations en.yml (Kabyle)
[ci skip]
* New translations en.yml (Occitan)
[ci skip]
* New translations simple_form.en.yml (Occitan)
[ci skip]
* New translations en.yml (Greek)
[ci skip]
* New translations en.json (Asturian)
[ci skip]
* New translations en.yml (Asturian)
[ci skip]
* New translations en.yml (Asturian)
[ci skip]
* New translations en.json (Asturian)
[ci skip]
* New translations en.yml (Asturian)
[ci skip]
* New translations devise.en.yml (Asturian)
[ci skip]
* New translations en.json (Asturian)
[ci skip]
* New translations en.json (Asturian)
[ci skip]
* New translations en.yml (Asturian)
[ci skip]
* New translations en.json (Asturian)
[ci skip]
* New translations en.yml (Asturian)
[ci skip]
* New translations en.yml (Chinese Simplified)
[ci skip]
* New translations en.yml (Greek)
[ci skip]
* New translations en.yml (Italian)
[ci skip]
* New translations en.yml (Italian)
[ci skip]
* New translations en.json (Italian)
[ci skip]
* New translations en.yml (Asturian)
[ci skip]
* New translations en.json (Asturian)
[ci skip]
* New translations en.json (Asturian)
[ci skip]
* New translations en.yml (Asturian)
[ci skip]
* New translations en.json (Asturian)
[ci skip]
* New translations en.yml (Asturian)
[ci skip]
* New translations en.json (Asturian)
[ci skip]
* New translations en.json (Asturian)
[ci skip]
* New translations en.yml (Asturian)
[ci skip]
* New translations en.json (Chinese Simplified)
[ci skip]
* New translations en.yml (Occitan)
[ci skip]
* New translations en.yml (Occitan)
[ci skip]
* New translations en.yml (Occitan)
[ci skip]
* i18n-tasks normalize
* yarn manage:translations
2020-02-03 15:52:20 +01:00
fuyu
b8db3b4cdf
Don't display toggle reveal button in video modal when full screen ( #13026 )
2020-02-03 12:26:00 +01:00
Thibaut Girka
c6b587b115
Fix poll compose form being broken on single-column layout
2020-02-03 11:56:31 +01:00
ThibG
a33262b5b8
Merge pull request #1274 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2020-02-03 10:27:07 +01:00
ThibG
e571f7005e
[Glitch] Change how unread announcements are handled
...
Port 99cf92a3cf
2020-02-03 09:31:32 +01:00
Sasha Sorokin
f0aef12b12
[Glitch] Add "Show thread" button to public profiles
...
Port 864c9a2141
2020-02-03 09:30:13 +01:00
Eugen Rochko
77e5732816
[Glitch] Fix mascot being too large, and a code style issue
...
Port 7774ac36e5
2020-02-03 09:27:51 +01:00
Thibaut Girka
e76a010414
Merge branch 'master' into glitch-soc/merge-upstream
2020-02-03 09:22:58 +01:00
ThibG
99cf92a3cf
Change how unread announcements are handled ( #13020 )
...
* Change meaning of /api/v1/announcements/:id/dismiss to mark an announcement as read
* Change how unread announcements are counted in UI
* Add unread marker to announcements and mark announcements as unread as they are displayed
* Fixups
2020-02-03 01:53:09 +01:00
Thibaut Girka
947645c355
When submitting markers, use last displayed notification, not last received one
2020-02-01 19:53:01 +01:00
Thibaut Girka
8c5689775f
Fetch last read notification id to update unread notification count on load
2020-02-01 19:53:01 +01:00
abcang
94bc823eb6
Search account domain in lowercase ( #13016 )
...
* Search account domain in lowercase
* fix rubocop error
* fix spec/models/account_spec.rb
2020-02-01 15:42:24 +01:00
Renato "Lond" Cerqueira
9e7b2242f7
Fix error when sending moderation notification ( #13014 )
...
Since the statuses helper is not loaded, the rtl helper cannot be found
and the email cannot be sent.
2020-02-01 15:42:12 +01:00
Даниил Пронин
fe90bfa207
Fix Node version in Vagrant ( #13008 )
2020-01-30 12:05:56 +01:00
ThibG
b290b5880d
Fix english wording ( #13003 )
2020-01-29 18:39:44 +01:00
Sasha Sorokin
864c9a2141
Add "Show thread" button to public profiles ( #13000 )
...
This adds "Show thread" button to the status view which is used in
profiles. The logic to display the button is mimicking logic in
web app available at app/javascript/mastodon/components/status.js#L439.
* The little change in components CSS required to remove enforced
underline for all links on public pages on our button.
2020-01-29 17:35:54 +01:00
Eugen Rochko
7774ac36e5
Fix mascot being too large, and a code style issue ( #13002 )
2020-01-29 16:18:33 +01:00
Eugen Rochko
6355996c4b
Bump version to 3.1.0rc2 ( #12999 )
2020-01-28 20:56:32 +01:00
Shlee
4f80dd3e26
Update Dockerfile ( #12997 )
2020-01-28 20:33:09 +01:00
Sasha Sorokin
d0cc024ce9
Add missing translations ( #12996 )
...
This commit adds missing translations for #12966 and #12954 .
2020-01-28 20:28:38 +01:00
Thibaut Girka
26c449515e
Add support for xmpp: and magnet: URIs to misleading link detection code
2020-01-28 20:25:56 +01:00
ThibG
93f1edd430
Merge pull request #1272 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2020-01-28 19:38:37 +01:00
Eugen Rochko
4dc279fb9e
[Glitch] Fix design of announcements in admin UI
...
Port 6c643bed6a
2020-01-28 19:17:47 +01:00
Eugen Rochko
3ecc114ec6
[Glitch] Change announcements to be collapsed on page load in web UI
...
Port 5bc109eeb7
2020-01-28 19:17:06 +01:00
Thibaut Girka
fbf97961fc
Merge branch 'master' into glitch-soc/merge-upstream
2020-01-28 19:15:03 +01:00
ThibG
4e90375279
Fix Gemfile.lock ( #12995 )
...
* Use bundle install in deployment mode for Continuous Integration to catch Gemfile.lock issues
* Fix deprecation warnings
* Fix Gemfile.lock
* More changes to catch Gemfile.lock issues
2020-01-28 18:50:44 +01:00
Eugen Rochko
1e836349a0
Update changelog for 3.1.0rc1 ( #12992 )
2020-01-28 17:19:42 +01:00
Shlee
4533a6c264
Bump Rack from 2.0.8 to 2.1.2 ( #12991 )
...
* Update Gemfile
* Update Gemfile.lock
2020-01-28 15:23:16 +01:00
Sasha Sorokin
cce0870311
Fix regressions caused by #12961 ( #12961 )
...
This commit attempts to fix most of regressions caused by #12961
pull request which added even spread of space between tabs.
The following fixes were done:
- Don't hide overflow in tabs
As tabs use ::after and ::before pseudo-elements to create arrow on
the bottom of selected tab, "overflow: hidden" will cause this arrow
to look split from the bottom container.
For the future we probably should use slider element instead, which
would align according to currently selected tab, instead of relying
on pseudo-elements. Such method would also allow smooth transitions.
- Disallow wrapping tab text on insufficient space
This would fix some unwanted behavior[1] when on insufficient width,
renderer might attempt wrapping text to not overtake others' space.
[1]: https://mastodon.social/@Gargron/103546083813829165
2020-01-28 02:21:18 +01:00
Eugen Rochko
6c643bed6a
Fix design of announcements in admin UI ( #12989 )
2020-01-28 02:21:00 +01:00
Eugen Rochko
5bc109eeb7
Change announcements to be collapsed on page load in web UI ( #12990 )
2020-01-28 02:20:47 +01:00
ThibG
b1ccf0609d
Merge pull request #1271 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2020-01-27 17:26:53 +01:00
Eugen Rochko
f64a9ae775
[Glitch] Change number animations direction based on decrease or increase
...
Port d67f2c1c25
2020-01-27 16:06:03 +01:00
Eugen Rochko
4a882562c6
[Glitch] Add animations to announcement reactions
...
Port 1130c5167c
2020-01-27 16:05:37 +01:00
ThibG
51bd2205a1
[Glitch] Change last_status_at to be a date, not datetime
...
Port d9cdd58423
2020-01-27 16:03:24 +01:00
Eugen Rochko
c7cdca7afb
[Glitch] Fix link colors in announcements
...
Port 3ae0b03603
2020-01-27 16:01:46 +01:00
Eugen Rochko
a20b14b6b4
[Glitch] Add streaming API updates for announcements being modified or deleted
...
Port dd68e44cfa
2020-01-27 16:01:06 +01:00
ThibG
042964971f
[Glitch] Fix status overflowing in report dialog
...
Port 8f37f20ff9
2020-01-27 15:59:25 +01:00
Thibaut Girka
9604766a18
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- `app/serializers/rest/account_serializer.rb`:
Upstream added code too close to glitch-soc-specific followers-hiding code.
Ported upstream changes.
2020-01-27 15:46:50 +01:00
