Commit Graph
10038 Commits
Author SHA1 Message Date
Wyatt JohnsonandGitHub 5f74c827f5 Merge branch 'master' into reject-username 2018-05-30 10:15:35 -06:00
Wyatt JohnsonandGitHub 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 JohnsonandGitHub c6deabf919 Merge branch 'master' into ban-user-message 2018-05-30 09:49:18 -06:00
Wyatt JohnsonandGitHub 2e40cd53cb Merge pull request #1665 from cristiandean/translation_br
Added missing translation pt_BR
2018-05-30 09:48:10 -06:00
okbel 09ddd82800 Merge branch 'reject-username' of github.com:coralproject/talk into reject-username
* 'reject-username' of github.com:coralproject/talk:
2018-05-30 11:11:30 -03:00
okbel 87aa1af654 Merge branch 'master' of github.com:coralproject/talk into reject-username
* 'master' of github.com:coralproject/talk:
  Typo
  Fix warnings
  Activate Websocket and add browser console logging
  çhanges
  changes and updates to the e2e
  updated yarn.lock
  Workaround RTE Button focus bug on IOS
  Use standard buttons to fix IOS bug
  add missing dependency
2018-05-30 11:10:20 -03: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 GardnerandGitHub c3ffb13a79 Merge branch 'master' into reject-username 2018-05-29 15:27:19 -04:00
Kim GardnerandGitHub 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 GardnerandGitHub 6c1fb2b34d Merge branch 'master' into dropdown-ios 2018-05-29 15:14:35 -04:00
Kim GardnerandGitHub 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 GardnerandGitHub a732793cb1 Merge branch 'master' into rte-focus-ios 2018-05-29 15:06:26 -04:00
Wyatt JohnsonandGitHub 03a7ecff0b Merge pull request #1663 from coralproject/e2e-update
E2E improvements
2018-05-29 11:38:22 -06:00
Belén CurcioandGitHub ba8466bacf Merge branch 'master' into reject-username 2018-05-29 13:27:04 -03:00
okbel 595e19231e if username changed, reject username should be disabled 2018-05-29 13:24:53 -03:00
okbel 4f76163541 Adding translations 2018-05-29 13:00:24 -03:00
okbel 6f06ac760c Translations 2018-05-29 12:58:26 -03:00
okbel 25947cb278 Reject Username fully working 2018-05-29 12:41:54 -03: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
okbel b0d76f2f6a progress 2018-05-28 14:52:03 -03:00
Wyatt JohnsonandGitHub 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
okbel 6d35c648d6 updates 2018-05-28 12:13:02 -03:00
okbel b4e7dd54cf Merge branch 'master' of github.com:coralproject/talk into reject-username
* 'master' of github.com:coralproject/talk: (33 commits)
  apply @cvle suggestion for fix
  Take karma into account when doing e2e
  Bump version to 4.4.2
  move placeholder right behind contentEditable
  added pivotal tracker ref
  moved event handler to bundle
  Update stream.njk
  disable CSP until we can work on configuration + webpack issues
  added missing translation
  Remove redundant period. It's in the translation strings already.
  Remove redundancy
  One more missing German translation
  Add missing translations (en/de) for plugins ignore-user and local-auth.
  text-replace error
  support the __webpack_nonce__ parameter
  csp fixes
  added comment
  `karma` -> `karmaThresholds`
  name changes
  Fix Touch issues on IOS Safari (iPad)
  ...
2018-05-28 11:23:34 -03:00
Chi Vinh Le 6577365930 Use standard buttons to fix IOS bug 2018-05-28 16:19:56 +02:00
Helmut JanuschkaandGitHub 1fb206daa4 add missing dependency 2018-05-28 10:56:46 +02:00
Wyatt JohnsonandGitHub 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 GardnerandGitHub 9fe2175da3 Merge branch 'master' into talk-plugin-rich-text-patch_placeholder-fix 2018-05-25 18:19:37 -04:00
Kim GardnerandGitHub c1692dfb70 Merge pull request #1630 from coralproject/karma
Karma Score
2018-05-25 18:19:25 -04:00
Kim GardnerandGitHub 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 GardnerandGitHub 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 JohnsonandGitHub 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 JohnsonandGitHub 105cff6990 Merge branch 'master' into bump-version-4-4-2 2018-05-25 13:52:44 -06:00
Kim GardnerandGitHub 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 GardnerandGitHub 47761cf8a0 Merge branch 'master' into fix-ipad-touch-issue 2018-05-25 14:49:25 -04:00
Kim GardnerandGitHub 4442ffc784 Merge pull request #1656 from coralproject/csp
Disable CSP
2018-05-25 14:49:07 -04:00
Wyatt JohnsonandGitHub 016b6d6007 Merge branch 'master' into karma 2018-05-25 12:44:48 -06:00
Wyatt JohnsonandGitHub e94d13e594 Merge branch 'master' into fix-ipad-touch-issue 2018-05-25 12:44:19 -06:00