Alex Gleason
|
61c7e968e4
|
Throw out i18n changes
|
2020-09-17 22:06:17 -05:00 |
|
Curtis
|
ea75d9d18f
|
Merge branch 'develop' into 'translate_public_header'
# Conflicts:
# app/soapbox/locales/ar.json
# app/soapbox/locales/ast.json
# app/soapbox/locales/bg.json
# app/soapbox/locales/bn.json
# app/soapbox/locales/br.json
# app/soapbox/locales/ca.json
# app/soapbox/locales/co.json
# app/soapbox/locales/cs.json
# app/soapbox/locales/cy.json
# app/soapbox/locales/da.json
# app/soapbox/locales/de.json
# app/soapbox/locales/el.json
# app/soapbox/locales/en.json
# app/soapbox/locales/eo.json
# app/soapbox/locales/es-AR.json
# app/soapbox/locales/es.json
# app/soapbox/locales/et.json
# app/soapbox/locales/eu.json
# app/soapbox/locales/fa.json
# app/soapbox/locales/fi.json
# app/soapbox/locales/fr.json
# app/soapbox/locales/ga.json
# app/soapbox/locales/gl.json
# app/soapbox/locales/he.json
# app/soapbox/locales/hi.json
# app/soapbox/locales/hr.json
# app/soapbox/locales/hu.json
# app/soapbox/locales/hy.json
# app/soapbox/locales/id.json
# app/soapbox/locales/io.json
# app/soapbox/locales/it.json
# app/soapbox/locales/ja.json
# app/soapbox/locales/ka.json
# app/soapbox/locales/kk.json
# app/soapbox/locales/ko.json
# app/soapbox/locales/lt.json
# app/soapbox/locales/lv.json
# app/soapbox/locales/mk.json
# app/soapbox/locales/ms.json
# app/soapbox/locales/nl.json
# app/soapbox/locales/nn.json
# app/soapbox/locales/no.json
# app/soapbox/locales/oc.json
# app/soapbox/locales/pl.json
# app/soapbox/locales/pt-BR.json
# app/soapbox/locales/pt.json
# app/soapbox/locales/ro.json
# app/soapbox/locales/ru.json
# app/soapbox/locales/sk.json
# app/soapbox/locales/sl.json
# app/soapbox/locales/sq.json
# app/soapbox/locales/sr-Latn.json
# app/soapbox/locales/sr.json
# app/soapbox/locales/sv.json
# app/soapbox/locales/ta.json
# app/soapbox/locales/te.json
# app/soapbox/locales/th.json
# app/soapbox/locales/tr.json
# app/soapbox/locales/uk.json
# app/soapbox/locales/zh-CN.json
# app/soapbox/locales/zh-HK.json
# app/soapbox/locales/zh-TW.json
|
2020-08-31 02:19:58 +00:00 |
|
Alex Gleason
|
33c275e5f2
|
Run yarn manage:translations
|
2020-08-24 22:14:19 -05:00 |
|
Curtis
|
675f580d60
|
Resolve merge conflicts
Merge branch 'develop' into 'translate_public_header'
# Conflicts:
# app/soapbox/locales/ar.json
# app/soapbox/locales/ast.json
# app/soapbox/locales/bg.json
# app/soapbox/locales/bn.json
# app/soapbox/locales/br.json
# app/soapbox/locales/ca.json
# app/soapbox/locales/co.json
# app/soapbox/locales/cs.json
# app/soapbox/locales/cy.json
# app/soapbox/locales/da.json
# app/soapbox/locales/de.json
# app/soapbox/locales/defaultMessages.json
# app/soapbox/locales/el.json
# app/soapbox/locales/en.json
# app/soapbox/locales/eo.json
# app/soapbox/locales/es-AR.json
# app/soapbox/locales/es.json
# app/soapbox/locales/et.json
# app/soapbox/locales/eu.json
# app/soapbox/locales/fa.json
# app/soapbox/locales/fi.json
# app/soapbox/locales/fr.json
# app/soapbox/locales/ga.json
# app/soapbox/locales/gl.json
# app/soapbox/locales/he.json
# app/soapbox/locales/hi.json
# app/soapbox/locales/hr.json
# app/soapbox/locales/hu.json
# app/soapbox/locales/hy.json
# app/soapbox/locales/id.json
# app/soapbox/locales/io.json
# app/soapbox/locales/it.json
# app/soapbox/locales/ja.json
# app/soapbox/locales/ka.json
# app/soapbox/locales/kk.json
# app/soapbox/locales/ko.json
# app/soapbox/locales/lt.json
# app/soapbox/locales/lv.json
# app/soapbox/locales/mk.json
# app/soapbox/locales/ms.json
# app/soapbox/locales/nl.json
# app/soapbox/locales/nn.json
# app/soapbox/locales/no.json
# app/soapbox/locales/oc.json
# app/soapbox/locales/pl.json
# app/soapbox/locales/pt-BR.json
# app/soapbox/locales/pt.json
# app/soapbox/locales/ro.json
# app/soapbox/locales/ru.json
# app/soapbox/locales/sk.json
# app/soapbox/locales/sl.json
# app/soapbox/locales/sq.json
# app/soapbox/locales/sr-Latn.json
# app/soapbox/locales/sr.json
# app/soapbox/locales/sv.json
# app/soapbox/locales/ta.json
# app/soapbox/locales/te.json
# app/soapbox/locales/th.json
# app/soapbox/locales/tr.json
# app/soapbox/locales/uk.json
# app/soapbox/locales/zh-CN.json
# app/soapbox/locales/zh-HK.json
# app/soapbox/locales/zh-TW.json
|
2020-08-13 22:28:27 +00:00 |
|
Alex Gleason
|
6652df35b3
|
Run yarn manage:translations
|
2020-08-13 03:45:58 -05:00 |
|
crockwave
|
d70aa302b2
|
Added suffix to Back to <instance> button on public_layout header and created translations
|
2020-08-07 16:58:10 -05:00 |
|
Curtis ROck
|
0830d227a5
|
Added translations for public_header text elements
|
2020-08-05 21:12:15 -05:00 |
|
Alex Gleason
|
c0dc03b3e4
|
Deactivate --> Delete
|
2020-07-20 15:23:38 -05:00 |
|
Alex Gleason
|
79dcbd781d
|
Merge branch 'deactivate_account_from_profile' into 'develop'
Deactivate account from profile. Fixes #153
Closes #153
See merge request soapbox-pub/soapbox-fe!87
|
2020-07-20 19:55:02 +00:00 |
|
Sean King
|
1034cf6f04
|
New yarn translations
|
2020-07-12 11:18:39 -06:00 |
|
Alex Gleason
|
b6c0884a1d
|
Merge branch 'captcha_reload_on_click' into 'develop'
Made captcha reloadable on image click. Fixes #203
Closes #203
See merge request soapbox-pub/soapbox-fe!89
|
2020-07-11 19:34:51 +00:00 |
|
Alex Gleason
|
b1bae44165
|
Merge branch 'poll_hint_toggle_radiobutton' into 'develop'
Added mouseover hint to poll compose radiobutton. Fixes #215
Closes #215
See merge request soapbox-pub/soapbox-fe!88
|
2020-07-04 17:59:43 +00:00 |
|
Curtis
|
c28cc228a2
|
Merge branch 'develop' into 'captcha_reload_on_click'
# Conflicts:
# app/soapbox/locales/defaultMessages.json
|
2020-07-03 20:11:09 +00:00 |
|
Alex Gleason
|
1be7fa8c15
|
Run yarn manage:translations
|
2020-07-02 16:47:09 -05:00 |
|
Sean King
|
1a7cbb21a7
|
Audio player work (change of sensitive content handling)
|
2020-07-02 16:31:48 -05:00 |
|
crockwave
|
120ab7f120
|
Made captcha reloadable on image click
|
2020-06-28 15:42:38 -05:00 |
|
crockwave
|
86d9dea032
|
Added mouseover hint to poll compose radiobutton, to let user know that a click toggles between single and multi-choice polls
|
2020-06-28 12:34:14 -05:00 |
|
crockwave
|
a21589d9ce
|
translations
|
2020-06-28 11:09:03 -05:00 |
|
crockwave
|
8827b5ffd6
|
generated translations for account deactivation
|
2020-06-27 19:58:07 -05:00 |
|
Alex Gleason
|
5bfa2603db
|
Favourite --> Like, fixes #167
|
2020-06-08 20:48:11 -05:00 |
|
Alex Gleason
|
1f751cd324
|
TimelineQueueButtonHeader: yarn manage:translations and merge DE change
|
2020-06-07 11:37:57 -05:00 |
|
Alex Gleason
|
86508da96e
|
EditProfile: i18n
|
2020-06-06 15:52:33 -05:00 |
|
Alex Gleason
|
f3fb5bbed4
|
Preferences: i18n
|
2020-06-06 15:36:00 -05:00 |
|
Alex Gleason
|
af8d35469c
|
Add many more translatable fields
|
2020-06-06 14:57:05 -05:00 |
|
Alex Gleason
|
92d909e3c7
|
Run yarn manage:translations
|
2020-06-06 14:08:26 -05:00 |
|
Bárbara de Castro Fernandes
|
775f923708
|
Add 'block user' option to the report window
|
2020-05-29 15:05:24 -03:00 |
|
Alex Gleason
|
d24dcb3e60
|
gabsocial --> soapbox paths
|
2020-05-28 17:56:55 -05:00 |
|