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

38626 commits

This branch
This branch
All branches
Author SHA1 Message Date
Eugen Rochko
d13bc8eb6a
Update crowdin.yml 2019-06-12 15:11:00 +02:00
Thibaut Girka
3bf93a3612 Properly handle unboosting statuses from detailed view 
Fixes #1106
 2019-06-12 10:12:51 +02:00
Thibaut Girka
32bdff09c1 Properly handle unboosting statuses from detailed view 
Fixes #1106
 2019-06-12 10:12:51 +02:00
mayaeh
cd9d96c895 i18n: Update Japanese translations (#11035) 
* Update Japanese translations

Co-authored-by: Phroneris <phroneris@gmail.com>
Co-authored-by: ruine0213 <ruine@spiele.jp>

* Update Japanese translations
 2019-06-12 02:29:48 +02:00
mayaeh
7652190509 i18n: Update Japanese translations (#11035) 
* Update Japanese translations

Co-authored-by: Phroneris <phroneris@gmail.com>
Co-authored-by: ruine0213 <ruine@spiele.jp>

* Update Japanese translations
 2019-06-12 02:29:48 +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
ThibG
cde30407c6
Merge pull request #1105 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2019-06-11 22:18:41 +02:00
Eugen Rochko
d23753acab Update Crowdin configuration file 2019-06-11 22:04:04 +02:00
Eugen Rochko
963d7e0377 Update Crowdin configuration file 2019-06-11 22:04:04 +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
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
1b4242ddf7 Merge branch 'master' into glitch-soc/merge-upstream 2019-06-11 21:55:00 +02:00
Thibaut Girka
7065ba5930 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
Eugen Rochko
4913c345b2 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
30e2f724ce 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
Masoud Abkenar
69c2bbcc87 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
唐宗勛
02323aa1d8 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
Jeong Arm
40be49fe28 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
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
ThibG
254c1f3e50 Merge pull request #1102 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2019-06-10 23:01:56 +02:00
ThibG
c64eef1206
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
Eugen Rochko
ef438bd7e8
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
Thibaut Girka
7778de467c 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
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
ふるふる
cf7950977a Fix can't save preference other (#11042) 2019-06-10 19:26:43 +02:00
ふるふる
62852252dd 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
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
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
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
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
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
765b25f1cf Minor cleanup 2019-06-10 16:24:09 +02:00
Thibaut Girka
b45f555a0c 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
b551d8aa53 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
ccfb48d3eb 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
Thibaut Girka
d61a6271c6 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