Chi Vinh Le
773eb34c3e
Merge branch 'reject-username' of ssh://github.com/coralproject/talk into reject-username
2018-06-04 22:38:21 +02:00
Chi Vinh Le
5835845092
Fix write fragment
2018-06-04 22:37:31 +02:00
Kiwi
7627d37e22
Merge branch 'master' into reject-username
2018-06-04 17:32:44 -03:00
Chi Vinh Le
6674b657ab
Move helper out of class
2018-06-04 22:32:23 +02:00
Chi Vinh Le
9c3d9e5943
Merge branch 'reject-username' of ssh://github.com/coralproject/talk into reject-username
2018-06-04 22:30:49 +02:00
Chi Vinh Le
636bc9efa4
Manage cache
2018-06-04 22:30:12 +02:00
okbel
2d343029a1
updated - getUserStatusArray
2018-06-04 15:25:30 -03:00
Kim Gardner
cf98232109
Merge branch 'master' into markdown-asset-closed-message-master
2018-06-04 15:54:13 +01:00
Chi Vinh Le
f142150b3e
Fix unexpected error
2018-06-04 16:04:37 +02:00
Chi Vinh Le
b783ee8c0b
Ignore already exists error
2018-06-04 15:45:31 +02:00
Fabian Neumann
2f4dfa080b
Use Markdown for the "asset is closed" message.
2018-06-04 15:25:20 +02:00
Wyatt Johnson
f580608a31
feat: humanize karma number
2018-06-01 15:13:58 -06:00
Kim Gardner
fefd4d281a
Merge branch 'master' into reject-username
2018-06-01 17:11:56 +01:00
okbel
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
okbel
25852d68bd
updated styles
2018-06-01 12:06:53 -03: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
Kim Gardner
c5a6f8a0b3
Merge branch 'master' into reject-username
2018-05-31 11:23:21 -04:00
Chi Vinh Le
c98830aa63
Fix DropDown display bug
2018-05-30 22:23:52 +02:00
Wyatt Johnson
5f74c827f5
Merge branch 'master' into reject-username
2018-05-30 10:15:35 -06:00
Wyatt Johnson
ede273a3e0
fix to target handler
2018-05-30 10:00:04 -06: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
Leandro
5c7345313e
remove unused method
2018-05-30 09:25:10 +02:00
Kim Gardner
6c1fb2b34d
Merge branch 'master' into dropdown-ios
2018-05-29 15:14:35 -04: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
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
b0d76f2f6a
progress
2018-05-28 14:52:03 -03: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
Kim Gardner
51cb917d6b
Merge branch 'master' into karma
2018-05-25 17:04:30 -04:00
Chi Vinh Le
90e4682cf6
Take karma into account when doing e2e
2018-05-25 22:49:35 +02:00
Kim Gardner
6411c1cf0d
Merge branch 'master' into reject-username
2018-05-25 14:16:02 -04:00
Wyatt Johnson
ba2abab358
added pivotal tracker ref
2018-05-25 11:55:17 -06:00
Wyatt Johnson
c1eab3f2c6
moved event handler to bundle
2018-05-25 11:51:43 -06:00
Kim Gardner
cfb162c490
Merge branch 'master' into karma
2018-05-25 12:04:15 -04:00
Mendel Konikov
4800e32758
Use overflow wrap for better compatibility
2018-05-24 19:07:00 -04:00
Mendel Konikov
abafa45be7
Replace break all with break-word
2018-05-24 17:20:54 -04:00
Mendel Konikov
ce708bff42
Merge branch 'master' of github.com:mkonikov/talk into word-break
2018-05-24 17:18:29 -04:00
Wyatt Johnson
64c16a1805
support the __webpack_nonce__ parameter
2018-05-24 15:02:08 -06:00
Wyatt Johnson
e39bcb11ba
added comment
2018-05-24 14:02:02 -06:00
Wyatt Johnson
a046162f9c
karma -> karmaThresholds
2018-05-24 13:57:26 -06:00
Wyatt Johnson
8f51b07388
Merge branch 'master' into karma
2018-05-24 13:28:03 -06:00
Wyatt Johnson
0c35badd95
name changes
2018-05-24 12:58:55 -06:00
Wyatt Johnson
945ab9a1b6
Added support for forcing languages
2018-05-24 12:32:06 -06:00