Commit Graph

10014 Commits

Author SHA1 Message Date
Chi Vinh Le c98830aa63 Fix DropDown display bug 2018-05-30 22:23:52 +02:00
Wyatt Johnson 9ed991936e Merge pull request #1664 from conversario/ban-user-message
remove unused method
2018-05-30 10:08:20 -06:00
Wyatt Johnson ede273a3e0 fix to target handler 2018-05-30 10:00:04 -06:00
Wyatt Johnson c6deabf919 Merge branch 'master' into ban-user-message 2018-05-30 09:49:18 -06:00
Wyatt Johnson 2e40cd53cb Merge pull request #1665 from cristiandean/translation_br
Added missing translation pt_BR
2018-05-30 09:48:10 -06:00
Cristian b9e3a01cdd Added missing translation pt_BR 2018-05-30 09:19:59 -03:00
Leandro 5c7345313e remove unused method 2018-05-30 09:25:10 +02:00
Kim Gardner 8933b43e1a Merge pull request #1661 from coralproject/dropdown-ios
Use <button> for dropdown to fix IOS bug
2018-05-29 15:21:28 -04:00
Kim Gardner 6c1fb2b34d Merge branch 'master' into dropdown-ios 2018-05-29 15:14:35 -04:00
Kim Gardner 0db3b354ca Merge pull request #1662 from coralproject/rte-focus-ios
Workaround RTE Button focus bug on IOS
2018-05-29 15:14:26 -04:00
Kim Gardner a732793cb1 Merge branch 'master' into rte-focus-ios 2018-05-29 15:06:26 -04:00
Wyatt Johnson 03a7ecff0b Merge pull request #1663 from coralproject/e2e-update
E2E improvements
2018-05-29 11:38:22 -06:00
Chi Vinh Le 606f463331 Typo 2018-05-29 16:52:07 +02:00
Chi Vinh Le 576820f1f8 Fix warnings 2018-05-29 16:50:11 +02:00
Chi Vinh Le 3a84da9495 Activate Websocket and add browser console logging 2018-05-29 16:42:04 +02:00
okbel b15a306c43 çhanges 2018-05-28 16:20:20 -03:00
okbel 4299c373ba changes and updates to the e2e 2018-05-28 15:17:31 -03:00
Wyatt Johnson 6f0694d341 Merge pull request #1660 from hjanuschka/patch-1
add missing dependency
2018-05-28 09:53:18 -06:00
Wyatt Johnson da820ad6db updated yarn.lock 2018-05-28 09:42:22 -06:00
Chi Vinh Le ed679096c8 Workaround RTE Button focus bug on IOS 2018-05-28 17:16:44 +02:00
Chi Vinh Le 6577365930 Use standard buttons to fix IOS bug 2018-05-28 16:19:56 +02:00
Helmut Januschka 1fb206daa4 add missing dependency 2018-05-28 10:56:46 +02:00
Wyatt Johnson 2bd4e1182b Merge pull request #1657 from erikreyna/talk-plugin-rich-text-patch_placeholder-fix
move placeholder right behind contentEditable
2018-05-25 16:28:49 -06:00
Kim Gardner 9fe2175da3 Merge branch 'master' into talk-plugin-rich-text-patch_placeholder-fix 2018-05-25 18:19:37 -04:00
Kim Gardner c1692dfb70 Merge pull request #1630 from coralproject/karma
Karma Score
2018-05-25 18:19:25 -04:00
Kim Gardner cb83514365 Merge branch 'master' into talk-plugin-rich-text-patch_placeholder-fix 2018-05-25 18:12:21 -04:00
Erik Reyna ba3af0aeb3 apply @cvle suggestion for fix 2018-05-25 18:07:41 -04:00
Kim Gardner 51cb917d6b Merge branch 'master' into karma 2018-05-25 17:04:30 -04:00
Chi Vinh Le b02fd67742 Merge branch 'karma' of ssh://github.com/coralproject/talk into karma 2018-05-25 22:50:18 +02:00
Chi Vinh Le 90e4682cf6 Take karma into account when doing e2e 2018-05-25 22:49:35 +02:00
Wyatt Johnson 3ff8b8519e Merge pull request #1658 from coralproject/bump-version-4-4-2
Bump version to 4.4.2
2018-05-25 13:58:46 -06:00
Wyatt Johnson 105cff6990 Merge branch 'master' into bump-version-4-4-2 2018-05-25 13:52:44 -06:00
Kim Gardner 99854d8644 Merge pull request #1648 from coralproject/fix-ipad-touch-issue
Fix Touch issues on iOS Safari (iPad)
2018-05-25 15:04:55 -04:00
Kim Gardner cedabf04e3 Bump version to 4.4.2 2018-05-25 15:04:00 -04:00
Erik Reyna 2c6843129a move placeholder right behind contentEditable 2018-05-25 15:02:34 -04:00
Kim Gardner 47761cf8a0 Merge branch 'master' into fix-ipad-touch-issue 2018-05-25 14:49:25 -04:00
Kim Gardner 4442ffc784 Merge pull request #1656 from coralproject/csp
Disable CSP
2018-05-25 14:49:07 -04:00
Wyatt Johnson 016b6d6007 Merge branch 'master' into karma 2018-05-25 12:44:48 -06:00
Wyatt Johnson e94d13e594 Merge branch 'master' into fix-ipad-touch-issue 2018-05-25 12:44:19 -06:00
Kim Gardner 68c7477f3a Merge branch 'master' into csp 2018-05-25 14:40:21 -04:00
Kim Gardner 700cee4e56 Merge pull request #1653 from conversario/missing-translations-local-auth
Add missing translations (en/de) for plugins ignore-user and local-auth.
2018-05-25 14:39:56 -04:00
Kiwi d0740cb323 Merge branch 'master' into csp 2018-05-25 15:36:44 -03:00
Kim Gardner c021c3adc8 Merge branch 'master' into missing-translations-local-auth 2018-05-25 14:22:38 -04:00
Kim Gardner 130fb0d4e9 Merge pull request #1655 from coralproject/translations
Added missing translation
2018-05-25 14:22:23 -04:00
Kiwi 79a0f0321f Merge branch 'master' into karma 2018-05-25 15:12:57 -03:00
Kiwi 5090f9c6b2 Merge branch 'master' into csp 2018-05-25 15:12:20 -03:00
Kim Gardner 5e8c950dc5 Merge branch 'master' into translations 2018-05-25 14:04:03 -04:00
Kim Gardner c7b2641ea7 Merge pull request #1654 from coralproject/docs
Enhanced documentation on JWT's
2018-05-25 14:03:47 -04:00
Wyatt Johnson ba2abab358 added pivotal tracker ref 2018-05-25 11:55:17 -06:00
Wyatt Johnson 5535dde053 Merge branch 'master' into fix-ipad-touch-issue 2018-05-25 11:53:04 -06:00