Commit Graph

128 Commits

Author SHA1 Message Date
Wyatt Johnson c98c9b3369 Merge branch 'master' into next 2017-11-17 09:29:31 -07:00
Chi Vinh Le 5073e60df5 Translate 2017-11-14 14:05:30 +01:00
Chi Vinh Le 5a71db2568 Undo to previous status + Live updates 2017-11-14 13:58:18 +01:00
Wyatt Johnson 61df0e1eeb Merge branch 'master' into next 2017-11-08 13:49:21 -07:00
blackcathacker 903e70d641 updates per review 2017-10-31 17:10:25 -07:00
blackcathacker 07e6c15c3a add numbered shortcuts for mod queue 2017-10-30 23:08:33 -07:00
Chi Vinh Le d75ae3aca8 Revive resend verification feature 2017-10-23 18:46:41 +02:00
Belen Curcio 7494752019 Translations, Proptypes, NoComments Component 2017-10-19 11:20:09 -03:00
Belén Curcio 7fd09c3534 Merge branch 'master' into dropdown 2017-10-13 07:59:17 -03:00
Wyatt Johnson 5e74a044f3 Merge branch 'master' into cannot-ignore-staff 2017-10-12 15:38:18 -06:00
Belen Curcio c98cb02a4a Adding dropdown to ViewOptions 2017-10-12 13:52:17 -03:00
Belen Curcio c9ae622ec3 merge conflicts 2017-10-12 13:00:16 -03:00
Kim Gardner f035a9d1e9 Flagged Usernames --> Reported Usernames 2017-10-12 13:05:13 +01:00
Kim Gardner a48bfbaa69 Merge branch 'master' into dropdown 2017-10-11 09:49:19 +01:00
Kim Gardner dcfdec4df1 Merge branch 'master' into cannot-ignore-staff 2017-10-11 09:49:06 +01:00
Wyatt Johnson 29d7494385 fixed more yaml issues, added lint step 2017-10-10 14:04:37 -06:00
Kim Gardner bd7dfdbe55 Fix yml indentation 2017-10-10 18:52:53 +01:00
Wyatt Johnson 91931b2e6f Merge branch 'master' into flags-locales 2017-10-10 11:22:59 -06:00
Wyatt Johnson cab94842aa small naming change 2017-10-10 11:22:19 -06:00
Wyatt Johnson 86c3c286ee Graph fixes and migrations
- Added migrations for mapping old keys
- Added migration for fixing old dont agree flags
- Removed enum requirement for output
2017-10-10 11:22:19 -06:00
Kim Gardner d11ac54e1d Merge branch 'master' into cannot-ignore-staff 2017-10-10 18:19:11 +01:00
Kim Gardner e40a30d200 Fixes and cleanup 2017-10-10 17:17:04 +01:00
Kim Gardner 33e25403e7 Rename file to da.yml 2017-10-10 17:04:27 +01:00
Belen Curcio f2ea269f7a Merge branch 'master' of github.com:coralproject/talk into dropdown 2017-10-10 12:26:29 -03:00
Kim Gardner b77c330823 Update i18n code 2017-10-10 14:02:07 +01:00
Kim Gardner 69ace56172 Merge branch 'master' into Danish-Translation 2017-10-10 13:08:44 +01:00
Kim Gardner d6e7bb0a0a Merge branch 'master' into flags-locales 2017-10-10 13:08:19 +01:00
Kim Gardner 3c7e0462f5 Merge branch 'master' into cannot-ignore-staff 2017-10-10 13:06:54 +01:00
Belen Curcio 16847f9fec Translations and PropTypes 2017-10-10 02:48:12 -03:00
Morten Nissen 046a17801e Fixed some mistakes, and general proof reading 2017-10-09 20:38:29 +02:00
Daniel Janeiro 0c7b35ffde Add cannot ignore staff error 2017-10-07 21:51:58 +01:00
Gerardo Galvez e4ff48ea88 Merge branch 'moderate-shortcuts' of https://github.com/gerardogalvez/talk into moderate-shortcuts 2017-10-06 20:20:48 -05:00
Gerardo Galvez cbd7337dbc Add spanish translations and cleaner way to get the activeTabIndex 2017-10-06 20:19:30 -05:00
Morten Nissen c0e9836a57 Added danish translation 2017-10-07 01:50:11 +02:00
Wyatt Johnson 970a93360a Merge branch 'master' into flags-locales 2017-10-06 11:04:27 -06:00
Kim Gardner 387316849a Merge branch 'master' into moderate-shortcuts 2017-10-06 17:34:46 +01:00
Kiwi cca0a6df71 Merge branch 'master' into master 2017-10-06 13:43:21 +02:00
Gerardo Gálvez 931b5ad3ac Merge branch 'master' into moderate-shortcuts 2017-10-05 17:18:18 -05:00
Gerardo Galvez c0bb5e5cb2 Add moderator shortcuts to open search and switch between queues. 2017-10-05 16:57:46 -05:00
amorimgustavo f164ad8013 Update pt_BR.yml
Hello Folks,

Just edited some (several actually :) messages in your pt_BR.yml for your consideration.

You may consider using:

- "Banido" instead of "proibido"
- "Perfil" or "Usuario" instead of "Bio"
- "Opinião" instead of "Feedback"
- "Denunciar" instead of "Reportar"
- "Usuários(as)" instead of "Comentaristas"
- "Listas" instead of "Hilos" or "Filas"
- "Conversas" instead of "Histórias"

Hope you like those suggestions.

Cheers.
Gustavo
2017-10-05 17:10:42 -03:00
Kim Gardner a677c698bf Merge branch 'master' into master 2017-10-05 16:53:52 +01:00
Dusty Williams 1510ade47a revised error message for comments less than two characters in length - dmw 2017-10-05 08:33:29 -04:00
Rishabh04-02 b3486ce614 displaying time in X minutes Y seconds 2017-10-05 10:48:12 +05:30
Wyatt Johnson 2b08ef5c42 updated translations 2017-10-04 11:08:34 -06:00
Wyatt Johnson 00de72a6eb Initial work for locking flag type and providing translations 2017-10-03 17:20:40 -06:00
Chi Vinh Le 18b802c555 Merge branch 'master' into toxicity-detail 2017-10-02 22:30:49 +07:00
Chi Vinh Le 1c16a75f6b Merge branch 'master' into toxicity-detail
Conflicts:
	plugin-api/beta/client/components/index.js
2017-10-02 22:27:57 +07:00
Chi Vinh Le d3d7f909d8 Translations 2017-10-02 22:22:00 +07:00
Vicky Chijwani 06ced883ba Fix double preposition in French and Portuguese translations 2017-10-01 05:16:43 +05:30
Vicky Chijwani f7e6f67f4e Fix double preposition in string
This string is followed by a relative time duration with a preposition included, like "in 1 week".
2017-10-01 05:06:10 +05:30