mirrors
/
mastodon-glitch
mirror of https://github.com/glitch-soc/mastodon
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
10,013 Commits
69 Branches
21 Tags
355 MiB
Commit Graph

3567 Commits (43b137e1f91a5cbe42e16b9cc9db7fdbe5d01099)

Author SHA1 Message Date
Eugen Rochko fc6d27daf3 [Glitch] Fix RTL layout not being RTL within the columns area 
Port 25f93f4097 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-06-10 18:59:59 +02:00
Eugen Rochko 59d214e54b [Glitch] Change preferences page into appearance, notifications, and other 
Port SCSS changes from 1db4117030 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-06-10 18:59:59 +02:00
Thibaut Girka 1b0ff4cd69 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/controllers/settings/notifications_controller.rb
- app/javascript/packs/public.js
- app/views/settings/preferences/show.html.haml
- app/views/stream_entries/_simple_status.html.haml
- config/locales/simple_form.en.yml
- config/locales/simple_form.pl.yml
- config/navigation.rb
- config/routes.rb
 2019-06-10 18:59:53 +02:00
Thibaut Girka b45f555a0c Minor cleanup 2019-06-10 16:24:09 +02:00
Thibaut Girka b551d8aa53 Fix unboost confirmation dialog not showing up on detailed statuses 2019-06-10 16:24:09 +02:00
Thibaut Girka ccfb48d3eb Add option to display a warning before boosting toots lacking media descriptions 2019-06-10 16:24:09 +02:00
Thibaut Girka d61a6271c6 Add DM conversations mode similar to upstream 2019-06-10 16:23:42 +02:00
mayaeh 210fa3a94e Fix emoji-button appearing above privacy-dropdown (#11027) 2019-06-10 12:27:17 +02:00
manuelviens ce556333ce Update fr.json (#11024) 2019-06-10 13:07:11 +09:00
Alix Rossi 9a281bac8d i18n: Update Corsican front-end translation (#11010) 2019-06-09 23:23:30 +09:00
Eugen Rochko e5bdfd1640
Run yarn manage:translations (#11008) 2019-06-09 15:52:42 +02:00
Eugen Rochko 9add88a920
Fix position of search icon (#11003) 2019-06-09 01:59:42 +02:00
spla 6ecf1825ef i18n: Update Catalan translations (#10998) 
* 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

* i18n: Update Catalan translations

* i18n: Update Catalan translations
 2019-06-09 08:32:22 +09:00
Eugen Rochko 241a8e7b5f
Fix more issues in the light theme (#10996) 
* Fix tabs bar in light theme

* Fix borders on small screens in light theme
 2019-06-08 22:32:59 +02:00
Aditoo17 537e928186 I18n: Update Czech translation 🇨🇿 (#10995) 
* I18n: Update Czech translation

* Fix

* Re-fix

* And also this

* The real fix now (hopefully)
 2019-06-08 17:58:40 +02:00
ThibG e9ddd5a159 Put poll options behind content warnings (#10983) 
* Put poll options behind CWs in WebUI

* Put polls behind CWs on public pages

* Add poll icon to public pages CWs

* Revert to not showing an icon in the CW button
 2019-06-08 17:40:59 +02:00
Eugen Rochko 20dda5cca0
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 f4bc77f290
Improve light theme (#10992) 2019-06-08 10:23:41 +02:00
Eugen Rochko 25f93f4097
Fix RTL layout not being RTL within the columns area (#10990) 2019-06-07 23:35:26 +02:00
Eugen Rochko aec3fa35fd [Glitch] Fix not being able to directly switch between list timelines in web UI 
Port 5bfd802c57 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-06-07 17:39:46 +02:00
ThibG 417989ae34 [Glitch] Fix “mark as sensitive” not being used in delete & redraft 
Port 2657765d2a to glitch-soc
 2019-06-07 17:39:46 +02:00
Jeong Arm b32a62fe95 [Glitch] Scroll to compose form when focus 
Port 8f3c32e29c to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-06-07 17:39:46 +02:00
Eugen Rochko cc8f6b3cda
Fix some React warnings (#10989) 2019-06-07 17:15:18 +02:00
Thibaut Girka 01aae33a5f [Glitch] Fix refreshing featured toots when the new collection is empty 
Port d34a3a2cc7 to glitch-soc
 2019-06-07 17:05:32 +02:00
Thibaut Girka 34b8346e7f 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 8360019896 Fix display of alt-text when a media attachment is not available 2019-06-07 16:39:07 +02:00
ThibG cdb420862e Fix display of alt-text when a media attachment is not available (#10981) 2019-06-07 12:41:08 +02:00
Eugen Rochko 1db4117030
Change preferences page into appearance, notifications, and other (#10977) 2019-06-07 03:39:24 +02:00
Yamagishi Kazutoshi c672676c03 Fix sass-lint config (#10982) 2019-06-06 18:51:46 +02:00
Wenceslao Páez Chávez fe3bf3b0fc Fix overlap of emoji button on search popup (#10978) 2019-06-06 13:40:17 +02:00
Thibaut Girka a7f6e72b30 Fix CW field automatically getting the focus when it is always enabled 2019-06-06 13:26:42 +02:00
Eugen Rochko 5bfd802c57
Fix not being able to directly switch between list timelines in web UI (#10973) 2019-06-06 13:04:49 +02:00
ThibG 2657765d2a Fix “mark as sensitive” not being used in delete & redraft (#10980) 2019-06-06 13:04:34 +02:00
Takeshi Umeda c402c291f4 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 8f3c32e29c 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 d34a3a2cc7 Fix refreshing featured toots when the new collection is empty (#10971) 
Fixes #10945
 2019-06-05 13:39:59 +02:00
Eugen Rochko ed19f33440
Fix margins on profile metadata in single column mode (#10961) 2019-06-04 23:11:57 +02:00
Thibaut Girka 02b56c7e1a Merge remote-tracking branch 'upstream/master' into glitch-soc/merge-upstream 2019-06-04 20:40:19 +02:00
Eugen Rochko 6077eca240
Add profile directory link to single column navigation panel (#10963) 2019-06-04 19:50:38 +02:00
Jeong Arm a1e96b2d8a Add missing Korean translations (#10962) 
And change some word.
 2019-06-04 18:00:09 +02:00
Jeong Arm 8eb7c3304e [Glitch] Fix profile picture preview 
Port e13e4b28db to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-06-03 20:20:33 +02:00
Thibaut Girka 76918554a6 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 e13e4b28db Fix profile picture preview (#10931) 2019-06-02 18:04:41 +02:00
Thibaut Girka 5b92910664 Fix expanding status from menu modal in glitch-soc 
Fixes #1085
 2019-06-02 14:11:32 +02:00
Takeshi Umeda d93b82af87 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 7c1ca0c37b Center 2-columns layout without side effect (#10915) 2019-06-01 07:59:21 +03:00
Thibaut Girka 06036081a0 Merge branch 'master' into glitch-soc/merge-upstream 2019-05-30 13:31:01 +02:00
slice 22130a0947 Fix incorrect PropType in Glitch AutosuggestInput 2019-05-30 09:04:00 +02:00
slice e04724296b 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 8d9755e5f5
Change links in right panel to open in the same tab (#10848) 
For Rambox compatibility
 2019-05-29 17:33:35 +03:00
ThibG 3333250ede Fix React warning about legacy lifecycle calls and sensitive status resetting (#10872) 2019-05-29 17:33:15 +03:00
Takeshi Umeda 7f203f7c49 Fix safari post field display issue in single column layout (#10883) 2019-05-29 12:03:56 +03:00
Alix Rossi 33ec9c5095 i18n: Update Corsican front-end translation (#10884) 2019-05-29 17:57:08 +09:00
mayaeh c6e1229a82 Update Japanese translations. (#10875) 
run yarn manage:translations ja && i18n-tasks add-missing ja
 2019-05-29 11:09:59 +09:00
Aditoo17 0c2ca1bd38 I18n: Update Czech translation (#10874) 2019-05-29 09:52:41 +09:00
Eugen Rochko 56d8faab18 [Glitch] Use `<use />` to render transparent SVG logo instead of inserting it 
Port SCSS changes from 8d5dcc9301 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-05-28 17:50:21 +02:00
Thibaut Girka 3d73d76e55 Merge branch 'master' into glitch-soc/merge-upstream 2019-05-28 17:45:06 +02:00
Eugen Rochko 451e5980b6
Refactor footers in web UI into a single component (#10846) 2019-05-27 21:58:41 +02:00
abcang 3593b85423 Display notifications count on a new single column (#10859) 2019-05-27 21:56:29 +02:00
Thibaut Girka 6d60701bfa Fix video player regressions introduced by blurhash merge 2019-05-27 19:43:15 +02:00
Thibaut Girka b4d4138cf9 [Glitch] Add keyboard shortcut to hide/show media 
Port a472190729 and 988342a56c to glitch-soc
 2019-05-27 19:43:15 +02:00
Eugen Rochko 8d5dcc9301
Use `<use />` to render transparent SVG logo instead of inserting it (#10845) 2019-05-27 03:33:39 +02:00
Takeshi Umeda 3b9c02506d 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 20d01a954e 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
りんすき fdb3952b20 [Glitch] Fix composer route opening when not needed 
Port c1e77b56a9 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-05-26 13:50:15 +02:00
Neil Moore 63483ee543 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 988342a56c
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 4a818ac2de 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 0e445ebb13
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 a472190729 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) 4168aeb234 Avoid cutting bottom of letters of last paragraph of statuses (#10821) 2019-05-25 23:19:39 +02:00
Eugen Rochko 1e5532e693
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 7fb76999af 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 652147a3f4 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- streaming/index.js
 2019-05-24 15:23:52 +02:00
ThibG d63c3c0cef 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 84dc21d55d
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 a1143a19c0 [Glitch] Fix stacking order of emoji picker 
Port 8a378d4c3d to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-05-23 19:16:42 +02:00
Thibaut Girka c0dc247bce 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 0744d6e571 Make headers font size proportional 2019-05-23 12:41:38 +02:00
Eugen Rochko 9ddeb30f90
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 8a378d4c3d Fix stacking order of emoji picker (#10801) 2019-05-22 18:00:34 +02:00
dxwc ee0e68e97a 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 4fbce23992 Refactor contentType selection in glitch composer 2019-05-20 10:27:31 +02:00
Thibaut Girka 2cd7bfac23 Use glitch-soc's poll component instead of upstream's 2019-05-19 23:24:53 +02:00
Thibaut Girka 08a2af27c3 Merge branch 'master' into glitch-soc/merge-upstream 2019-05-19 21:53:44 +02:00
Hinaloe bb9d7fad9f fix `isSubmitting` prop case (#10785) 2019-05-19 18:41:41 +02:00
Thibaut Girka f509815379 Merge branch 'master' into glitch-soc/merge-upstream 2019-05-19 17:46:31 +02:00
Eugen Rochko 6fe474837c
Change poll options to alphabetic letters when status text is hidden (#10685) 
Fix #10569
 2019-05-18 14:41:16 +02:00
Thibaut Girka 56245a2a72 Export fallback content type and use it as default in WebUI 2019-05-17 23:51:14 +02:00
Thibaut Girka 9df1ef87c2 Hide content-type dropdown by default 2019-05-17 23:51:14 +02:00
Haelwenn (lanodan) Monnier c2fa36bbae 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 93d98f62a8 Support proper content-type in Delete & Redraft 2019-05-17 23:51:14 +02:00
KokaKiwi f34a402a94 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 c1cf8c1636
Merge pull request #1049 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2019-05-15 18:44:21 +02:00
Thibaut Girka 6badf2d252 Merge branch 'master' into glitch-soc/merge-upstream 2019-05-15 17:11:40 +02:00
Neil Moore 4ab094d35e 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 4bab7d7640 Fix rich text style in reply indicator 2019-05-13 17:13:02 +02:00
Thibaut Girka 87d16698c2 Fix rich text styling on public pages 2019-05-13 17:13:02 +02:00
Thibaut Girka cd534830ad Fix text color of some formatted elements in notifications 2019-05-12 19:23:32 +02:00
nzws 3e15a845c1 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 dd118449c2 Fix incorrect reference to raw_content (it is raw_text instead) (#10753) 2019-05-11 23:56:07 +02:00
ThibG 93085c273c [Glitch] Use raw content if available on Delete & Redraft 
Port front-end changes from 6d44f2441b to glitch-soc
 2019-05-11 21:46:23 +02:00
Thibaut Girka 2b97d9d780 Merge branch 'master' into glitch-soc/merge-upstream 2019-05-11 18:23:46 +02:00
Thibaut Girka 3ea5c045d7 Use a checkbox for the “Mark media as sensitive” composer button 
Fixes #1039
 2019-05-11 12:35:38 +02:00
ThibG fe00f7a7e4
Merge pull request #1043 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2019-05-11 12:35:25 +02:00
ThibG 6d44f2441b 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 14d855c429 [Glitch] Improve poll link accessibility 
Port 0402c52f28 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-05-10 19:05:57 +02:00
nzws 78ff7e3821 [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 96f0747afe [Glitch] Add confirm modal for unboosting toots 
Port fe8a8f779e to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-05-10 18:56:01 +02:00
Alix Rossi 775ee63b71 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 d25e358f9f 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 6dc9baad2a 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 68629f2773 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 d4d4e84324 Fix media description confirmation modal 
Fixes #1040
 2019-05-10 11:49:00 +02:00
Aurélien Reeves fe8a8f779e 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 f2be71c293 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 0402c52f28 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 09eea46631 Bring back crossed eye icon on gallery (#10715) 2019-05-08 18:01:33 +02:00
Thibaut Girka 3191c3b349 Fix tabs bar on mobile 
Fixes #1037
 2019-05-08 00:32:53 +02:00
nzws 5c82d660d1 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 2c767f44bf 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 7562602df8 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 b2f5b1045f Add description on hover in media gallery (#10713) 2019-05-06 05:33:56 +02:00
Thibaut Girka 89d2859296 Fix content warning button displaying a link icon when no status card is set 2019-05-05 21:47:05 +02:00
mayaeh 1eb14ef774 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 e742bff19b 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 8383222026 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 eef8802325 [Glitch] Make sure the instance banner is never cropped 
Port 21209c2b52 to glitch-soc

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

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

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

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-05-04 20:41:21 +02:00
Thibaut Girka b1ab4d5ebe Add visibility icon back in media gallery 2019-05-04 20:06:17 +02:00
Thibaut Girka cbda1b8b66 Add back description on hover 2019-05-04 20:03:37 +02:00
ThibG 8e221cd22b [Glitch] Fix transition: all 
Port 7aa749ab46 to glitch-soc
 2019-05-04 19:53:09 +02:00
ThibG b7f69beebe [Glitch] Make the cursor icon consistant across media types in account media gallery 2019-05-04 19:16:51 +02:00
Thibaut Girka 52a4284fe5 Merge branch 'master' into glitch-soc/merge-upstream 2019-05-04 19:15:50 +02:00
Eugen Rochko bc97fd641f [Glitch] Add button to view context to media modal 
Port eb63217210 to glitch-soc

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

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

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

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-05-04 18:07:44 +02:00
ThibG 7aa749ab46 Fix transition: all (#10699) 2019-05-04 17:39:53 +02:00
ThibG 4f73cde4e1 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 1149ddd3da Fix glitch SCSS for links in error messages in admin interface 
Port SCSS changes from 011b032300
 2019-05-04 16:43:08 +02:00
Thibaut Girka 33c80e0783 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/models/media_attachment.rb
 2019-05-04 16:37:26 +02:00
Thibaut Girka 9f25ab9792 Fix polls icon not showing in CW button in detailed statuses 2019-05-03 21:55:50 +02:00
Eugen Rochko 63b1388fef
Change font weight of sensitive button to 500 (#10682) 2019-05-03 20:44:20 +02:00
ThibG 011b032300 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 7617f78359 Fix crash in onboarding modal 
Fixes #1027
 2019-05-03 19:24:54 +02:00
Eugen Rochko eb63217210
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 5121d9c12f When selecting a toot via keyboard, ensure it is scrolled into view (#10593) 2019-05-03 06:20:35 +02:00
Eugen Rochko 05ef3462ba
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 967e419f8f
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 3f143606fa
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 cc5a81b7d8 Make hi-color privacy icons opt-in instead of opt-out 2019-05-01 20:23:25 +02:00
Thibaut Girka ac54292d69 Add high color privacy icons 
Fixes #1015
 2019-05-01 16:38:01 +02:00
Thibaut Girka d4c95e6a8a 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 3e095cab83 Add support for missing formatting tags 2019-04-29 19:31:09 +02:00
Thibaut Girka 67fb9a8679 Add keyboard shortcut to collapse/uncollapse toots 2019-04-28 20:23:04 +02:00
Thibaut Girka f3acf8f414 Add hotkey for bookmarking a toot 2019-04-28 20:23:04 +02:00
partev 5e79dd3f17 Update hy.json (#10644) 2019-04-28 12:51:20 +09:00
Thibaut Girka cd9a284702 Fix regression with textarea's caret position when selecting a suggestion 2019-04-27 21:40:42 +02:00
Eugen Rochko fba96c808d
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 aa1832ac4d Hide suggestions by default 
They will be enabled if the input has focus
 2019-04-26 22:38:03 +02:00
Thibaut Girka fddd8251dd Attempt to fix CSS 2019-04-26 22:38:03 +02:00
Thibaut Girka d7e4be285a Add emoji suggestion to poll options 2019-04-26 22:38:03 +02:00
Thibaut Girka df52004fe6 Add suggestions in CW field 2019-04-26 22:38:03 +02:00
Thibaut Girka 3a671470ec Refactor selectComposeSuggestion so that different paths can be updated 2019-04-26 22:38:03 +02:00
ThibG 852ccea676 Fix upload progressbar when image resizing is involved (#10632) 2019-04-25 02:48:54 +02:00
Thibaut Girka 1c0402c103 Do not ask to register web intent handler 2019-04-24 23:05:11 +02:00
Thibaut Girka b13c90f3e3 Fix color of muted statuses content not wrapped in a p tag 2019-04-24 22:40:17 +02:00
Thibaut Girka e4b65e6349 Redesign blockquote styling 2019-04-24 22:40:17 +02:00
Thibaut Girka 8753e5317f Better distinguish titles from text 2019-04-24 22:40:17 +02:00
Thibaut Girka 3631c3314a Remove extra margin in paragraphs inside blockquotes 2019-04-24 22:40:17 +02:00
Thibaut Girka 9b86707b1e Make bold text bolder 2019-04-24 22:40:17 +02:00
Thibaut Girka 5a8495dabe Remove margins around `p` tags in lists 2019-04-24 22:40:17 +02:00
Thibaut Girka ef249a2718 Rename status__text to status__content__text for consistency with upstream 2019-04-24 22:40:17 +02:00
Thibaut Girka adbb174c9c Fix status header display in toot mobile menu 2019-04-24 20:21:19 +02:00
Thibaut Girka ef1504d625 Fix upload progressbar when image resizing is involved 2019-04-24 20:19:23 +02:00
Thibaut Girka ffab9d626a Hide media upload form if no media are attached 2019-04-24 19:47:11 +02:00
Thibaut Girka 416aa832e5 Fix file upload 2019-04-24 07:57:28 +02:00
Thibaut Girka 3d722b0c4e Fix settings modal 2019-04-23 18:31:13 +02:00
Thibaut Girka 27e8354914 Add support for lists in statuses 2019-04-22 23:07:14 +02:00
Thibaut Girka 659f972bed Do not switch to italic for status media buttons 2019-04-22 23:07:14 +02:00
Thibaut Girka 2e3640ecbb 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 039e35560c [Glitch] Fix modal items cannot scroll on touch devices 
Port d763d39d26 to glitch-soc
 2019-04-22 22:57:39 +02:00
Thibaut Girka a9eaa780f5 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 c3fa4e8e07 Fix ReferenceError in dropdown 2019-04-22 20:15:47 +02:00
Thibaut Girka d779ec1f0e Fix broken reference to handleSubmit 2019-04-22 20:15:47 +02:00
Thibaut Girka e949861176 Cleanup 2019-04-22 20:15:47 +02:00
Thibaut Girka faff152ae5 Move ComposerPublisher to Compose 2019-04-22 20:15:47 +02:00
Thibaut Girka df951c319c Add OptionsContainer 2019-04-22 20:15:47 +02:00
Thibaut Girka 14028655df Move composer Dropdown from features/composer to features/compose 2019-04-22 20:15:47 +02:00
Thibaut Girka 4c6221929f Move ComposerTextareaIcons to TextareaIcons 2019-04-22 20:15:47 +02:00
Thibaut Girka 47faf47ed5 ComposerTextarea → AutosuggestTextarea 2019-04-22 20:15:47 +02:00
Thibaut Girka a243567a3e ComposerUploadForm → UploadForm + UploadFormContainer 2019-04-22 20:15:47 +02:00
Thibaut Girka c5f49a92dc Move PollForm from features/composer to features/compose 2019-04-22 20:15:47 +02:00
Thibaut Girka f1a22e33e2 Inline spoiler input 2019-04-22 20:15:47 +02:00
Thibaut Girka 8fd599fb40 ComposerReply → ReplyIndicator 2019-04-22 20:15:47 +02:00
Thibaut Girka f72af5794d Refactor Compose*Warning → ContainerWarning 
Regression: only one warning at a time
 2019-04-22 20:15:47 +02:00
Thibaut Girka 1bc4b8a0a5 features/composer/index.js → ComposeForm 2019-04-22 20:15:47 +02:00
Thibaut Girka 281a82d878 DrawerHeader → Header + HeaderContainer 2019-04-22 20:15:47 +02:00
Thibaut Girka 9a2f10fe8b DrawerAccount → NavigationBar + NavigationContainer 2019-04-22 20:15:47 +02:00
Eugen Rochko 9b9816aba6 [Glitch] Show suggested follows on search screen in mobile layout 
Port ad510db3a1 to glitch-soc
 2019-04-22 20:15:47 +02:00
Thibaut Girka 149aa07409 DrawerResults → SearchResults + SearchResultsContainer 2019-04-22 20:15:47 +02:00
Thibaut Girka 67771e6d65 Rework DrawerResults to make them closer to upstream 2019-04-22 20:15:47 +02:00
Thibaut Girka ab3e8fc542 Move DrawerSearch to Search + SearchContainer 2019-04-22 20:15:47 +02:00
Thibaut Girka c92ab35b19 Inline DrawerSearchPopout in DrawerSearch 2019-04-22 20:15:47 +02:00
Thibaut Girka c19b983986 Refactor a bit DrawerSearch to make it closer to upstream 2019-04-22 20:15:47 +02:00
Thibaut Girka eed2c9dd44 Rename flavours/glitch/features/drawer to flavours/glitch/features/compose 2019-04-22 20:15:47 +02:00
ThibG 0e78862b61 Allow switching between singe-option and multiple-option polls (#10603) 2019-04-22 14:56:14 +02:00
kedama d763d39d26 Fix modal items cannot scroll on touch devices (#10605) 2019-04-22 14:55:50 +02:00
ThibG bdec58b514 Minor code cleanup (#10613) 2019-04-22 14:55:24 +02:00
Yamagishi Kazutoshi 80c9cb0eb3 Add hi.json (#10573) 2019-04-21 04:52:20 +02:00
partev d210d0a655 Update hy.json (#10591) 2019-04-21 04:48:47 +02:00
Jessica 01b1c377b1 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 951f8d5b44 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 6e620dcab1 Use correct local names for fonts (#10594) 2019-04-21 04:42:02 +02:00
Sho Kusano 3e6c7f3617 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 8b7b65e995 [Glitch] Allow modal secondary button to shrink and allow wider confirmation modals 
Port 7f75792bf3 to glitch-soc
 2019-04-19 10:48:54 +02:00
Thibaut Girka 268417daf3 Merge branch 'master' into glitch-soc/merge-upstream 2019-04-19 10:44:10 +02:00
Thibaut Girka e3c1472040 Shift+click on column Back button to return to last pinable column 2019-04-17 18:40:40 +02:00
Thibaut Girka 8d57c0e70e When selecting a toot via keyboard, ensure it is scrolled into view 2019-04-17 10:07:33 +02:00
Thibaut Girka fbec0edf08 Fix opening/closing gifv sometimes making the timeline scroll 2019-04-16 22:20:23 +02:00
ThibG 7f75792bf3 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 d305d8747d Add new pt-br translations (#10564) 2019-04-13 21:23:41 +09:00
Thibaut Girka 2f422b708f Merge branch 'master' into glitch-soc/merge-upstream 2019-04-10 21:19:21 +02:00
Evgeny Petrov 5dd14dfded 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 793b0513eb
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 4e59f709aa 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 3dea62bfa2 Updates the grammar of the SK translation (#10541) 2019-04-10 14:50:39 +02:00
Eugen Rochko 92e1950194 [Glitch] Fix glitched out "not found" message for non-existing profiles in web UI 
Port 56f29c38b6 to glitch-soc
 2019-04-10 09:33:47 +02:00
Eugen Rochko fa4b51a110 [Glitch] Add "why do you want to join" field to invite requests 
Port SCSS changes from 8b69a66380 to glitch-soc
 2019-04-10 09:22:45 +02:00
Thibaut Girka 5085559b15 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 2cb16c20a6 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 8b69a66380 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 56f29c38b6
Fix glitched out "not found" message for non-existing profiles in web UI (#10517) 2019-04-09 05:02:48 +02:00
Quentí ba1a78d168 [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 cb410f80a4 Add column title to “Favourited by” and “Boosted by” columns 2019-04-08 21:59:30 +02:00
ashleyhull-versent ac071d65de [Glitch] Duplicate values 
Port bd365cc38b to glitch-soc
 2019-04-08 16:22:20 +02:00
Eugen Rochko df42de68e5 [Glitch] Port SCSS changes from "Improve blocked view of profiles" 
Port public pages SCSS changes from 67b3b62b98
 2019-04-08 16:20:46 +02:00
Thibaut Girka f5f6d23d55 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 3f036ac6b8 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 6e111152e0 i18n: Update Corsican translations (#10504) 2019-04-08 21:12:06 +09:00
Aditoo17 ae58bbd705 i18n: Update Czech translation (#10506) 2019-04-08 21:11:39 +09:00
Jeong Arm 619bbc23ef Translate Korean (#10499) 2019-04-08 12:35:37 +09:00
mayaeh a265696991 i18n: Update Japanese translations (#10494) 
* Update Japanese translations

* Update Japanese translations.
 2019-04-08 09:16:14 +09:00