Commit Graph

10035 Commits

Author SHA1 Message Date
Fabian Neumann 2f4dfa080b Use Markdown for the "asset is closed" message. 2018-06-04 15:25:20 +02:00
Wyatt Johnson d3158f5c7e GraphiQL Fixes (#1671)
* bug: fixed graphiql style, upgraded
2018-06-01 15:14:49 -06:00
Wyatt Johnson 795389c0c8 Merge pull request #1528 from cristiandean/master
Check if token is in localStorage before logout
2018-05-31 15:03:17 -06:00
Wyatt Johnson 66f2d41033 always call the rest logout command, don't vomit on the error 2018-05-31 14:56:18 -06:00
Wyatt Johnson 01a0d0d587 Merge branch 'master' into master 2018-05-31 14:12:00 -06:00
Wyatt Johnson 189d27c13f Merge pull request #1668 from coralproject/translations
Translation Fixes
2018-05-31 13:00:33 -06:00
Kim Gardner eb7f2abd97 Small tweaks 2018-05-31 14:37:53 -04:00
Wyatt Johnson 250a8ec2f1 Merge branch 'master' into translations 2018-05-31 12:26:26 -06:00
Wyatt Johnson 375ef09d78 Merge pull request #1670 from coralproject/templates
Custom CSS Fix
v4.4.3
2018-05-31 11:50:41 -06:00
Kim Gardner 135f0e300f Small typo 2018-05-31 13:33:34 -04:00
Wyatt Johnson 9d752685cd resolved custom css loading issue 2018-05-31 11:27:02 -06:00
Kim Gardner a638dafd85 Merge pull request #1667 from coralproject/fix-dropdown-display
Fix DropDown display bug
v4.4.2
2018-05-30 16:58:10 -04:00
Kim Gardner 93436a2eb5 Merge branch 'master' into fix-dropdown-display 2018-05-30 16:49:47 -04:00
Kim Gardner a16233484c Merge pull request #1666 from coralproject/auth
Fixed double encoding
2018-05-30 16:45:57 -04:00
Wyatt Johnson f7899bc670 Translation Fixes
- Removed duplicated translations
- Fixed redundant text
2018-05-30 14:41:55 -06:00
Chi Vinh Le c98830aa63 Fix DropDown display bug 2018-05-30 22:23:52 +02:00
Wyatt Johnson c24251e8f2 Fixed double encoding 2018-05-30 14:22:13 -06: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