Commit Graph
6581 Commits
Author SHA1 Message Date
KiwiandGitHub f712e426e2 Merge pull request #1081 from PepeFranco/ReadersNotifications
Added notifications when flagging failed
2017-10-11 08:50:52 +02:00
KiwiandGitHub a0f9242f02 Merge branch 'master' into ReadersNotifications 2017-10-11 08:44:36 +02:00
Wyatt JohnsonandGitHub fa6c0afe93 Merge pull request #1085 from coralproject/snyk-fix-cdba6ef9
[Snyk Update] New fixes for 4 vulnerable dependency paths
2017-10-11 00:36:52 -06:00
snyk-bot 5f9d47a199 fix: package.json & .snyk to reduce vulnerabilities
The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/npm:mime:20170907


The following vulnerabilities are fixed with a Snyk patch:
- https://snyk.io/vuln/npm:marked:20170112

Latest report for coralproject/talk:
https://snyk.io/test/github/coralproject/talk
2017-10-11 02:07:15 +00:00
Jose FrancoandGitHub 14d2b63f2e Merge branch 'master' into ReadersNotifications 2017-10-10 12:58:43 -05:00
PepeFranco cf59bb213c Changed FlagButton to use getErrorMessages util for failed flagging instead of custom messages 2017-10-10 12:55:32 -05:00
PepeFranco cecf2f4606 Merge branch 'ReadersNotifications' of https://github.com/PepeFranco/talk into ReadersNotifications 2017-10-10 12:54:51 -05:00
Kim GardnerandGitHub 398dedf75b Merge pull request #1080 from facuesr/ie11-issues
Fix issue 1071
2017-10-10 18:19:50 +01:00
Kim GardnerandGitHub 764d562497 Merge branch 'master' into ReadersNotifications 2017-10-10 18:18:58 +01:00
Kim GardnerandGitHub 48af316380 Merge branch 'master' into ie11-issues 2017-10-10 18:13:28 +01:00
Kim GardnerandGitHub 98f46409ca Merge pull request #1070 from coralproject/viewing-options
Viewing Options, and bug fixing
2017-10-10 18:13:09 +01:00
Kim GardnerandGitHub dee5651709 Merge branch 'master' into ie11-issues 2017-10-10 18:09:54 +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
PepeFranco c8dc1f84e6 Merge branch 'master' of https://github.com/coralproject/talk into ReadersNotifications 2017-10-10 11:03:15 -05:00
Belén CurcioandGitHub 4d0d0735e8 Merge branch 'master' into viewing-options 2017-10-10 12:20:59 -03:00
KiwiandGitHub bd73140f23 Merge branch 'master' into ReadersNotifications 2017-10-10 15:38:54 +02:00
Kim GardnerandGitHub 522857f0d6 Merge pull request #1079 from Rarer/Danish-Translation
Danish translation
2017-10-10 13:59:58 +01:00
Kim GardnerandGitHub 69ace56172 Merge branch 'master' into Danish-Translation 2017-10-10 13:08:44 +01:00
Kim GardnerandGitHub 6a2b6bb845 Merge branch 'master' into ReadersNotifications 2017-10-10 13:07:37 +01:00
Kim GardnerandGitHub 78857e8de0 Merge branch 'master' into ie11-issues 2017-10-10 13:07:03 +01:00
Kim GardnerandGitHub c0a54b6538 Merge branch 'master' into viewing-options 2017-10-10 13:06:18 +01:00
Kim GardnerandGitHub 15f07b1360 Merge pull request #1068 from tylerbrewer2/fix-shortcut-icon
fix hidden shortcut icon
2017-10-10 13:05:20 +01:00
Belén CurcioandGitHub 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
Facu 0519b1d1ff fix 1071 2017-10-09 15:41:06 -03:00
Morten Nissen 046a17801e Fixed some mistakes, and general proof reading 2017-10-09 20:38:29 +02:00
Tyler BrewerandGitHub 48c291a9c3 Merge branch 'master' into fix-shortcut-icon 2017-10-09 11:01:26 -04:00
KiwiandGitHub 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 CurcioandGitHub c7bf3c1a3c Merge branch 'master' into moderate-shortcuts 2017-10-06 18:07:30 -03:00
Tyler BrewerandGitHub bb78ba9b0b Merge branch 'master' into fix-shortcut-icon 2017-10-06 16:09:59 -04:00
KiwiandGitHub 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 ErwinandGitHub 0c62ff0f9f Merge branch 'master' into Issue-1024-forgot-password-flow 2017-10-06 15:38:26 -04:00
KiwiandGitHub 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 GardnerandGitHub 387316849a Merge branch 'master' into moderate-shortcuts 2017-10-06 17:34:46 +01:00
Kim GardnerandGitHub 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 GardnerandGitHub 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