treehouse
/
mastodon
20
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity
9,608 Commits
12 Branches
15 Tags
760 MiB
Commit Graph

9608 Commits (9f30a97e7f35cbd83e8ff368f8ce4c9f224839a1)

Author SHA1 Message Date
Thibaut Girka 9f30a97e7f Fix and refactor SCSS 2019-06-13 22:15:31 +02:00
Thibaut Girka 425efff741 Add app settings link to single-column mode 2019-06-13 22:15:31 +02:00
Eugen Rochko b6a6c3482e [Glitch] Fix position of search icon 
Port f698e28803 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-06-13 22:15:31 +02:00
Eugen Rochko 3a70752ab5 [Glitch] Fix some React warnings 
Port 5c1a46bdcf to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-06-13 22:15:31 +02:00
Eugen Rochko d0205ee469 [Glitch] Fix margins on profile metadata in single column mode 
Port b01b8521ec to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-06-13 22:15:31 +02:00
Wenceslao Páez Chávez e99bdc6304 [Glitch] Fix overlap of emoji button on search popup 
Port 796b8e8d34 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-06-13 22:15:31 +02:00
Takeshi Umeda 3565315aa2 [Glitch] Fix emoji picker being always displayed 
Port 88a04bf6c4 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-06-13 22:15:31 +02:00
Eugen Rochko 769823518c [Glitch] Add profile directory link to single column navigation panel 
Port 4331f4948e to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-06-13 22:15:31 +02:00
Takeshi Umeda 2a1e7f779b [Glitch] Improvement variable height in single column layout 
Port 96ac52dabd to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-06-13 22:15:31 +02:00
Hanage999 1e0b2ffccf [Glitch] Center 2-columns layout without side effect 
Port 702dbf1622 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-06-13 22:15:31 +02:00
Eugen Rochko 552d5f818a [Glitch] Refactor footers in web UI into a single component 
Port 7d2b4e9277 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-06-13 22:15:31 +02:00
abcang a5709d8b76 [Glitch] Display notifications count on a new single column 
Port 4c9d8f8ef9 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-06-13 22:15:31 +02:00
Hanage999 7b14777589 [Glitch] Fix wrong redirect from getting started to home in advanced Web UI 
Port 66081c489f to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-06-13 22:15:31 +02:00
Eugen Rochko 9cdb0fd8c5 [Glitch] Improvements to the single column layout 
Port 6d4af23a69 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-06-13 22:15:31 +02:00
Eugen Rochko 04edd3fbdb [Glitch] Add responsive panels to the single-column layout 
Port a1bceb2cb6 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-06-13 22:15:31 +02:00
Eugen Rochko 9a3e47d27c [Glitch] Various improvements to single column layout 
Port 106cfa7553 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-06-13 22:15:31 +02:00
Eugen Rochko aa9377f77a [Glitch] Add single-column mode 
Port f9ca3d62b6 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-06-13 22:15:31 +02:00
Thibaut Girka 4c2b1e87c7 Fix clicking on the elefriend 2019-06-13 13:49:05 +02:00
Thibaut Girka 3bf93a3612 Properly handle unboosting statuses from detailed view 
Fixes #1106
 2019-06-12 10:12:51 +02:00
ThibG 0e0e0d5718 Merge pull request #1105 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2019-06-11 22:18:41 +02:00
Eugen Rochko 9e868158a5 [Glitch] Fix list not being automatically unpinned when it returns 404 in web UI 
Port cbaff2bf53 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-06-11 21:57:32 +02:00
Thibaut Girka 1b4242ddf7 Merge branch 'master' into glitch-soc/merge-upstream 2019-06-11 21:55:00 +02:00
Eugen Rochko e73dad9ad1 Update Crowdin configuration file 2019-06-11 21:49:12 +02:00
Masoud Abkenar 572a3dfc21 l10n: update Persian translations (fa.yml) (#11052) 
* l10n: update Persian translations (fa.yml)

* Fix fa.yml syntax

* i18n-tasks normalize
 2019-06-12 02:55:29 +09:00
Masoud Abkenar d12625fa74 l10n: update Persian translation (#11050) 
* l10n: update Persian translation

* Update fa.yml
 2019-06-12 00:37:52 +09:00
唐宗勛 cca89f3e06 update zh-CN translations (#11046) 2019-06-11 13:08:40 +09:00
Jeong Arm f3c34e3743 Fix Korean translate (#11047) 2019-06-11 13:06:42 +09:00
Eugen Rochko cbaff2bf53 Fix list not being automatically unpinned when it returns 404 in web UI (#11045) 2019-06-11 02:26:37 +02:00
ThibG 254c1f3e50 Merge pull request #1102 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2019-06-10 23:01:56 +02:00
Eugen Rochko f03dd5728a Add German translations (#11043) 2019-06-10 21:36:20 +02:00
Thibaut Girka 403ab873d4 Merge branch 'master' into glitch-soc/merge-upstream 2019-06-10 20:09:05 +02:00
ThibG 17ee16cbfe Fix clicking on the left side of a conversation not marking it as read (#11041) 2019-06-10 19:27:10 +02:00
ふるふる cf7950977a Fix can't save preference other (#11042) 2019-06-10 19:26:43 +02:00
Eugen Rochko d0f90c3e9d [Glitch] Fix RTL layout not being RTL within the columns area 
Port b44ae7d284 to glitch-soc

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

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-06-10 18:59:59 +02:00
Thibaut Girka 5a158899bc 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 765b25f1cf Minor cleanup 2019-06-10 16:24:09 +02:00
Thibaut Girka 2fe493ba25 Fix unboost confirmation dialog not showing up on detailed statuses 2019-06-10 16:24:09 +02:00
Thibaut Girka 6819b3333e Add option to display a warning before boosting toots lacking media descriptions 2019-06-10 16:24:09 +02:00
Thibaut Girka 7dd32100c3 Add DM conversations mode similar to upstream 2019-06-10 16:23:42 +02:00
Eugen Rochko 75ef673216 Fix login sometimes redirecting to paths that are not pages (#11019) 
Fix #11016
 2019-06-10 12:28:13 +02:00
mayaeh 42a53e57d7 Fix emoji-button appearing above privacy-dropdown (#11027) 2019-06-10 12:27:17 +02:00
Marek Ľach 30946461be Update simple_form.sk.yml (#11028) 2019-06-10 16:25:27 +09:00
manuelviens 602bccc0ab Update simple_form.fr.yml (#11021) 2019-06-10 13:12:51 +09:00
manuelviens 2e12b42f2b Update fr.yml (#11023) 2019-06-10 13:12:28 +09:00
manuelviens efe4ef1b20 Update fr.json (#11024) 2019-06-10 13:07:11 +09:00
Marek Ľach 843bc1d3da Update sk.yml (#11015) 
* Update sk.yml

* Update sk.yml

* Update sk.yml

* Update sk.yml

* Update sk.yml

* Update sk.yml
 2019-06-09 22:55:37 +02:00
ThibG 585aa16ec0 Fix old migrations failing because of new version of `strong_migrations` (#11018) 2019-06-09 22:55:28 +02:00
Thibaut Girka c23e0e761e Fix old migrations failing because of new version of `strong_migrations` 
Fixes #1099
 2019-06-09 22:32:12 +02:00
Jeong Arm bd5ab2542c Add missing Korean translations (#11014) 2019-06-09 21:07:50 +02:00