tykayn
/
mastodon
mirror of https://framagit.org/tykayn/mastodon.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
9,591 Commits 20 Branches 113 Tags 222 MiB
Commit Graph

6690 Commits

Author SHA1 Message Date
Thibaut Girka fe5c4f976c Fix clicking on the elefriend 2019-06-13 13:49:05 +02:00
Thibaut Girka 32bdff09c1 Properly handle unboosting statuses from detailed view 
Fixes #1106
 2019-06-12 10:12:51 +02:00
Eugen Rochko 82899b3d2e [Glitch] Fix list not being automatically unpinned when it returns 404 in web UI 
Port 92b572e2a3 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-06-11 21:57:32 +02:00
Thibaut Girka 7065ba5930 Merge branch 'master' into glitch-soc/merge-upstream 2019-06-11 21:55:00 +02:00
Masoud Abkenar 69c2bbcc87 l10n: update Persian translation (#11050) 
* l10n: update Persian translation

* Update fa.yml
 2019-06-12 00:37:52 +09:00
唐宗勛 02323aa1d8 update zh-CN translations (#11046) 2019-06-11 13:08:40 +09:00
Eugen Rochko 92b572e2a3
Fix list not being automatically unpinned when it returns 404 in web UI (#11045) 2019-06-11 02:26:37 +02:00
Eugen Rochko ef438bd7e8
Add German translations (#11043) 2019-06-10 21:36:20 +02:00
Thibaut Girka 7778de467c Merge branch 'master' into glitch-soc/merge-upstream 2019-06-10 20:09:05 +02:00
ThibG 5bcd98172c Fix clicking on the left side of a conversation not marking it as read (#11041) 2019-06-10 19:27:10 +02:00
ふるふる 62852252dd Fix can't save preference other (#11042) 2019-06-10 19:26:43 +02:00
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
Eugen Rochko 8514ef723c
Fix login sometimes redirecting to paths that are not pages (#11019) 
Fix #11016
 2019-06-10 12:28:13 +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 8746f4d17b
Change priority of delete activity forwards for replies and reblogs (#11002) 
Fix #11001
 2019-06-09 12:47:33 +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
Eugen Rochko 560ec24e58
Change /settings/preferences to redirect to appearance, add /settings/preferences/other (#10988) 2019-06-07 16:51:08 +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
Eugen Rochko a60364ca7d
Add waiting time to list of pending accounts in admin UI (#10985) 2019-06-07 03:24:10 +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