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
Wyatt Johnson and GitHub
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 and GitHub
9fe2175da3
Merge branch 'master' into talk-plugin-rich-text-patch_placeholder-fix
2018-05-25 18:19:37 -04:00
Kim Gardner and GitHub
c1692dfb70
Merge pull request #1630 from coralproject/karma
...
Karma Score
2018-05-25 18:19:25 -04:00
Kim Gardner and GitHub
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 and GitHub
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 and GitHub
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 and GitHub
105cff6990
Merge branch 'master' into bump-version-4-4-2
2018-05-25 13:52:44 -06:00
Kim Gardner and GitHub
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 and GitHub
47761cf8a0
Merge branch 'master' into fix-ipad-touch-issue
2018-05-25 14:49:25 -04:00
Kim Gardner and GitHub
4442ffc784
Merge pull request #1656 from coralproject/csp
...
Disable CSP
2018-05-25 14:49:07 -04:00
Wyatt Johnson and GitHub
016b6d6007
Merge branch 'master' into karma
2018-05-25 12:44:48 -06:00
Wyatt Johnson and GitHub
e94d13e594
Merge branch 'master' into fix-ipad-touch-issue
2018-05-25 12:44:19 -06:00
Kim Gardner and GitHub
68c7477f3a
Merge branch 'master' into csp
2018-05-25 14:40:21 -04:00
Kim Gardner and GitHub
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 and GitHub
d0740cb323
Merge branch 'master' into csp
2018-05-25 15:36:44 -03:00
Kim Gardner and GitHub
c021c3adc8
Merge branch 'master' into missing-translations-local-auth
2018-05-25 14:22:38 -04:00
Kim Gardner and GitHub
130fb0d4e9
Merge pull request #1655 from coralproject/translations
...
Added missing translation
2018-05-25 14:22:23 -04:00
Kim Gardner and GitHub
6411c1cf0d
Merge branch 'master' into reject-username
2018-05-25 14:16:02 -04:00
Kiwi and GitHub
79a0f0321f
Merge branch 'master' into karma
2018-05-25 15:12:57 -03:00
Kiwi and GitHub
5090f9c6b2
Merge branch 'master' into csp
2018-05-25 15:12:20 -03:00
Kim Gardner and GitHub
5e8c950dc5
Merge branch 'master' into translations
2018-05-25 14:04:03 -04:00
Kim Gardner and GitHub
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 and GitHub
5535dde053
Merge branch 'master' into fix-ipad-touch-issue
2018-05-25 11:53:04 -06:00
Wyatt Johnson
c1eab3f2c6
moved event handler to bundle
2018-05-25 11:51:43 -06:00
Wyatt Johnson and GitHub
540df09b5b
Update stream.njk
2018-05-25 11:48:55 -06:00
Kim Gardner and GitHub
ed2842717d
Merge branch 'master' into docs
2018-05-25 13:45:12 -04:00
Kim Gardner and GitHub
d9621e6801
Merge pull request #1645 from mkonikov/delete-modal-iphone
...
[iOS CSS Fix] Improve legibility of the verify text
2018-05-25 13:44:59 -04:00
Wyatt Johnson and GitHub
5f6b1235aa
Merge branch 'master' into missing-translations-local-auth
2018-05-25 11:44:07 -06:00
Kim Gardner and GitHub
d923857eda
Merge branch 'master' into delete-modal-iphone
2018-05-25 13:36:01 -04:00
Kim Gardner and GitHub
d96702eef5
Merge pull request #1646 from mkonikov/hr-fix
...
[CSS Fix] HR line on older devices - Flexbox
2018-05-25 13:35:18 -04:00
Wyatt Johnson and GitHub
0e29a85d72
Merge branch 'master' into missing-translations-local-auth
2018-05-25 11:33:04 -06:00
Wyatt Johnson
7d861236b8
disable CSP until we can work on configuration + webpack issues
2018-05-25 11:21:53 -06:00
Wyatt Johnson
3a79cc684b
added missing translation
2018-05-25 11:19:02 -06:00
Wyatt Johnson
e1d77daf47
enhanced docs around jwt's
2018-05-25 11:16:24 -06:00
Kiwi and GitHub
4ec5ccd1a3
Merge branch 'master' into hr-fix
2018-05-25 14:00:12 -03:00
Kiwi and GitHub
5e6586d228
Merge branch 'master' into delete-modal-iphone
2018-05-25 13:17:57 -03:00
Kim Gardner and GitHub
d414867bb0
Merge branch 'master' into fix-ipad-touch-issue
2018-05-25 12:04:49 -04:00
Kim Gardner and GitHub
cfb162c490
Merge branch 'master' into karma
2018-05-25 12:04:15 -04:00
Fabian Neumann
b7d2621cb8
Remove redundant period. It's in the translation strings already.
2018-05-25 17:19:43 +02:00
Wyatt Johnson and GitHub
3141133e34
Merge pull request #1640 from mkonikov/word-break
...
Remove wordbreak
2018-05-25 09:12:36 -06:00
Fabian Neumann
325e763fd0
Remove redundancy
2018-05-25 16:34:29 +02:00
Fabian Neumann
ab6a193dcb
One more missing German translation
2018-05-25 16:31:07 +02:00
Fabian Neumann
56483f3888
Add missing translations (en/de) for plugins ignore-user and local-auth.
2018-05-25 16:09:38 +02:00
okbel