Kim Gardner
764d562497
Merge branch 'master' into ReadersNotifications
2017-10-10 18:18:58 +01:00
Kim Gardner
98f46409ca
Merge pull request #1070 from coralproject/viewing-options
...
Viewing Options, and bug fixing
2017-10-10 18:13:09 +01:00
Belen Curcio
0d66e42313
Merge branch 'viewing-options' of github.com:coralproject/talk into viewing-options
2017-10-10 13:16:37 -03:00
Belen Curcio
154949ff47
Update
2017-10-10 13:12:55 -03:00
Belén Curcio
4d0d0735e8
Merge branch 'master' into viewing-options
2017-10-10 12:20:59 -03:00
Kiwi
bd73140f23
Merge branch 'master' into ReadersNotifications
2017-10-10 15:38:54 +02:00
Kim Gardner
522857f0d6
Merge pull request #1079 from Rarer/Danish-Translation
...
Danish translation
2017-10-10 13:59:58 +01:00
Kim Gardner
69ace56172
Merge branch 'master' into Danish-Translation
2017-10-10 13:08:44 +01:00
Kim Gardner
6a2b6bb845
Merge branch 'master' into ReadersNotifications
2017-10-10 13:07:37 +01:00
Kim Gardner
c0a54b6538
Merge branch 'master' into viewing-options
2017-10-10 13:06:18 +01:00
Kim Gardner
15f07b1360
Merge pull request #1068 from tylerbrewer2/fix-shortcut-icon
...
fix hidden shortcut icon
2017-10-10 13:05:20 +01:00
Belén Curcio
29c7c9e810
Merge branch 'master' into viewing-options
2017-10-10 00:18:03 -03:00
PepeFranco
c81d9c0bd1
Added notifications when flagging failed
2017-10-09 21:59:47 -05:00
Morten Nissen
046a17801e
Fixed some mistakes, and general proof reading
2017-10-09 20:38:29 +02:00
Tyler Brewer
48c291a9c3
Merge branch 'master' into fix-shortcut-icon
2017-10-09 11:01:26 -04:00
Kiwi
77d30bdbc1
Merge pull request #1066 from gerardogalvez/moderate-shortcuts
...
Add moderator shortcuts to open search and switch between queues.
2017-10-09 08:59:03 +02: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
Belén Curcio
c7bf3c1a3c
Merge branch 'master' into moderate-shortcuts
2017-10-06 18:07:30 -03:00
Tyler Brewer
bb78ba9b0b
Merge branch 'master' into fix-shortcut-icon
2017-10-06 16:09:59 -04:00
Kiwi
62834ae412
Merge pull request #1067 from lancekruegger/Issue-1024-forgot-password-flow
...
Update forgot password flow to match site styling
2017-10-06 21:43:14 +02:00
David Erwin
0c62ff0f9f
Merge branch 'master' into Issue-1024-forgot-password-flow
2017-10-06 15:38:26 -04:00
Kiwi
380f20d525
Merge pull request #1072 from kamos1/fix-1037
...
fix issue 1037
2017-10-06 21:35:45 +02:00
Lance Ruegger
252ec8f6ac
Change full constructor to use class property, fix typo in handleChangeEmail, pass value to TextField to ensure they stay in sync.
2017-10-06 12:26:03 -07:00
kamos1
e95e0381c2
remove removeNewLine and add .trim to length variable
2017-10-06 13:25:32 -06:00
kamos1
8ab31d7009
add trim to prevent empty spaces, tabs and other whitespace characters
2017-10-06 13:19:37 -06:00
kamos1
57f8a64cf4
fix issue 1037
2017-10-06 12:24:58 -06:00
Kim Gardner
387316849a
Merge branch 'master' into moderate-shortcuts
2017-10-06 17:34:46 +01:00
Kim Gardner
26c1d22ec3
Merge branch 'master' into fix-shortcut-icon
2017-10-06 17:30:28 +01:00
Belen Curcio
dbe6e675c9
Modal Keys should show on tablet
2017-10-06 13:02:18 -03:00
Kim Gardner
916596fe53
Merge branch 'master' into Issue-1024-forgot-password-flow
2017-10-06 15:36:38 +01:00
Belen Curcio
0f6bbb21a3
Fix drawer too
2017-10-06 11:05:38 -03:00
Belen Curcio
c2cbf91cad
Merge branch 'master' of github.com:coralproject/talk into viewing-options
2017-10-06 11:02:46 -03:00
Belen Curcio
fe689c5888
Margin Top
2017-10-06 10:52:16 -03:00
Belen Curcio
e1f5fe1f77
Responsive Ready
2017-10-06 10:50:48 -03:00
Belen Curcio
848c04539c
Select working
2017-10-06 10:35:04 -03:00
Belen Curcio
e4b225b4c2
ViewingOptions, Cards, Proptypes and MediaQueries
2017-10-06 10:10:08 -03:00
Kiwi
787f11118c
Merge pull request #1059 from Rishabh04-02/master
...
displaying time in X minutes Y seconds
2017-10-06 14:38:20 +02:00
Kiwi
cca0a6df71
Merge branch 'master' into master
2017-10-06 13:43:21 +02:00
Kim Gardner
596cd57274
Merge pull request #1065 from amorimgustavo/patch-1
...
Update pt_BR.yml
2017-10-06 12:14:17 +01:00
Kim Gardner
b02ccd792c
Merge branch 'master' into patch-1
2017-10-06 12:09:41 +01:00
Kiwi
ad5a6c539a
Merge branch 'master' into master
2017-10-06 12:04:42 +02:00
tylerbrewer2
a4591ecb55
fix hidden shortcut icon
2017-10-05 20:51:54 -04:00
Lance Ruegger
6c95502b4e
Change DOM input to coral-ui TextField to inherit styling, add prop-types validation, convert from using ref to using state.
2017-10-05 17:36:38 -07: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
Wyatt Johnson
1b33b62af0
Merge pull request #1057 from vickychijwani/slackbot
...
Slack notifications plugin for new comments
2017-10-05 15:27:04 -06:00
Vicky Chijwani
bf0901e77f
Wrap Slack call in process.nextTick() to avoid blocking comment creation.
2017-10-06 02:17:45 +05:30
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