Commit Graph

8345 Commits

Author SHA1 Message Date
Kim Gardner 6145fd2855 Merge branch 'danish-lang-config' of git+ssh://github.com/coralproject/talk into danish-lang-config 2017-10-10 19:27:24 +01:00
Jose Franco 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 Gardner bd7dfdbe55 Fix yml indentation 2017-10-10 18:52:53 +01:00
Wyatt Johnson 98ee3c7b55 Merge branch 'master' into danish-lang-config 2017-10-10 11:44:05 -06:00
Wyatt Johnson 0fc0e9c467 Merge branch 'master' into cannot-ignore-staff 2017-10-10 11:30:00 -06: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 398dedf75b Merge pull request #1080 from facuesr/ie11-issues
Fix issue 1071
2017-10-10 18:19:50 +01:00
Kim Gardner d11ac54e1d Merge branch 'master' into cannot-ignore-staff 2017-10-10 18:19:11 +01:00
Kim Gardner 764d562497 Merge branch 'master' into ReadersNotifications 2017-10-10 18:18:58 +01:00
Kim Gardner 4548134e3f Merge branch 'master' into dropdown 2017-10-10 18:18:34 +01:00
Kim Gardner 4efcd624c3 Merge branch 'master' into talk-product-guide 2017-10-10 18:14:37 +01:00
Kim Gardner 48af316380 Merge branch 'master' into ie11-issues 2017-10-10 18:13:28 +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
Kim Gardner dee5651709 Merge branch 'master' into ie11-issues 2017-10-10 18:09:54 +01:00
Belen Curcio c5cee13bd7 Accesibility 2017-10-10 13:24:56 -03:00
Kim Gardner e40a30d200 Fixes and cleanup 2017-10-10 17:17:04 +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
Kim Gardner 33e25403e7 Rename file to da.yml 2017-10-10 17:04:27 +01:00
PepeFranco c8dc1f84e6 Merge branch 'master' of https://github.com/coralproject/talk into ReadersNotifications 2017-10-10 11:03:15 -05:00
Belen Curcio 7fcc7753f8 Update 2017-10-10 12:50:31 -03:00
Kim Gardner 569260a4b9 Fix configuration and alphabetize languages 2017-10-10 16:47:33 +01:00
Belen Curcio 2028e56f48 using props, not state for selected 2017-10-10 12:40:09 -03:00
Belen Curcio 1c535bda89 Lowering down the animation 2017-10-10 12:27:32 -03:00
Belen Curcio 1f9ff3f36d Merge branch 'dropdown' of github.com:coralproject/talk into dropdown 2017-10-10 12:27:18 -03:00
Belen Curcio 18b18a7aef Removing global listeners 2017-10-10 12:26:41 -03:00
Belen Curcio f2ea269f7a Merge branch 'master' of github.com:coralproject/talk into dropdown 2017-10-10 12:26:29 -03:00
Belen Curcio bbad09d271 Missing proptype 2017-10-10 12:26:06 -03:00
Belén Curcio 932cec27de Merge branch 'master' into dropdown 2017-10-10 12:25:18 -03:00
Kim Gardner 2063c4a90e Fixes per code review 2017-10-10 16:24:49 +01: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 b77c330823 Update i18n code 2017-10-10 14:02:07 +01:00
Kim Gardner 9f02165aa6 Merge branch 'master' of git+ssh://github.com/coralproject/talk into danish-lang-config 2017-10-10 14:01:12 +01:00
Kim Gardner 522857f0d6 Merge pull request #1079 from Rarer/Danish-Translation
Danish translation
2017-10-10 13:59:58 +01:00
Kim Gardner f1e81575cb Update i18n config to support Danish 2017-10-10 13:56:47 +01:00
Kim Gardner 69ace56172 Merge branch 'master' into Danish-Translation 2017-10-10 13:08:44 +01:00
Kim Gardner 0a991c938a Merge branch 'master' into talk-product-guide 2017-10-10 13:08:23 +01:00
Kim Gardner d6e7bb0a0a Merge branch 'master' into flags-locales 2017-10-10 13:08:19 +01:00
Kim Gardner 6a2b6bb845 Merge branch 'master' into ReadersNotifications 2017-10-10 13:07:37 +01:00
Kim Gardner 78857e8de0 Merge branch 'master' into ie11-issues 2017-10-10 13:07:03 +01:00
Kim Gardner 3c7e0462f5 Merge branch 'master' into cannot-ignore-staff 2017-10-10 13:06:54 +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
Chi Vinh Le 61604a7d07 Export ConfigureCard in plugin-api 2017-10-10 17:06:45 +07:00
Chi Vinh Le dfcb9e24df Refactor components 2017-10-10 17:00:25 +07:00