me/glitchier-soc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
10067 commits 2 branches 0 tags 429 MiB
Commit graph

3601 commits

Author SHA1 Message Date
Eugen Rochko
73e610790e Change full logo to use primary text color of the given theme (#10994) 
* Change full logo to use primary text color of the given theme

* Fix colors of public layout header in light theme
 2019-06-08 15:30:06 +02:00
Eugen Rochko
c7feecc715 Improve light theme (#10992) 2019-06-08 10:23:41 +02:00
Eugen Rochko
b44ae7d284 Fix RTL layout not being RTL within the columns area (#10990) 2019-06-07 23:35:26 +02:00
Eugen Rochko
f8e1c0da75 [Glitch] Fix not being able to directly switch between list timelines in web UI 
Port a36e4db82f to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-06-07 17:39:46 +02:00
ThibG
c15ff07c69 [Glitch] Fix “mark as sensitive” not being used in delete & redraft 
Port 024ec0759c to glitch-soc
 2019-06-07 17:39:46 +02:00
Jeong Arm
a473a7912b [Glitch] Scroll to compose form when focus 
Port 91ae2d1275 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-06-07 17:39:46 +02:00
Eugen Rochko
5c1a46bdcf Fix some React warnings (#10989) 2019-06-07 17:15:18 +02:00
Thibaut Girka
2c240378b2 [Glitch] Fix refreshing featured toots when the new collection is empty 
Port 1fee4b0fe2 to glitch-soc
 2019-06-07 17:05:32 +02:00
Thibaut Girka
00552d2f79 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/controllers/statuses_controller.rb
- app/controllers/stream_entries_controller.rb
 2019-06-07 17:00:36 +02:00
Thibaut Girka
390f22ab44 Fix display of alt-text when a media attachment is not available 2019-06-07 16:39:07 +02:00
ThibG
2b35ddc80a Fix display of alt-text when a media attachment is not available (#10981) 2019-06-07 12:41:08 +02:00
Eugen Rochko
8bf8d6d9d9 Change preferences page into appearance, notifications, and other (#10977) 2019-06-07 03:39:24 +02:00
Yamagishi Kazutoshi
e20f7876e8 Fix sass-lint config (#10982) 2019-06-06 18:51:46 +02:00
Wenceslao Páez Chávez
796b8e8d34 Fix overlap of emoji button on search popup (#10978) 2019-06-06 13:40:17 +02:00
Thibaut Girka
2b54b78962 Fix CW field automatically getting the focus when it is always enabled 2019-06-06 13:26:42 +02:00
Eugen Rochko
a36e4db82f Fix not being able to directly switch between list timelines in web UI (#10973) 2019-06-06 13:04:49 +02:00
ThibG
024ec0759c Fix “mark as sensitive” not being used in delete & redraft (#10980) 2019-06-06 13:04:34 +02:00
Takeshi Umeda
88a04bf6c4 Fix emoji picker being always displayed (#10979) 
* Fix emoji picker being always displayed

* Remove duplicate content with other pull-requests
 2019-06-06 12:30:14 +02:00
Jeong Arm
91ae2d1275 Scroll to compose form when focus (#10970) 
* Scroll to compose form when focus

* Get rid of constructor
 2019-06-05 15:29:45 +02:00
ThibG
1fee4b0fe2 Fix refreshing featured toots when the new collection is empty (#10971) 
Fixes #10945
 2019-06-05 13:39:59 +02:00
Eugen Rochko
b01b8521ec Fix margins on profile metadata in single column mode (#10961) 2019-06-04 23:11:57 +02:00
Thibaut Girka
a76c660645 Merge remote-tracking branch 'upstream/master' into glitch-soc/merge-upstream 2019-06-04 20:40:19 +02:00
Eugen Rochko
4331f4948e Add profile directory link to single column navigation panel (#10963) 2019-06-04 19:50:38 +02:00
Jeong Arm
ca61d7577a Add missing Korean translations (#10962) 
And change some word.
 2019-06-04 18:00:09 +02:00
Jeong Arm
3d34bc17e2 [Glitch] Fix profile picture preview 
Port 77375ad7df to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-06-03 20:20:33 +02:00
Thibaut Girka
a4e0071538 Merge remote-tracking branch 'upstream/master' into glitch-soc/merge-upstream 
Conflicts:
- Gemfile.lock
- config/webpack/rules/css.js
- package.json
- yarn.lock
 2019-06-03 14:54:30 +02:00
Jeong Arm
77375ad7df Fix profile picture preview (#10931) 2019-06-02 18:04:41 +02:00
Thibaut Girka
1501b142d2 Fix expanding status from menu modal in glitch-soc 
Fixes #1085
 2019-06-02 14:11:32 +02:00
Takeshi Umeda
96ac52dabd Improvement variable height in single column layout (#10917) 
* Improvement variable height of compose and navigation panel in single column layout

* Fix wrong quotes and missing commas
 2019-06-02 10:05:54 +02:00
Hanage999
702dbf1622 Center 2-columns layout without side effect (#10915) 2019-06-01 07:59:21 +03:00
Thibaut Girka
206d0ea6a2 Merge branch 'master' into glitch-soc/merge-upstream 2019-05-30 13:31:01 +02:00
slice
fb0489022c Fix incorrect PropType in Glitch AutosuggestInput 2019-05-30 09:04:00 +02:00
slice
c12383e06c Remove isRequired from Glitch ReplyIndicator status 
This can be null under normal circumstances, which isRequired doesn't
like.
 2019-05-30 09:04:00 +02:00
Eugen Rochko
233a60f6a2 Change links in right panel to open in the same tab (#10848) 
For Rambox compatibility
 2019-05-29 17:33:35 +03:00
ThibG
0162dc0c9c Fix React warning about legacy lifecycle calls and sensitive status resetting (#10872) 2019-05-29 17:33:15 +03:00
Takeshi Umeda
9c174f4d02 Fix safari post field display issue in single column layout (#10883) 2019-05-29 12:03:56 +03:00
Alix Rossi
6f624f449e i18n: Update Corsican front-end translation (#10884) 2019-05-29 17:57:08 +09:00
mayaeh
7403b0ec05 Update Japanese translations. (#10875) 
run yarn manage:translations ja && i18n-tasks add-missing ja
 2019-05-29 11:09:59 +09:00
Aditoo17
d0dc7a60ab I18n: Update Czech translation (#10874) 2019-05-29 09:52:41 +09:00
Eugen Rochko
40117d908f [Glitch] Use <use /> to render transparent SVG logo instead of inserting it 
Port SCSS changes from c5234ac2aa to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-05-28 17:50:21 +02:00
Thibaut Girka
b9c5aed987 Merge branch 'master' into glitch-soc/merge-upstream 2019-05-28 17:45:06 +02:00
Eugen Rochko
7d2b4e9277 Refactor footers in web UI into a single component (#10846) 2019-05-27 21:58:41 +02:00
abcang
4c9d8f8ef9 Display notifications count on a new single column (#10859) 2019-05-27 21:56:29 +02:00
Thibaut Girka
938edb44a1 Fix video player regressions introduced by blurhash merge 2019-05-27 19:43:15 +02:00
Thibaut Girka
c1619a5c24 [Glitch] Add keyboard shortcut to hide/show media 
Port 7ee189fa60 and 9e238804ea to glitch-soc
 2019-05-27 19:43:15 +02:00
Eugen Rochko
c5234ac2aa Use <use /> to render transparent SVG logo instead of inserting it (#10845) 2019-05-27 03:33:39 +02:00
Takeshi Umeda
03054b27e1 Fix poll visibility on public pages (#10817) 
* Fix poll visibility on public pages

* Revert "Fix poll visibility on public pages"

This reverts commit 54a9608add6f855bc6337fe3c65eaee7ba13db49.

* Revert "Change poll options to alphabetic letters when status text is hidden"

This reverts commit c53d67326201b2061990b1874a3547c3647f50d2.
 2019-05-26 23:13:29 +02:00
Thibaut Girka
d46668d34b Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/controllers/settings/preferences_controller.rb
- app/lib/user_settings_decorator.rb
- app/models/user.rb

Conflicts due to the addition of a new preference upstream,
“advanced layout”.
 2019-05-26 15:41:40 +02:00
りんすき
c65b14059a [Glitch] Fix composer route opening when not needed 
Port 9ff2739fb5 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-05-26 13:50:15 +02:00
Neil Moore
139730e3db Create new click handler for status__expand area in status (#10837) 
This click handler only activates on left-click, resolving #10798.
This matches behavior in status_content.js, as added in #536
 2019-05-26 13:48:45 +02:00
Eugen Rochko
9e238804ea Fix null error in status component when determining showMedia state (#10838) 
* Fix null error in status component when determining showMedia state

Also update the showMedia value if the status passed to the
component changes

* Refactor media visibility computation into a defaultMediaVisibility function

* Fix default media visibility with reblogs
 2019-05-26 13:48:16 +02:00
Hanage999
66081c489f Fix wrong redirect from getting started to home in advanced Web UI (#10839) 
* update Ruby to 2.5.3

* Link to Getting Started will not redirect to Home in multi-column UI (https://github.com/tootsuite/mastodon/pull/10835)
 2019-05-26 12:22:33 +02:00
Eugen Rochko
6d4af23a69 Improvements to the single column layout (#10835) 
* Improvements to the single column layout

- Add follows and followers link to the right panel
- Increase margins around separators in right panel
- Add follow requests link with counter when account is locked to right panel

* Redirect from getting started to home when navigation panel is visible
 2019-05-26 02:55:37 +02:00
ThibG
7ee189fa60 Add a keyboard shortcut to hide/show media (#10647) 
* Move control of media visibility to parent component

* Add keyboard shortcut to toggle media visibility
 2019-05-25 23:20:51 +02:00
Mélanie Chauvel (ariasuni)
276c9e6e9e Avoid cutting bottom of letters of last paragraph of statuses (#10821) 2019-05-25 23:19:39 +02:00
Eugen Rochko
a1bceb2cb6 Add responsive panels to the single-column layout (#10820) 
* Add responsive panels to the single-column layout

* Fixes

* Fix not being able to save the preference

* Fix code style issues

* Set max-height on the compose textarea and add a link to relationship manager
 2019-05-25 21:27:00 +02:00
Thibaut Girka
57911e10c5 Use Sec-WebSocket-Protocol instead of query string to pass WebSocket token 
Inspired by https://github.com/kubevirt/kubevirt/issues/1242
 2019-05-24 16:08:09 +02:00
Thibaut Girka
e8b45064b8 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- streaming/index.js
 2019-05-24 15:23:52 +02:00
ThibG
7b1d582232 Improve streaming server security (#10818) 
* Check OAuth token scopes in the streaming API

* Use Sec-WebSocket-Protocol instead of query string to pass WebSocket token

Inspired by https://github.com/kubevirt/kubevirt/issues/1242
 2019-05-24 15:21:42 +02:00
Eugen Rochko
106cfa7553 Various improvements to single column layout (#10809) 
- Add potential side panels to single column layout
- Hide FAB on large screens
 2019-05-23 20:01:10 +02:00
nzws
3d860417a5 [Glitch] Fix stacking order of emoji picker 
Port 1fbe5c2fec to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-05-23 19:16:42 +02:00
Thibaut Girka
d445d5833e Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/models/account.rb
- app/views/settings/profiles/show.html.haml
- spec/controllers/api/v1/accounts/credentials_controller_spec.rb

Conflicts were due to an increase in account bio length upstream, which
is already covered in glitch-soc through `MAX_BIO_CHARS`.
 2019-05-23 19:01:30 +02:00
Thibaut Girka
9a101b91ae Make headers font size proportional 2019-05-23 12:41:38 +02:00
Eugen Rochko
f9ca3d62b6 Add forceSingleColumn prop to <UI /> (#10807) 
* Move TabsBar rendering logic from CSS to the ColumnsArea component

* Add forceSingleColumn mode

* Add unread notifications counter to tabs bar

* Add toggle to control `forceSingleColumn`

* Increase paddings in mobile layout responsively at large sizes
 2019-05-23 01:35:22 +02:00
nzws
1fbe5c2fec Fix stacking order of emoji picker (#10801) 2019-05-22 18:00:34 +02:00
dxwc
0a1ba7c14b i18n: Complete frontend Bengali translation (#10800) 
* i18n: Complete frontend Bengali translation

* run yarn manage:translations
 2019-05-22 10:00:58 +09:00
Thibaut Girka
a0b7246388 Refactor contentType selection in glitch composer 2019-05-20 10:27:31 +02:00
Thibaut Girka
0bc9d4f6d3 Use glitch-soc's poll component instead of upstream's 2019-05-19 23:24:53 +02:00
Thibaut Girka
e21662d370 Merge branch 'master' into glitch-soc/merge-upstream 2019-05-19 21:53:44 +02:00
Hinaloe
4de9bd3870 fix isSubmitting prop case (#10785) 2019-05-19 18:41:41 +02:00
Thibaut Girka
fd5da4033e Merge branch 'master' into glitch-soc/merge-upstream 2019-05-19 17:46:31 +02:00
Eugen Rochko
3a4761c665 Change poll options to alphabetic letters when status text is hidden (#10685) 
Fix #10569
 2019-05-18 14:41:16 +02:00
Thibaut Girka
b83cdc9b02 Export fallback content type and use it as default in WebUI 2019-05-17 23:51:14 +02:00
Thibaut Girka
dfeda8857f Hide content-type dropdown by default 2019-05-17 23:51:14 +02:00
Haelwenn (lanodan) Monnier
76d58bf63e Content-Type Dropdown: use the selected option icon for the menu 
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-05-17 23:51:14 +02:00
Thibaut Girka
8a49df8ede Support proper content-type in Delete & Redraft 2019-05-17 23:51:14 +02:00
KokaKiwi
08a981dd25 Add status content type dropdown to compose box. 
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-05-17 23:51:14 +02:00
ThibG
38272bbeb1 Merge pull request #1049 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2019-05-15 18:44:21 +02:00
Thibaut Girka
422dd06806 Merge branch 'master' into glitch-soc/merge-upstream 2019-05-15 17:11:40 +02:00
Neil Moore
59f6637559 Adds click-able div that expands status (#10733) (#10766) 
The clickable div is positioned under the account avatar and covers
all empty space below it to the end of the status.
 2019-05-15 06:53:23 +02:00
Thibaut Girka
d8e9a04354 Fix rich text style in reply indicator 2019-05-13 17:13:02 +02:00
Thibaut Girka
9f0ff9b6ea Fix rich text styling on public pages 2019-05-13 17:13:02 +02:00
Thibaut Girka
6e625755a6 Fix text color of some formatted elements in notifications 2019-05-12 19:23:32 +02:00
nzws
f79d089b65 Fix some colors in light theme (#10754) 
* Fix typo in light theme

* Fix background color of empty column
 2019-05-12 05:15:42 +02:00
ThibG
cfb69164ad Fix incorrect reference to raw_content (it is raw_text instead) (#10753) 2019-05-11 23:56:07 +02:00
ThibG
c8195e2da1 [Glitch] Use raw content if available on Delete & Redraft 
Port front-end changes from 2a917031c9 to glitch-soc
 2019-05-11 21:46:23 +02:00
Thibaut Girka
5262820fae Merge branch 'master' into glitch-soc/merge-upstream 2019-05-11 18:23:46 +02:00
Thibaut Girka
46b5085ced Use a checkbox for the “Mark media as sensitive” composer button 
Fixes #1039
 2019-05-11 12:35:38 +02:00
ThibG
0bb3ba2406 Merge pull request #1043 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2019-05-11 12:35:25 +02:00
ThibG
2a917031c9 Add toot source to delete result to ease Delete & Redraft (#10669) 
* Return Status with raw text in raw_content when deleting a status

* Use raw content if available on delete & redraft

* Rename raw_content to text; do not serialize formatted content when source is requested
 2019-05-11 06:46:43 +02:00
Maciek Baron
e060819020 [Glitch] Improve poll link accessibility 
Port fc40391743 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-05-10 19:05:57 +02:00
nzws
f625501c05 [Glitch] Fix some colors of high contrast theme 
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-05-10 18:59:12 +02:00
Aurélien Reeves
22541e98e2 [Glitch] Add confirm modal for unboosting toots 
Port d225a952a8 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-05-10 18:56:01 +02:00
Alix Rossi
062684bcf8 i18n: Update French translations (#10747) 
* Update French JSON

* i18n: Update fr.yml

* i18n: Update simple_form.fr.yml

* Update simple_form.fr.yml

* Update fr.yml
 2019-05-10 18:09:46 +02:00
Alix Rossi
1959e4e5ec i18n: Update Corsican translations (#10746) 
* i18n: Update Corsican translations

* Update co.yml

* Fix a translation in co.yml
 2019-05-10 18:09:34 +02:00
ThibG
01ba6c5d83 Change icon and label depending on whether media is marked as sensitive (#10748) 
* Change icon and label depending on whether media is marked as sensitive

* WiP use a checkbox
 2019-05-10 17:59:57 +02:00
Thibaut Girka
1bf48b01e3 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/controllers/statuses_controller.rb
  minor conflict because of glitch-soc's theming system
- app/controllers/stream_entries_controller.rb
  minor conflict because of glitch-soc's theming system
 2019-05-10 17:09:12 +02:00
Thibaut Girka
e55cf0042f Fix media description confirmation modal 
Fixes #1040
 2019-05-10 11:49:00 +02:00
Aurélien Reeves
d225a952a8 Add confirm modal for unboosting toots (#10287) 
[#3815]

Display the boost modal also when unboosting toots.
 2019-05-09 22:39:26 +02:00
ThibG
5cf2f8c646 Add emoji suggestions to CW and poll option fields (#10555) 
* Refactor selectComposeSuggestion so that different paths can be updated

* Add suggestions in CW field

* Add emoji suggestion to poll options

* Attempt to fix CSS

* Hide suggestions by default

They will be enabled if the input has focus
 2019-05-09 22:10:27 +02:00
Maciek Baron
fc40391743 Improve poll link accessibility (#10720) 
* Add distinction between hover and active/focus states
* Resolves #10198
 2019-05-09 22:03:32 +02:00
Jeong Arm
3288f4a571 Bring back crossed eye icon on gallery (#10715) 2019-05-08 18:01:33 +02:00
Thibaut Girka
e9f0c31dc6 Fix tabs bar on mobile 
Fixes #1037
 2019-05-08 00:32:53 +02:00
nzws
6b71076391 Fix some colors of high contrast theme (#10711) 
* Fix "nothing here" text color of high contrast

* Fix counter border color of high contrast
 2019-05-07 23:53:58 +02:00
Thibaut Girka
40a480ea34 Fix front-end crash when a video has a blurhash and is hidden behind a CW 2019-05-07 22:33:37 +02:00
spla
13244f7bb3 i18n Update Catalan translation (#10719) 
* Updated Catalan strings

* Update ca.yml

* Update ca.yml

* Update ca.yml

* Update ca.yml

* Update ca.yml

* Update ca.yml

* Update ca.yml

* Update simple_form.ca.yml

* Update simple_form.ca.yml

* Update simple_form.ca.yml

* bundle exec i18n-tasks

* Update ca.json

* Update simple_form.ca.yml

* i18n: Update Catalan translations

* i18n: Update Catalan translations

* i18n: Update Catalan translations

* i18n: Update Catalan translations

* i18n: Update Catalan translations

* i18n: Update Catalan translations

* i18n: Update Catalan translations

* i18n: Update Catalan translations

* i18n: Update Catalan translations

* i18n: Update Catalan translation

* i18n Update Catalan translation
 2019-05-07 00:55:37 +09:00
ThibG
139ef769f7 Add description on hover in media gallery (#10713) 2019-05-06 05:33:56 +02:00
Thibaut Girka
5052b8c29f Fix content warning button displaying a link icon when no status card is set 2019-05-05 21:47:05 +02:00
mayaeh
683a5ae765 i18n: Update Japanese translations (#10706) 
* Update Japanese translations.

run yarn manage:translations

This commit includes translations by some users that were done at the transifex.

* Reduce translation text because it becomes two lines.
 2019-05-06 04:34:32 +09:00
jeroenpraat
027f35c6a5 1 NL string update (#10709) 
* 1 NL string update

No that weblate isn't used anymore, it would be fine if, or the english strings are update, or there is somewhere an explanation how to generate new strings for a language

* Update nl.json
 2019-05-06 04:33:24 +09:00
Kirishima21
1592cab613 fix pinned columns ’s Media-only button 
Media-only toggles could not be used on pinned columns.
The commit fixes this problem.
 2019-05-05 20:54:21 +02:00
Baptiste Gelez
83665f0357 [Glitch] Make sure the instance banner is never cropped 
Port 05b2a77a6d to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-05-05 12:29:06 +02:00
Thibaut Girka
23829e09f5 Merge branch 'master' into glitch-soc/merge-upstream 2019-05-05 12:28:10 +02:00
Aditoo17
71fd62835e I18n: Update Czech translation 🇨🇿 (#10704) 
* I18n: Update Czech translation

* Tiny fix
 2019-05-05 15:33:33 +09:00
Baptiste Gelez
05b2a77a6d Make sure the instance banner is never cropped (#10702) 2019-05-05 01:07:15 +02:00
Thibaut Girka
850f8195fd Minor style fixes 2019-05-04 23:05:43 +02:00
Eugen Rochko
5df7b98c2b [Glitch] Change font weight of sensitive button to 500 
Port f7879bbe08 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-05-04 20:41:21 +02:00
Eugen Rochko
8050f86d04 [Glitch] Make the "mark media as sensitive" button more obvious in web UI 
Port cc39785d45 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-05-04 20:41:21 +02:00
Thibaut Girka
167808363d Add visibility icon back in media gallery 2019-05-04 20:06:17 +02:00
Thibaut Girka
43dc5ad0e5 Add back description on hover 2019-05-04 20:03:37 +02:00
ThibG
d0342a1a63 [Glitch] Fix transition: all 
Port 9e044c9649 to glitch-soc
 2019-05-04 19:53:09 +02:00
ThibG
09d6a2920d [Glitch] Make the cursor icon consistant across media types in account media gallery 2019-05-04 19:16:51 +02:00
Thibaut Girka
5d6f4ef070 Merge branch 'master' into glitch-soc/merge-upstream 2019-05-04 19:15:50 +02:00
Eugen Rochko
52c09770fe [Glitch] Add button to view context to media modal 
Port 4aabc452d0 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-05-04 19:10:24 +02:00
Eugen Rochko
6138cad296 [Glitch] Fix alignment of items in the account gallery in web UI and load more per page 
Port 78f5b96bf6 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-05-04 18:59:11 +02:00
Eugen Rochko
3b9ff1fa34 [Glitch] Change account gallery in web UI 
Port db73f8e585 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-05-04 18:54:57 +02:00
Thibaut Girka
61b5fd518c Minor CSS fixes 2019-05-04 18:18:15 +02:00
Eugen Rochko
87a7a9a4df [Glitch] Add blurhash 
Port front-end changes from a6d2fe7165 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-05-04 18:07:44 +02:00
ThibG
9e044c9649 Fix transition: all (#10699) 2019-05-04 17:39:53 +02:00
ThibG
d5357fcbf2 Minor account media gallery fixes (#10695) 
* Make the cursor icon consistant across media types in account media gallery

* Fix the video player modal causing scroll position to reset
 2019-05-04 17:36:43 +02:00
ThibG
0f1d2f4d71 Fix glitch SCSS for links in error messages in admin interface 
Port SCSS changes from 8c716f917f
 2019-05-04 16:43:08 +02:00
Thibaut Girka
73bc58c656 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/models/media_attachment.rb
 2019-05-04 16:37:26 +02:00
Thibaut Girka
d20647fd94 Fix polls icon not showing in CW button in detailed statuses 2019-05-03 21:55:50 +02:00
Eugen Rochko
f7879bbe08 Change font weight of sensitive button to 500 (#10682) 2019-05-03 20:44:20 +02:00
ThibG
8c716f917f Provide a link to existing domain block when trying to block an already-blocked domain (#10663) 
* When trying to block an already-blocked domain, provide a link to the block

* Fix styling for links in flash messages

* Allow blocks to be upgraded but not downgraded
 2019-05-03 20:36:36 +02:00
Thibaut Girka
c15b1aa00c Fix crash in onboarding modal 
Fixes #1027
 2019-05-03 19:24:54 +02:00
Eugen Rochko
4aabc452d0 Add button to view context to media modal (#10676) 
* Add "view context" button to media modal when opened from gallery

* Add "view context" button to video modal

Allow closing the video modal by navigating back in the browser,
just like the media modal
 2019-05-03 16:16:30 +02:00
ThibG
d8418c07c9 When selecting a toot via keyboard, ensure it is scrolled into view (#10593) 2019-05-03 06:20:35 +02:00
Eugen Rochko
cc39785d45 Make the "mark media as sensitive" button more obvious in web UI (#10673) 
* Make the "mark media as sensitive" button more obvious in web UI

* Use eye-slash icon instead of eye icon to mean "hide"
 2019-05-03 04:34:55 +02:00
Eugen Rochko
78f5b96bf6 Fix alignment of items in the account gallery in web UI and load more per page (#10674) 2019-05-03 04:02:55 +02:00
Eugen Rochko
db73f8e585 Change account gallery in web UI (#10667) 
- 3 items per row instead of 2
- Use blurhash for previews
- Animate/hover-to-play GIFs and videos
- Open media modal instead of opening status
- Allow opening status instead with ctrl+click and open in new tab
 2019-05-02 08:34:32 +02:00
Thibaut Girka
e53b2a9c37 Make hi-color privacy icons opt-in instead of opt-out 2019-05-01 20:23:25 +02:00
Thibaut Girka
f5f0bd6c0a Add high color privacy icons 
Fixes #1015
 2019-05-01 16:38:01 +02:00
Thibaut Girka
98732502f5 When selecting a toot via keyboard, ensure it is scrolled into view 
Fixes detailed status column
 2019-04-29 20:28:38 +02:00
Thibaut Girka
81c9377c7d Add support for missing formatting tags 2019-04-29 19:31:09 +02:00
Thibaut Girka
02bd678944 Add keyboard shortcut to collapse/uncollapse toots 2019-04-28 20:23:04 +02:00
Thibaut Girka
7ed89e9178 Add hotkey for bookmarking a toot 2019-04-28 20:23:04 +02:00
partev
f843bdbd73 Update hy.json (#10644) 2019-04-28 12:51:20 +09:00
Thibaut Girka
5a8b820767 Fix regression with textarea's caret position when selecting a suggestion 2019-04-27 21:40:42 +02:00
Eugen Rochko
a6d2fe7165 Add blurhash (#10630) 
* Add blurhash

* Use fallback color for spoiler when blurhash missing

* Federate the blurhash and accept it as long as it's at most 5x5

* Display unknown media attachments as blurhash placeholders

* Improve style of embed actions and spoiler button

* Change blurhash resolution from 3x3 to 4x4

* Improve dependency definitions

* Fix code style issues
 2019-04-27 03:24:09 +02:00
Thibaut Girka
b40841b488 Hide suggestions by default 
They will be enabled if the input has focus
 2019-04-26 22:38:03 +02:00
Thibaut Girka
e720f1eac2 Attempt to fix CSS 2019-04-26 22:38:03 +02:00
Thibaut Girka
4155a1556a Add emoji suggestion to poll options 2019-04-26 22:38:03 +02:00
Thibaut Girka
b35b38f4ea Add suggestions in CW field 2019-04-26 22:38:03 +02:00
Thibaut Girka
0541e4ad21 Refactor selectComposeSuggestion so that different paths can be updated 2019-04-26 22:38:03 +02:00
ThibG
23e87a4742 Fix upload progressbar when image resizing is involved (#10632) 2019-04-25 02:48:54 +02:00
Thibaut Girka
642a298ceb Do not ask to register web intent handler 2019-04-24 23:05:11 +02:00
Thibaut Girka
8942036345 Fix color of muted statuses content not wrapped in a p tag 2019-04-24 22:40:17 +02:00
Thibaut Girka
73f83ef399 Redesign blockquote styling 2019-04-24 22:40:17 +02:00
Thibaut Girka
f5ea016889 Better distinguish titles from text 2019-04-24 22:40:17 +02:00
Thibaut Girka
8003dd8849 Remove extra margin in paragraphs inside blockquotes 2019-04-24 22:40:17 +02:00
Thibaut Girka
a855f38086 Make bold text bolder 2019-04-24 22:40:17 +02:00
Thibaut Girka
ad30895262 Remove margins around p tags in lists 2019-04-24 22:40:17 +02:00
Thibaut Girka
ce2da44c2c Rename status__text to status__content__text for consistency with upstream 2019-04-24 22:40:17 +02:00
Thibaut Girka
facc95f71a Fix status header display in toot mobile menu 2019-04-24 20:21:19 +02:00
Thibaut Girka
b43cfd3eb3 Fix upload progressbar when image resizing is involved 2019-04-24 20:19:23 +02:00
Thibaut Girka
4a95bfe919 Hide media upload form if no media are attached 2019-04-24 19:47:11 +02:00
Thibaut Girka
07367bc6ec Fix file upload 2019-04-24 07:57:28 +02:00
Thibaut Girka
86108e7af7 Fix settings modal 2019-04-23 18:31:13 +02:00
Thibaut Girka
9aeb714b7a Add support for lists in statuses 2019-04-22 23:07:14 +02:00
Thibaut Girka
fea727c61a Do not switch to italic for status media buttons 2019-04-22 23:07:14 +02:00
Thibaut Girka
22ad8c89b2 Accept richer text from remote statuses 
Support abbr, del, pre, blockquote, code, strong, b, em, i, and h1…h5
HTML elements in remote statuses, add corresponding CSS.
 2019-04-22 23:07:14 +02:00
kedama
4ce6358787 [Glitch] Fix modal items cannot scroll on touch devices 
Port 92ced1e94b to glitch-soc
 2019-04-22 22:57:39 +02:00
Thibaut Girka
6f85bb754b Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/javascript/mastodon/features/compose/components/compose_form.js
  Upstream cleaned up a bit, including on lines in which
  we replaced the hardcoded 500 character limit with a maxChar
  constant. Applied the changes while keeping maxChar instead of 500.
- app/javascript/packs/public.js
  Moved upstream's new animated avatar hover handling in
  app/javascript/core/public.js
- app/javascript/styles/fonts/montserrat.scss
  Upstream fixed local font name, applied those changes.
- app/javascript/styles/fonts/roboto.scss
  Upstream fixed local font name, applied those changes.
- lib/mastodon/version.rb
  Upstream made repo URL configurable, did the same, but
  default to glitch-soc
 2019-04-22 20:40:04 +02:00
Thibaut Girka
1b8d2af1f9 Fix ReferenceError in dropdown 2019-04-22 20:15:47 +02:00
Thibaut Girka
25cfabce26 Fix broken reference to handleSubmit 2019-04-22 20:15:47 +02:00
Thibaut Girka
041e27bd2d Cleanup 2019-04-22 20:15:47 +02:00
Thibaut Girka
2ee26ba420 Move ComposerPublisher to Compose 2019-04-22 20:15:47 +02:00
Thibaut Girka
bf8b0394b7 Add OptionsContainer 2019-04-22 20:15:47 +02:00
Thibaut Girka
ef17da32f9 Move composer Dropdown from features/composer to features/compose 2019-04-22 20:15:47 +02:00
Thibaut Girka
a6bb49adf1 Move ComposerTextareaIcons to TextareaIcons 2019-04-22 20:15:47 +02:00
Thibaut Girka
08faf16d66 ComposerTextarea → AutosuggestTextarea 2019-04-22 20:15:47 +02:00
Thibaut Girka
513547ba57 ComposerUploadForm → UploadForm + UploadFormContainer 2019-04-22 20:15:47 +02:00
Thibaut Girka
f7d1772fc8 Move PollForm from features/composer to features/compose 2019-04-22 20:15:47 +02:00
Thibaut Girka
2021f14e8f Inline spoiler input 2019-04-22 20:15:47 +02:00
Thibaut Girka
3529f6f4ae ComposerReply → ReplyIndicator 2019-04-22 20:15:47 +02:00
Thibaut Girka
ad6166f0ef Refactor Compose*Warning → ContainerWarning 
Regression: only one warning at a time
 2019-04-22 20:15:47 +02:00
Thibaut Girka
5e4588524b features/composer/index.js → ComposeForm 2019-04-22 20:15:47 +02:00
Thibaut Girka
8ea0e64864 DrawerHeader → Header + HeaderContainer 2019-04-22 20:15:47 +02:00
Thibaut Girka
2f2381a400 DrawerAccount → NavigationBar + NavigationContainer 2019-04-22 20:15:47 +02:00
Eugen Rochko
7acc035cbe [Glitch] Show suggested follows on search screen in mobile layout 
Port 541fda5fc8 to glitch-soc
 2019-04-22 20:15:47 +02:00
Thibaut Girka
4aee182cd3 DrawerResults → SearchResults + SearchResultsContainer 2019-04-22 20:15:47 +02:00
Thibaut Girka
7c2cc9d681 Rework DrawerResults to make them closer to upstream 2019-04-22 20:15:47 +02:00
Thibaut Girka
5264424b71 Move DrawerSearch to Search + SearchContainer 2019-04-22 20:15:47 +02:00
Thibaut Girka
7fa3320516 Inline DrawerSearchPopout in DrawerSearch 2019-04-22 20:15:47 +02:00
Thibaut Girka
a55e1c1d49 Refactor a bit DrawerSearch to make it closer to upstream 2019-04-22 20:15:47 +02:00
Thibaut Girka
e41c4ad61b Rename flavours/glitch/features/drawer to flavours/glitch/features/compose 2019-04-22 20:15:47 +02:00
ThibG
eb80c3924f Allow switching between singe-option and multiple-option polls (#10603) 2019-04-22 14:56:14 +02:00
kedama
92ced1e94b Fix modal items cannot scroll on touch devices (#10605) 2019-04-22 14:55:50 +02:00
ThibG
3c6f8de45a Minor code cleanup (#10613) 2019-04-22 14:55:24 +02:00
Yamagishi Kazutoshi
47c0af88f1 Add hi.json (#10573) 2019-04-21 04:52:20 +02:00
partev
fe19e9d7b1 Update hy.json (#10591) 2019-04-21 04:48:47 +02:00
Jessica
d7c34fb945 Animate avatar GIFs on-hover on public profiles (#10549) 
* Third time is the charm?

* Use full asset URL for data-static and data-original

̀image_tag` expands to the full asset URL, we have to do the same in `data` attributes so that it can work when assets and user data are stored on a different host
 2019-04-21 04:47:39 +02:00
jeroenpraat
f7cc05db80 Update NL (Dutch) translation (#10601) 
* Update NL language strings

Have to do it this way, cause this file is locked on Weblate

* fix

* Update simple_form.nl.yml

* Update nl.yml
 2019-04-21 04:46:08 +02:00
ThibG
1fecdb013a Use correct local names for fonts (#10594) 2019-04-21 04:42:02 +02:00
Sho Kusano
1af37e09f3 Configrationable repository url (#10600) 
* config: Add GITHUB_REPOSITORY for repository name

* config: Add SOURCE_BASE_URL for repository url

* Show source_url and repository name on getting started
 2019-04-21 04:41:34 +02:00
Thibaut Girka
2da3b24eb8 [Glitch] Allow modal secondary button to shrink and allow wider confirmation modals 
Port a6fe7ae53c to glitch-soc
 2019-04-19 10:48:54 +02:00
Thibaut Girka
3673665b46 Merge branch 'master' into glitch-soc/merge-upstream 2019-04-19 10:44:10 +02:00
Thibaut Girka
619d55358f Shift+click on column Back button to return to last pinable column 2019-04-17 18:40:40 +02:00
Thibaut Girka
a4db307b6a When selecting a toot via keyboard, ensure it is scrolled into view 2019-04-17 10:07:33 +02:00
Thibaut Girka
ae88690fa6 Fix opening/closing gifv sometimes making the timeline scroll 2019-04-16 22:20:23 +02:00
ThibG
a6fe7ae53c Allow modal secondary button to shrink and allow wider confirmation modals (#10586) 
Fixes #10531
 2019-04-16 08:23:07 +09:00
Renato "Lond" Cerqueira
83420b9d41 Add new pt-br translations (#10564) 2019-04-13 21:23:41 +09:00
Thibaut Girka
5a24934449 Merge branch 'master' into glitch-soc/merge-upstream 2019-04-10 21:19:21 +02:00
Evgeny Petrov
4c19204392 i18n: Russian localization update (#10515) 
* i18n: Updated ru.json for Russian language

* i18n: Updated ru.yml

* Normalize ru.yml

* i18n: Updated simple_form.ru.yml

* i18n: Updated activerecord.ru.yml, devise.ru.yml, normalized strings

* Added new strings to ru.json

* Deleted unused (?) string

* i18n: Added recent strings (Settings refactor)
 2019-04-10 20:43:08 +02:00
Eugen Rochko
a0000b9a94 Weblate translations (2019-04-10) (#10545) 
* Translated using Weblate (Occitan)

Currently translated at 95.7% (780 of 815 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/oc/

* Translated using Weblate (Greek)

Currently translated at 100,0% (382 of 382 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/

* Translated using Weblate (Greek)

Currently translated at 100,0% (4 of 4 strings)

Translation: Mastodon/Activerecord
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/el/

* Translated using Weblate (Greek)

Currently translated at 100.0% (382 of 382 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/

* Translated using Weblate (French)

Currently translated at 100.0% (382 of 382 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/

* Translated using Weblate (French)

Currently translated at 100.0% (4 of 4 strings)

Translation: Mastodon/Activerecord
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/fr/

* Translated using Weblate (French)

Currently translated at 100.0% (66 of 66 strings)

Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/fr/

* Translated using Weblate (Dutch)

Currently translated at 100,0% (4 of 4 strings)

Translation: Mastodon/Activerecord
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/nl/

* Translated using Weblate (Galician)

Currently translated at 100,0% (4 of 4 strings)

Translation: Mastodon/Activerecord
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/gl/

* Translated using Weblate (Dutch)

Currently translated at 100,0% (382 of 382 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/

* Translated using Weblate (Galician)

Currently translated at 100,0% (382 of 382 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/gl/

* Translated using Weblate (Slovak)

Currently translated at 100.0% (382 of 382 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/

* Translated using Weblate (Arabic)

Currently translated at 97.4% (372 of 382 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/

* Translated using Weblate (French)

Currently translated at 100.0% (382 of 382 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/

* Translated using Weblate (Thai)

Currently translated at 75.4% (288 of 382 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/th/

* Translated using Weblate (Slovak)

Currently translated at 100.0% (4 of 4 strings)

Translation: Mastodon/Activerecord
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/sk/

* Translated using Weblate (German)

Currently translated at 100,0% (4 of 4 strings)

Translation: Mastodon/Activerecord
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/de/

* Translated using Weblate (Slovak)

Currently translated at 100,0% (4 of 4 strings)

Translation: Mastodon/Activerecord
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/sk/

* Translated using Weblate (Kazakh)

Currently translated at 100,0% (4 of 4 strings)

Translation: Mastodon/Activerecord
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/kk/

* Translated using Weblate (Persian)

Currently translated at 100.0% (382 of 382 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fa/

* Translated using Weblate (Kazakh)

Currently translated at 99.0% (378 of 382 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/kk/

* i18n-tasks normalize

* yarn manage:translations

* Fix empty string in Occitan
 2019-04-10 18:17:24 +02:00
Aditoo17
db70d35c3f I18n: Final Czech translation 🇨🇿 (#10542) 
* I18n: Update Czech translation

* I18n: Why do you want to join translation

* I18n: Translating a bunch of more stuff
 2019-04-10 14:52:08 +02:00
Marek Ľach
aced669796 Updates the grammar of the SK translation (#10541) 2019-04-10 14:50:39 +02:00
Eugen Rochko
771dc9235a [Glitch] Fix glitched out "not found" message for non-existing profiles in web UI 
Port 403338108e to glitch-soc
 2019-04-10 09:33:47 +02:00
Eugen Rochko
c97a40647a [Glitch] Add "why do you want to join" field to invite requests 
Port SCSS changes from 7eb05b8724 to glitch-soc
 2019-04-10 09:22:45 +02:00
Thibaut Girka
cde0ac1aa7 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/views/admin/pending_accounts/index.html.haml
  No real conflict, upstream changes too close to glitch-specific
  theming system changes.
- config/navigation.rb
  Upstream redesigned the settings navigation, took those changes
  and re-inserted the flavours menu.
 2019-04-10 09:16:08 +02:00
Yağızhan
6286ace752 Fixed terrible grammar and translated the most (#10527) 
The translation was written in bad Turkish grammar. I fixed those terrible phrases and translated %93 of Mastodon.

I'll come back and finish the translation.
 2019-04-09 20:42:01 +02:00
Eugen Rochko
7eb05b8724 Add "why do you want to join" field to invite requests (#10524) 
* Add "why do you want to join" field to invite requests

Fix #10512

* Remove unused translations

* Fix broken registrations when no invite request text is submitted
 2019-04-09 23:06:30 +09:00
Eugen Rochko
403338108e Fix glitched out "not found" message for non-existing profiles in web UI (#10517) 2019-04-09 05:02:48 +02:00
Quentí
5c9f6740c6 [i18n] Update and correction (#10511) 
* [i18n] Update and correction

* Update oc.json

* Update oc.json
 2019-04-09 07:39:50 +09:00
Thibaut Girka
0405e42c4a Add column title to “Favourited by” and “Boosted by” columns 2019-04-08 21:59:30 +02:00
ashleyhull-versent
85a9a248f9 [Glitch] Duplicate values 
Port 8037fa7d2e to glitch-soc
 2019-04-08 16:22:20 +02:00
Eugen Rochko
2b965f8d17 [Glitch] Port SCSS changes from "Improve blocked view of profiles" 
Port public pages SCSS changes from c84c30c542
 2019-04-08 16:20:46 +02:00
Thibaut Girka
5c8f9a3220 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- config/locales/pl.yml
  Conflict caused by new upstream string too close to glitch-specific
  “flavour” string. Took both strings.
 2019-04-08 15:57:56 +02:00
koyu
c66a043591 Updated German locales (#10505) 
* Updated German locales

* Added account approval locales (German)

* Updated JSON locales (German)
 2019-04-08 21:14:08 +09:00
Alix Rossi
a5a7780ad1 i18n: Update Corsican translations (#10504) 2019-04-08 21:12:06 +09:00
Aditoo17
20040927fc i18n: Update Czech translation (#10506) 2019-04-08 21:11:39 +09:00
Jeong Arm
d035f4af41 Translate Korean (#10499) 2019-04-08 12:35:37 +09:00
mayaeh
4f8beb3717 i18n: Update Japanese translations (#10494) 
* Update Japanese translations

* Update Japanese translations.
 2019-04-08 09:16:14 +09:00
Eugen Rochko
c84c30c542 Improve blocked view of profiles (#10491) 
* Revert "Fix filtering of favourited_by, reblogged_by, followers and following (#10447)"

This reverts commit 0317f37c6f.

* Revert "Hide blocking accounts from blocked users (#10442)"

This reverts commit 4cd944d364.

* Improve blocked view of profiles

- Change "You are blocked" to "Profile unavailable"
- Hide following/followers in API when blocked
- Disable follow button and show "Profile unavailable" on public profile as well
 2019-04-07 04:59:13 +02:00
Marek Ľach
1409a529dd Improve sk translation further (#10484) 
* Further improving Slovak translation

* Update sk.json
 2019-04-06 23:26:51 +09:00
ashleyhull-versent
b0348d0f92 tinyfix 2: unrequired arguments (#10471) 
* unrequired argument

* unrequired argument
 2019-04-06 12:02:03 +09:00
marcin mikołajczak
0e7c4d0c69 i18n: Update Polish translation (#10479) 
Signed-off-by: Marcin Mikołajczak <m4sk1n@m4sk1n.nazwa.pl>
 2019-04-06 02:51:13 +09:00
Marek Ľach
705a2b7615 Updates the Slovak translation (#10477) 
* Update sk.json

* Update sk.json

* Update sk.json
 2019-04-05 22:16:28 +09:00
jeroenpraat
4c20f5376a Dutch (nl) translation (#10474) 
* Translation Dutch

* Update activerecord.nl.yml

* Update devise.nl.yml

* Update nl.yml

* Update nl.yml

* Update devise.nl.yml

* Update nl.yml
 2019-04-05 06:12:08 +09:00
ashleyhull-versent
8037fa7d2e Duplicate values (#10470) 2019-04-04 23:22:55 +09:00
ThibG
3964cc964d Merge pull request #981 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2019-04-04 15:13:18 +02:00
ThibG
729b3841c3 [Glitch] Update poll remaining time just like with status timestamps 
Port 6e024f0d7a to glitch-soc
 2019-04-04 14:58:11 +02:00
Thibaut Girka
a835ea0e8f Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/controllers/following_accounts_controller.rb
  Conflicts were due to glitch-soc's theming system.
- app/javascript/packs/public.js
  Some code has been change upstream, but it has been
  moved to app/javascript/core/settings.js in glitch-soc.
  Applied the changes there.
 2019-04-04 14:53:52 +02:00
spla
f46cd7f002 i18n: update Catalan translation (#10458) 
* Updated Catalan strings

* Update ca.yml

* Update ca.yml

* Update ca.yml

* Update ca.yml

* Update ca.yml

* Update ca.yml

* Update ca.yml

* Update simple_form.ca.yml

* Update simple_form.ca.yml

* Update simple_form.ca.yml

* bundle exec i18n-tasks

* Update ca.json

* Update simple_form.ca.yml

* i18n: Update Catalan translations

* i18n: Update Catalan translations

* i18n: Update Catalan translations

* i18n: Update Catalan translations

* i18n: Update Catalan translations

* i18n: Update Catalan translations

* i18n: Update Catalan translations
 2019-04-04 10:25:20 +09:00
Thibaut Girka
b83e693c40 Do not handle clicks in detailed status content 2019-04-03 19:58:18 +02:00
ThibG
6e024f0d7a Update poll remaining time just like with status timestamps (#10466) 2019-04-03 18:16:55 +02:00
ThibG
aa7fe3101f Hopefully fix input text selection quirks on iOS (#10463) 
Fix #10448 (hopefully)
 2019-04-03 17:54:54 +02:00
Jeong Arm
7deedcc0cf Esperanto translations (#10461) 
* Esperanto translations

* Translate untranslated Esperanto strings

* Normalize eo translation
 2019-04-03 18:19:10 +09:00
Renato "Lond" Cerqueira
a0eaf51ad4 Re-dd PT-br translations (#10459) 2019-04-03 07:24:39 +09:00
spla
8cc94c38cf i18n: update catalan translations (#10455) 
* Updated Catalan strings

* Update ca.yml

* Update ca.yml

* Update ca.yml

* Update ca.yml

* Update ca.yml

* Update ca.yml

* Update ca.yml

* Update simple_form.ca.yml

* Update simple_form.ca.yml

* Update simple_form.ca.yml

* bundle exec i18n-tasks

* Update ca.json

* Update simple_form.ca.yml

* i18n: Update Catalan translations

* i18n: Update Catalan translations

* i18n: Update Catalan translations

* i18n: Update Catalan translations
 2019-04-03 01:31:36 +09:00
Aditoo17
445568eff3 I18n: Improve Czech translation (#10454) 2019-04-03 00:10:27 +09:00
Thibaut Girka
5eb2632410 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/models/form/admin_settings.rb
- config/locales/ja.yml
 2019-04-01 21:28:31 +02:00
ThibG
4cd944d364 Hide blocking accounts from blocked users (#10442) 
* Revert "Add indication that you have been blocked in web UI (#10420)"

This reverts commit d31affe69b.

* Revert "Add `blocked_by` relationship to the REST API (#10373)"

This reverts commit a8bb10633d.

* Hide blocking accounts from search results

* Filter blocking accouts from account followers

* Filter blocking accouts from account's following accounts

* Filter blocking accounts from “reblogged by” and “favourited by” lists

* Remove blocking account from URL search

* Return 410 on trying to fetch user data from a user who blocked us

* Return 410 in /api/v1/account/statuses for suspended or blocking accounts

* Fix status filtering when performing URL search

* Restore some React improvements

Restore some cleanup from d31affe69b

* Refactor by adding `without_blocking` scope
 2019-04-01 20:06:13 +02:00
mayaeh
0615bc56aa i18n: Update Japanese translations (#10427) 
* Update Japanese translations.

run yarn manage:translations && i18n-tasks add-missing

* Update Japanese translations.

* Fix mistake

* Change to be concise.
 2019-04-01 05:50:05 +02:00
Eugen Rochko
a547a214fd [Glitch] Fix transparent avatars showing underlying elements in avatar stack and profile 
Port 9a12568a33 to glitch-soc
 2019-03-30 18:19:40 +01:00
Eugen Rochko
2393504c23 [Glitch] Fix search in web UI not setting a limit, restore limit of 10 
Port 20769a332a to glitch-soc, but changing
the 5 limit to 10, since that's what we had previously
 2019-03-30 12:56:34 +01:00
Thibaut Girka
99336afaff Merge branch 'master' into glitch-soc/merge-upstream 2019-03-30 12:36:24 +01:00
Jeong Arm
1289e86116 Remove unused code (#10426) 2019-03-30 15:47:25 +09:00
Eugen Rochko
ed2862e249 Fix emoji-mart crashing web UI on search by reverting the upgrade to 2.10.0 (#10413) 
Fix #10315

This reverts commit e781d842a5.
 2019-03-30 01:41:35 +01:00
Eugen Rochko
9a12568a33 Fix transparent avatars showing underlying elements in avatar stack and profile (#10422) 2019-03-30 01:13:19 +01:00
Eugen Rochko
20769a332a Fix search in web UI not setting a limit, restore limit of 5 (#10421) 
The search API now supports returning more results and pagination,
but until the web UI implements pagination, it makes no sense to
dump so many results at once. This fix restores the behaviour
before the API change
 2019-03-30 00:43:38 +01:00
Eugen Rochko
d31affe69b Add indication that you have been blocked in web UI (#10420) 2019-03-30 00:43:29 +01:00
Aditoo17
0c334481cc I18n: Update Czech translation (#10419) 2019-03-29 16:59:48 +01:00
Jeong Arm
6c39082e87 Add missing Korean translations (#10416) 
* Fix Korean translation

* Add missing translation
 2019-03-29 22:14:24 +09:00
Alix Rossi
1ce9bd86b3 Update Corsican translations (#10418) 
* Update Corsican translation

* Update Corsican YML

* Corsican JSON fix

* Update co.yml
 2019-03-29 22:06:16 +09:00
Masoud Abkenar
c2e0b3487d l10n update: fa (#10417) 2019-03-29 22:04:55 +09:00
Alex Gessner
d1b617374c [Glitch] squashed identity proof updates 
Port JS from be7c92061c to glitch-soc
 2019-03-29 10:13:44 +01:00
Thibaut Girka
b29731bb10 Fix background color transition in destructive buttons 2019-03-28 20:45:10 +01:00
ThibG
4211c9b8d3 [Glitch] Fix opacity of relationship tags 
Port ddd7a9e44b to glitch-soc
 2019-03-28 19:56:40 +01:00
Thibaut Girka
773c600c26 Fix left border of profile navigation tab 2019-03-28 19:56:40 +01:00
Thibaut Girka
751739337d Add fa-info-circle to disclaimer 2019-03-28 19:56:40 +01:00
Thibaut Girka
a23e513f79 Fix double border for account disclaimer 2019-03-28 19:56:40 +01:00
slice
5900b0b206 [Glitch] Add rel='noopener' to redesigned profile column header avatar link 
Port da47c30eac to glitch-soc
 2019-03-28 19:56:40 +01:00
ThibG
fb17e24352 [Glitch] Move the account dropdown menubar to the right, make sure it doesn't move 
Port 2e5ec8b7c8 to glitch-soc
 2019-03-28 19:56:40 +01:00
Aditoo17
6df0d0fd51 [Glitch] Make clicking on avatar open public profile in new tab 
Port 70a78d968f to glitch-soc
 2019-03-28 19:56:40 +01:00
mayaeh
a338bde550 [Glitch] Fix menu items that don't action 
Port 798d9a6b4a to glitch-soc
 2019-03-28 19:56:40 +01:00
Eugen Rochko
cfbadfa392 [Glitch] Redesign profile column in web UI to match design on public pages 
Port 858bc12635 to glitch-soc
 2019-03-28 19:56:40 +01:00
Thibaut Girka
22d45fe6b9 Fix centering on public pages 2019-03-28 19:56:03 +01:00
Thibaut Girka
177a0ef2ec Fix padding and centering of display names 2019-03-28 19:56:03 +01:00
Thibaut Girka
1476826aba Port search results styling to glitch-soc 2019-03-28 19:56:03 +01:00
Thibaut Girka
1600aeb6cb Merge branch 'master' into glitch-soc/merge-upstream 2019-03-28 18:35:25 +01:00
ThibG
ddd7a9e44b Fix opacity of relationship tags (#10411) 2019-03-28 18:33:26 +01:00
Aditoo17
2a740c3e9a I18n: Update Czech translation (#10410) 2019-03-28 18:01:28 +01:00
Alex Gessner
be7c92061c squashed identity proof updates (#10375) 2019-03-28 18:01:09 +01:00
Thibaut Girka
0117de0a01 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/workers/activitypub/distribute_poll_update_worker.rb
- config/locales/pl.yml
 2019-03-28 13:01:33 +01:00
Eugen Rochko
f1a582dc15 Revert locales touched by automated translations (#10399) 
* Revert ruined translations

Regression from #10362

* yarn manage:translations
 2019-03-28 00:30:47 +01:00
slice
da47c30eac Add rel='noopener' to redesigned profile column header avatar link (#10393) 2019-03-27 17:08:26 +01:00
Thibaut Girka
451a79bda3 Revert "fix: update to emoji-mart 2.10.0 (#10281)" 
This reverts commit e781d842a5.
 2019-03-27 14:04:58 +01:00
Thibaut Girka
d72bc923e9 Revert "[Glitch] fix: update to emoji-mart 2.10.0" 
This reverts commit b0e478fcc5.
 2019-03-27 14:04:52 +01:00
Thibaut Girka
910fd88da2 Revert "Fix compilation after emoji-picker change" 
This reverts commit 05b79f07fa.
 2019-03-27 14:04:46 +01:00
Thibaut Girka
add1f52864 Merge branch 'master' into glitch-soc/merge-upstream 2019-03-27 14:01:19 +01:00
ThibG
2e5ec8b7c8 Move the account dropdown menubar to the right, make sure it doesn't move (#10390) 
* Move the account dropdown menubar to the right, make sure it doesn't move

* Fix margin
 2019-03-26 23:05:21 +01:00
ThibG
5ca976c776 [Glitch] Add a “Block & Report” button to the block confirmation dialog 
Port 36a6089a22 to glitch-soc
 2019-03-26 17:44:00 +01:00
Thibaut Girka
cab7e62235 Merge branch 'master' into glitch-soc/merge-upstream 2019-03-26 17:39:20 +01:00
ThibG
36a6089a22 Add a “Block & Report” button to the block confirmation dialog (#10360) 2019-03-26 17:34:02 +01:00
Aditoo17
70a78d968f Make clicking on avatar open public profile in new tab (#10387) 2019-03-26 17:33:07 +01:00
Hinaloe
824dc7c6b9 [Glitch] Do not set CSRF Token when no csrf header 
Port cc670c3234 to glitch-soc
 2019-03-26 16:12:46 +01:00
Eugen Rochko
36daf28215 [Glitch] Change icons of features on admin dashboard to remove bias 
Port SCSS changes from 88a85f2574 to glitch-soc
 2019-03-26 16:11:30 +01:00
Eugen Rochko
f6767a00d4 [Glitch] Add lang attribute to statuses in web UI 
Port JS changes from 0e730974cd to glitch-soc
 2019-03-26 16:09:59 +01:00