fefd4d281a
Merge branch 'master' into reject-username
2018-06-01 17:11:56 +01:00
ed539d2ee1
Merge branch 'reject-username' of github.com:coralproject/talk into reject-username
...
* 'reject-username' of github.com:coralproject/talk:
Small tweaks
Small typo
resolved custom css loading issue
Update copy
Update copy
Translation Fixes
Fix DropDown display bug
Fixed double encoding
fix to target handler
Added missing translation pt_BR
remove unused method
2018-06-01 12:34:50 -03:00
25852d68bd
updated styles
2018-06-01 12:06:53 -03:00
795389c0c8
Merge pull request #1528 from cristiandean/master
...
Check if token is in localStorage before logout
2018-05-31 15:03:17 -06:00
66f2d41033
always call the rest logout command, don't vomit on the error
2018-05-31 14:56:18 -06:00
01a0d0d587
Merge branch 'master' into master
2018-05-31 14:12:00 -06:00
7262a9ab50
Merge branch 'master' into reject-username
2018-05-31 16:25:53 -03:00
189d27c13f
Merge pull request #1668 from coralproject/translations
...
Translation Fixes
2018-05-31 13:00:33 -06:00
eb7f2abd97
Small tweaks
2018-05-31 14:37:53 -04:00
250a8ec2f1
Merge branch 'master' into translations
2018-05-31 12:26:26 -06:00
375ef09d78
Merge pull request #1670 from coralproject/templates
...
Custom CSS Fix
2018-05-31 11:50:41 -06:00
135f0e300f
Small typo
2018-05-31 13:33:34 -04:00
9d752685cd
resolved custom css loading issue
2018-05-31 11:27:02 -06:00
c5a6f8a0b3
Merge branch 'master' into reject-username
2018-05-31 11:23:21 -04:00
b7768ccaf6
Update copy
2018-05-31 11:07:12 -04:00
e68d5c8a14
Update copy
2018-05-31 11:03:17 -04:00
a638dafd85
Merge pull request #1667 from coralproject/fix-dropdown-display
...
Fix DropDown display bug
2018-05-30 16:58:10 -04:00
93436a2eb5
Merge branch 'master' into fix-dropdown-display
2018-05-30 16:49:47 -04:00
a16233484c
Merge pull request #1666 from coralproject/auth
...
Fixed double encoding
2018-05-30 16:45:57 -04:00
f7899bc670
Translation Fixes
...
- Removed duplicated translations
- Fixed redundant text
2018-05-30 14:41:55 -06:00
c98830aa63
Fix DropDown display bug
2018-05-30 22:23:52 +02:00
c24251e8f2
Fixed double encoding
2018-05-30 14:22:13 -06:00
5f74c827f5
Merge branch 'master' into reject-username
2018-05-30 10:15:35 -06:00
9ed991936e
Merge pull request #1664 from conversario/ban-user-message
...
remove unused method
2018-05-30 10:08:20 -06:00
ede273a3e0
fix to target handler
2018-05-30 10:00:04 -06:00
c6deabf919
Merge branch 'master' into ban-user-message
2018-05-30 09:49:18 -06:00
2e40cd53cb
Merge pull request #1665 from cristiandean/translation_br
...
Added missing translation pt_BR
2018-05-30 09:48:10 -06:00
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
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
b9e3a01cdd
Added missing translation pt_BR
2018-05-30 09:19:59 -03:00
5c7345313e
remove unused method
2018-05-30 09:25:10 +02:00
c3ffb13a79
Merge branch 'master' into reject-username
2018-05-29 15:27:19 -04:00
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
6c1fb2b34d
Merge branch 'master' into dropdown-ios
2018-05-29 15:14:35 -04:00
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
a732793cb1
Merge branch 'master' into rte-focus-ios
2018-05-29 15:06:26 -04:00
03a7ecff0b
Merge pull request #1663 from coralproject/e2e-update
...
E2E improvements
2018-05-29 11:38:22 -06:00
ba8466bacf
Merge branch 'master' into reject-username
2018-05-29 13:27:04 -03:00
595e19231e
if username changed, reject username should be disabled
2018-05-29 13:24:53 -03:00
4f76163541
Adding translations
2018-05-29 13:00:24 -03:00
6f06ac760c
Translations
2018-05-29 12:58:26 -03:00
25947cb278
Reject Username fully working
2018-05-29 12:41:54 -03:00
606f463331
Typo
2018-05-29 16:52:07 +02:00
576820f1f8
Fix warnings
2018-05-29 16:50:11 +02:00
3a84da9495
Activate Websocket and add browser console logging
2018-05-29 16:42:04 +02:00
b15a306c43
çhanges
2018-05-28 16:20:20 -03:00
4299c373ba
changes and updates to the e2e
2018-05-28 15:17:31 -03:00
b0d76f2f6a
progress
2018-05-28 14:52:03 -03:00
6f0694d341
Merge pull request #1660 from hjanuschka/patch-1
...
add missing dependency
2018-05-28 09:53:18 -06:00
da820ad6db
updated yarn.lock
2018-05-28 09:42:22 -06:00
Kim Gardner