ThibG
ef925f31a6
Merge pull request #1233 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-10-11 22:28:11 +02:00
Eugen Rochko
877e8c9d79
[Glitch] Fix media editing modal changing dimensions when image loads
...
Port 6ebd74f4fa
2019-10-10 21:00:13 +02:00
Eugen Rochko
4ee167d89b
[Glitch] Remove lang attribute from individual statuses
...
Port 538db85d3c
2019-10-10 21:00:13 +02:00
trwnh
bd1eaad816
[Glitch] Add missing back button header for invalid account
...
Port 95f21ab87f
2019-10-10 21:00:13 +02:00
Eugen Rochko
9ba67c6045
[Glitch] Fix performance of home feed regeneration
...
Port front-end changes from f665901e3c
2019-10-10 21:00:13 +02:00
Thibaut Girka
b3dd0d276d
Increase poll option length limit to 100 chars, number of options to 5
2019-10-10 20:13:59 +02:00
Thibaut Girka
61631f4751
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- README.md
- app/javascript/styles/mastodon/components.scss
conflicts caused by image URLs being different
- app/models/status.rb
as_home_timeline removed, kept glitch-soc-only as_direct_timeline
- app/views/statuses/_simple_status.html.haml
- config/locales/en.yml
some strings were changed upstream
- spec/models/status_spec.rb
as_home_timeline removed, kept glitch-soc-only as_direct_timeline
2019-10-10 17:26:08 +02:00
Thibaut Girka
bc0399d54d
Ensure pack is set when rendering OTP prompt
...
Fixes #1230
2019-10-10 17:08:00 +02:00
Eugen Rochko
6ebd74f4fa
Fix media editing modal changing dimensions when image loads ( #12131 )
2019-10-10 05:21:38 +02:00
Eugen Rochko
915f3712ae
Fix admin setting to auto-approve hashtags not affecting query ( #12130 )
...
Follow-up to #12122
2019-10-10 02:22:04 +02:00
Eugen Rochko
30a28a2eb7
Fix not showing if emoji has a local counterpart in admin UI ( #12135 )
...
Fix #12132
2019-10-10 02:21:52 +02:00
Eugen Rochko
b5f7e12817
Remove auto-silence behaviour from spam check ( #12117 )
...
Fix #12113
2019-10-09 07:11:23 +02:00
Eugen Rochko
354fdd317e
Fix attachment not being re-downloaded even if file is not stored ( #12125 )
...
Change the behaviour of remotable concern. Previously, it would skip
downloading an attachment if the stored remote URL is identical to
the new one. Now it would not be skipped if the attachment is not
actually currently stored by Paperclip.
2019-10-09 07:10:46 +02:00
Eugen Rochko
538db85d3c
Remove lang attribute from individual statuses ( #12124 )
...
Fix #10930
2019-10-09 03:45:05 +02:00
Eugen Rochko
c8bcf5cbfd
Add admin setting to auto-approve hashtags ( #12122 )
...
Change inaccurate labels on other admin settings
2019-10-09 00:30:15 +02:00
Eugen Rochko
19cdc62765
Remove fallback to long description on sidebar and meta description ( #12119 )
...
Fix #12114
2019-10-08 22:08:55 +02:00
trwnh
95f21ab87f
Add missing back button header for invalid account ( #12094 )
...
Should fix #6786
2019-10-07 04:33:31 +02:00
Eugen Rochko
8386d9ec10
Fix hashtag timeline REST API accepting too many hashtags ( #12091 )
2019-10-07 03:56:21 +02:00
Eugen Rochko
a582185625
Fix GET /api/v1/instance REST APIs being unavailable in secure mode ( #12089 )
2019-10-06 22:11:29 +02:00
Eugen Rochko
f665901e3c
Fix performance of home feed regeneration ( #12084 )
...
Fetching statuses from all followed accounts at once takes too long
within Postgres. Fetching them one by one and merging in Ruby
could be a lot less resource-intensive
Because the query for dynamically fetching the home timeline is so
heavy, we can no longer offer it when the home timeline is missing
2019-10-06 22:11:17 +02:00
Hugo Gameiro
a7917269d3
add loglevel fatal to video and audio styles ( #12088 )
2019-10-06 19:48:26 +02:00
Thibaut Girka
0fbe36e3fb
Partially revert scrollbar handling on mobile, since its width-based and wrong
...
Have to investigate as to whether it was actually needed on mobile, doesn't
seem to be the case from Firefox's Responsive Design Mode
2019-10-06 00:32:06 +02:00
Thibaut Girka
fe6864a73a
Apply scroll changes to Bookmark column
2019-10-06 00:32:06 +02:00
Eugen Rochko
bd54ee294a
[Glitch] Add refresh button to list of rebloggers/favouriters in web UI
...
Port b0323d0888
2019-10-06 00:32:06 +02:00
Yamagishi Kazutoshi
7d79e1f31c
[Glitch] Do not add margin light when opening modal on mobile
...
Port 0a49b26793
2019-10-06 00:32:06 +02:00
Eugen Rochko
4b181eba13
[Glitch] Fix left side of single column layout being cropped on smaller screens
...
Port 37ccafec8f
2019-10-06 00:32:06 +02:00
Eugen Rochko
7fc6213bfe
[Glitch] Fix thread column showing pin button
...
Port 129bc871a0
2019-10-06 00:32:06 +02:00
Eugen Rochko
0d42111671
[Glitch] Fix scroll position resetting when opening media modals in web UI
...
Port 50755a47b4
2019-10-06 00:32:06 +02:00
Eugen Rochko
e7fd43c27c
[Glitch] Fix loading bar being obscured by other elements in web UI
...
Port 2b4e2616ea
2019-10-06 00:32:06 +02:00
Eugen Rochko
90bdbddbfe
[Glitch] Fix scroll to top in single column UI
...
Port 2dee293c4c
2019-10-06 00:32:06 +02:00
Eugen Rochko
fdadd520b1
[Glitch] Fix column header scrolling with the page
...
Port 706a48ee1f
2019-10-05 22:53:20 +02:00
Eugen Rochko
3edb816eb0
[Glitch] Fix tabs bar scrolling along with content on mobile
...
Port 4cc29eb5ad
2019-10-05 22:53:20 +02:00
ThibG
81b6ffa8f1
[Glitch] Fix scrolling in single-column mode on Chrome
...
Port fb1b710e8d
2019-10-05 22:53:20 +02:00
Eugen Rochko
9e2e623ebe
[Glitch] Change single-column mode to scroll the whole page
...
Port aa22b38fdb
2019-10-05 22:53:20 +02:00
Thibaut Girka
bc8543d9af
Fix audio modal closing immediately
2019-10-04 21:07:45 +02:00
Thibaut Girka
1bbba0016a
Merge tag 'v3.0.0' into glitch-soc/merge-upstream
2019-10-04 19:49:43 +02:00
Eugen Rochko
360234d1bf
[Glitch] Fix audio attachments opening in video modal from media tab in web UI
...
Port c9b8ba50f8
2019-10-04 19:25:25 +02:00
Jeong Arm
c274774d06
[Glitch] Scroll into search bar when focus
...
Port 66fda37fd0
2019-10-04 19:22:11 +02:00
Eugen Rochko
79388a52aa
[Glitch] Fix issues in RTL layout in web UI
...
Port 9184522cb4
2019-10-04 19:16:41 +02:00
Eugen Rochko
7ca6153c0c
[Glitch] Fix media editing modal and profile directory in light theme
...
Port f51f99c3c2
2019-10-04 19:12:54 +02:00
Eugen Rochko
4289ecd037
New Crowdin translations ( #12067 )
...
* New translations en.yml (Indonesian)
[ci skip]
* New translations en.yml (Japanese)
[ci skip]
* New translations en.yml (Indonesian)
[ci skip]
* New translations en.json (Japanese)
[ci skip]
* New translations en.json (Turkish)
[ci skip]
* New translations en.yml (Turkish)
[ci skip]
* New translations en.yml (Indonesian)
[ci skip]
* New translations en.json (Japanese)
[ci skip]
* New translations en.yml (Turkish)
[ci skip]
* New translations en.yml (Indonesian)
[ci skip]
* New translations en.yml (Japanese)
[ci skip]
* New translations en.yml (Turkish)
[ci skip]
* New translations en.yml (Indonesian)
[ci skip]
* New translations en.yml (Japanese)
[ci skip]
* New translations en.yml (Indonesian)
[ci skip]
* New translations en.json (Arabic)
[ci skip]
* New translations en.yml (Arabic)
[ci skip]
* New translations en.yml (Japanese)
[ci skip]
* New translations en.yml (Indonesian)
[ci skip]
* New translations en.yml (Arabic)
[ci skip]
* New translations simple_form.en.yml (Arabic)
[ci skip]
* New translations en.yml (Japanese)
[ci skip]
* New translations en.json (French)
[ci skip]
* New translations simple_form.en.yml (French)
[ci skip]
* New translations en.yml (Japanese)
[ci skip]
* New translations en.json (French)
[ci skip]
* New translations en.yml (Japanese)
[ci skip]
* New translations simple_form.en.yml (Japanese)
[ci skip]
* New translations simple_form.en.yml (Japanese)
[ci skip]
* New translations en.yml (Japanese)
[ci skip]
* New translations en.yml (Turkish)
[ci skip]
* New translations en.yml (Turkish)
[ci skip]
* New translations en.json (Persian)
[ci skip]
* New translations en.json (Persian)
[ci skip]
* i18n-tasks normalize
* yarn manage:translations
2019-10-03 22:41:21 +02:00
Eugen Rochko
740c9cb3ee
Remove invite comments from UI ( #12068 )
...
Due to UX confusion and insufficient time to fix it
2019-10-03 22:37:13 +02:00
Eugen Rochko
32efa14060
New Crowdin translations ( #12061 )
...
* New translations en.json (Armenian)
[ci skip]
* New translations en.json (Kazakh)
[ci skip]
* New translations en.yml (Hungarian)
[ci skip]
* New translations doorkeeper.en.yml (Hungarian)
[ci skip]
* New translations en.json (Italian)
[ci skip]
* New translations en.yml (Italian)
[ci skip]
* New translations doorkeeper.en.yml (Italian)
[ci skip]
* New translations en.json (Japanese)
[ci skip]
* New translations en.yml (Japanese)
[ci skip]
* New translations doorkeeper.en.yml (Japanese)
[ci skip]
* New translations en.yml (Kazakh)
[ci skip]
* New translations doorkeeper.en.yml (Greek)
[ci skip]
* New translations doorkeeper.en.yml (Kazakh)
[ci skip]
* New translations en.json (Korean)
[ci skip]
* New translations en.yml (Korean)
[ci skip]
* New translations doorkeeper.en.yml (Korean)
[ci skip]
* New translations en.yml (Norwegian Nynorsk)
[ci skip]
* New translations en.json (Occitan)
[ci skip]
* New translations en.yml (Occitan)
[ci skip]
* New translations en.json (Hungarian)
[ci skip]
* New translations en.yml (Greek)
[ci skip]
* New translations en.json (Persian)
[ci skip]
* New translations en.yml (Finnish)
[ci skip]
* New translations doorkeeper.en.yml (Dutch)
[ci skip]
* New translations en.json (Esperanto)
[ci skip]
* New translations en.yml (Esperanto)
[ci skip]
* New translations doorkeeper.en.yml (Esperanto)
[ci skip]
* New translations en.json (Estonian)
[ci skip]
* New translations en.yml (Estonian)
[ci skip]
* New translations doorkeeper.en.yml (Estonian)
[ci skip]
* New translations en.json (Finnish)
[ci skip]
* New translations doorkeeper.en.yml (Finnish)
[ci skip]
* New translations en.json (Greek)
[ci skip]
* New translations en.json (French)
[ci skip]
* New translations doorkeeper.en.yml (French)
[ci skip]
* New translations en.json (Galician)
[ci skip]
* New translations en.yml (Galician)
[ci skip]
* New translations doorkeeper.en.yml (Galician)
[ci skip]
* New translations en.json (German)
[ci skip]
* New translations en.yml (German)
[ci skip]
* New translations doorkeeper.en.yml (German)
[ci skip]
* New translations doorkeeper.en.yml (Occitan)
[ci skip]
* New translations en.yml (Persian)
[ci skip]
* New translations en.json (Dutch)
[ci skip]
* New translations en.yml (Turkish)
[ci skip]
* New translations en.json (Telugu)
[ci skip]
* New translations en.yml (Telugu)
[ci skip]
* New translations en.json (Thai)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations doorkeeper.en.yml (Thai)
[ci skip]
* New translations en.json (Turkish)
[ci skip]
* New translations doorkeeper.en.yml (Turkish)
[ci skip]
* New translations en.json (Tamil)
[ci skip]
* New translations en.json (Welsh)
[ci skip]
* New translations en.yml (Welsh)
[ci skip]
* New translations doorkeeper.en.yml (Welsh)
[ci skip]
* New translations en.json (Spanish, Argentina)
[ci skip]
* New translations en.yml (Spanish, Argentina)
[ci skip]
* New translations en.json (Macedonian)
[ci skip]
* New translations en.yml (Macedonian)
[ci skip]
* New translations en.yml (Tamil)
[ci skip]
* New translations doorkeeper.en.yml (Swedish)
[ci skip]
* New translations doorkeeper.en.yml (Persian)
[ci skip]
* New translations doorkeeper.en.yml (Portuguese, Brazilian)
[ci skip]
* New translations en.json (Polish)
[ci skip]
* New translations en.yml (Polish)
[ci skip]
* New translations doorkeeper.en.yml (Polish)
[ci skip]
* New translations en.json (Portuguese)
[ci skip]
* New translations en.yml (Portuguese)
[ci skip]
* New translations doorkeeper.en.yml (Portuguese)
[ci skip]
* New translations en.json (Portuguese, Brazilian)
[ci skip]
* New translations en.yml (Portuguese, Brazilian)
[ci skip]
* New translations en.json (Romanian)
[ci skip]
* New translations en.yml (Swedish)
[ci skip]
* New translations en.yml (Romanian)
[ci skip]
* New translations en.json (Slovenian)
[ci skip]
* New translations en.yml (Slovenian)
[ci skip]
* New translations doorkeeper.en.yml (Slovenian)
[ci skip]
* New translations en.json (Spanish)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
* New translations doorkeeper.en.yml (Spanish)
[ci skip]
* New translations en.json (Swedish)
[ci skip]
* New translations en.yml (Dutch)
[ci skip]
* New translations doorkeeper.en.yml (Danish)
[ci skip]
* New translations en.yml (Armenian)
[ci skip]
* New translations en.json (Ido)
[ci skip]
* New translations en.yml (Ido)
[ci skip]
* New translations doorkeeper.en.yml (Ido)
[ci skip]
* New translations en.json (Indonesian)
[ci skip]
* New translations en.yml (Indonesian)
[ci skip]
* New translations doorkeeper.en.yml (Indonesian)
[ci skip]
* New translations en.json (Latvian)
[ci skip]
* New translations en.yml (Latvian)
[ci skip]
* New translations en.json (Lithuanian)
[ci skip]
* New translations en.yml (Hebrew)
[ci skip]
* New translations en.yml (Lithuanian)
[ci skip]
* New translations en.json (Malay)
[ci skip]
* New translations en.yml (Malay)
[ci skip]
* New translations en.json (Norwegian)
[ci skip]
* New translations en.yml (Norwegian)
[ci skip]
* New translations doorkeeper.en.yml (Norwegian)
[ci skip]
* New translations doorkeeper.en.yml (Hebrew)
[ci skip]
* New translations en.json (Hebrew)
[ci skip]
* New translations en.yml (Russian)
[ci skip]
* New translations en.yml (Bulgarian)
[ci skip]
* New translations en.json (Asturian)
[ci skip]
* New translations en.yml (Asturian)
[ci skip]
* New translations doorkeeper.en.yml (Asturian)
[ci skip]
* New translations en.json (Breton)
[ci skip]
* New translations en.yml (Breton)
[ci skip]
* New translations en.json (Bulgarian)
[ci skip]
* New translations doorkeeper.en.yml (Bulgarian)
[ci skip]
* New translations doorkeeper.en.yml (Georgian)
[ci skip]
* New translations en.json (Chinese Traditional, Hong Kong)
[ci skip]
* New translations en.yml (Chinese Traditional, Hong Kong)
[ci skip]
* New translations doorkeeper.en.yml (Chinese Traditional, Hong Kong)
[ci skip]
* New translations en.json (Croatian)
[ci skip]
* New translations en.yml (Croatian)
[ci skip]
* New translations doorkeeper.en.yml (Croatian)
[ci skip]
* New translations en.json (Georgian)
[ci skip]
* New translations en.yml (Georgian)
[ci skip]
* New translations en.json (Russian)
[ci skip]
* New translations doorkeeper.en.yml (Russian)
[ci skip]
* New translations en.yml (Danish)
[ci skip]
* New translations en.json (Chinese Traditional)
[ci skip]
* New translations en.yml (Bengali)
[ci skip]
* New translations en.json (Catalan)
[ci skip]
* New translations en.yml (Catalan)
[ci skip]
* New translations doorkeeper.en.yml (Catalan)
[ci skip]
* New translations en.json (Chinese Simplified)
[ci skip]
* New translations en.yml (Chinese Simplified)
[ci skip]
* New translations doorkeeper.en.yml (Chinese Simplified)
[ci skip]
* New translations en.yml (Chinese Traditional)
[ci skip]
* New translations doorkeeper.en.yml (Basque)
[ci skip]
* New translations doorkeeper.en.yml (Chinese Traditional)
[ci skip]
* New translations en.json (Corsican)
[ci skip]
* New translations en.yml (Corsican)
[ci skip]
* New translations doorkeeper.en.yml (Corsican)
[ci skip]
* New translations en.json (Czech)
[ci skip]
* New translations en.yml (Czech)
[ci skip]
* New translations doorkeeper.en.yml (Czech)
[ci skip]
* New translations en.json (Danish)
[ci skip]
* New translations en.json (Bengali)
[ci skip]
* New translations en.yml (Basque)
[ci skip]
* New translations en.json (Serbian (Cyrillic))
[ci skip]
* New translations en.json (Ukrainian)
[ci skip]
* New translations en.yml (Serbian (Cyrillic))
[ci skip]
* New translations doorkeeper.en.yml (Serbian (Cyrillic))
[ci skip]
* New translations en.json (Serbian (Latin))
[ci skip]
* New translations en.yml (Serbian (Latin))
[ci skip]
* New translations doorkeeper.en.yml (Serbian (Latin))
[ci skip]
* New translations en.json (Slovak)
[ci skip]
* New translations en.yml (Slovak)
[ci skip]
* New translations doorkeeper.en.yml (Slovak)
[ci skip]
* New translations en.yml (Ukrainian)
[ci skip]
* New translations en.json (Basque)
[ci skip]
* New translations doorkeeper.en.yml (Ukrainian)
[ci skip]
* New translations en.yml (French)
[ci skip]
* New translations en.json (Norwegian Nynorsk)
[ci skip]
* New translations en.json (Arabic)
[ci skip]
* New translations en.yml (Arabic)
[ci skip]
* New translations en.json (Albanian)
[ci skip]
* New translations en.yml (Albanian)
[ci skip]
* New translations doorkeeper.en.yml (Albanian)
[ci skip]
* New translations doorkeeper.en.yml (Arabic)
[ci skip]
* New translations en.json (Japanese)
[ci skip]
* New translations en.json (Japanese)
[ci skip]
* New translations simple_form.en.yml (Indonesian)
[ci skip]
* New translations simple_form.en.yml (Indonesian)
[ci skip]
* New translations simple_form.en.yml (Indonesian)
[ci skip]
* New translations en.yml (Japanese)
[ci skip]
* New translations en.json (Spanish, Argentina)
[ci skip]
* New translations devise.en.yml (Spanish, Argentina)
[ci skip]
* New translations simple_form.en.yml (Indonesian)
[ci skip]
* New translations devise.en.yml (Spanish, Argentina)
[ci skip]
* New translations simple_form.en.yml (Indonesian)
[ci skip]
* New translations devise.en.yml (Spanish, Argentina)
[ci skip]
* New translations simple_form.en.yml (Indonesian)
[ci skip]
* New translations devise.en.yml (Spanish, Argentina)
[ci skip]
* New translations simple_form.en.yml (Indonesian)
[ci skip]
* New translations en.yml (Japanese)
[ci skip]
* New translations devise.en.yml (Spanish, Argentina)
[ci skip]
* New translations en.yml (Japanese)
[ci skip]
* New translations simple_form.en.yml (Indonesian)
[ci skip]
* New translations simple_form.en.yml (Indonesian)
[ci skip]
* New translations simple_form.en.yml (Indonesian)
[ci skip]
* New translations en.json (Corsican)
[ci skip]
* New translations en.json (Dutch)
[ci skip]
* New translations en.yml (Dutch)
[ci skip]
* New translations en.json (Slovak)
[ci skip]
* New translations en.json (Czech)
[ci skip]
* New translations en.json (German)
[ci skip]
* New translations en.yml (Japanese)
[ci skip]
* New translations en.yml (Indonesian)
[ci skip]
* New translations simple_form.en.yml (Indonesian)
[ci skip]
* New translations en.json (Japanese)
[ci skip]
* New translations en.yml (Japanese)
[ci skip]
* i18n-tasks normalize
* yarn manage:translations
2019-10-03 18:24:55 +02:00
Eugen Rochko
eb83d6256e
Add reason param to POST /api/v1/accounts REST API ( #12064 )
...
For approval-required registrations mode
2019-10-03 17:50:59 +02:00
Eugen Rochko
9a1be333b8
Fix wrong attribute in MoveWorker ( #12066 )
2019-10-03 17:50:48 +02:00
Jeong Arm
cd2fce0318
[Glitch] Fix drag and drop link to composebox
...
Port 3abe003f59
2019-10-03 13:35:17 +02:00
Cutls
685b6e197f
[Glitch] Fix bad word breaking on conversations
...
Port 733a3d20b0
2019-10-03 13:34:43 +02:00
ThibG
badf02891a
[Glitch] Fix typo in mute confirmation dialog
...
Port 559da46fd4
2019-10-03 13:33:38 +02:00
ThibG
b3c19aa777
[Glitch] Fix custom emoji animation on hover in conversations view
...
Port 26a8c6fd2d
2019-10-03 13:30:32 +02:00
ThibG
47f6d636e9
[Glitch] Fix missing propType for conversation delete
...
Port 541269f8bc
2019-10-03 13:28:03 +02:00
