Commit Graph

2291 Commits

Author SHA1 Message Date
Kiwi 810f337d8d Merge branch 'master' into fix-redirect-uri 2017-05-29 22:06:33 +07:00
Chi Vinh Le bd5e272f00 Use correct redirect url 2017-05-29 22:00:27 +07:00
Chi Vinh Le 0b7432b75e Merge branch 'master' into i18n-refactor
Conflicts:
	client/coral-sign-in/components/FakeComment.js
	client/coral-sign-in/components/UserBox.js
2017-05-29 20:23:27 +07:00
Kim Gardner 82d442d95b Merge branch 'master' into minor-stream-style-changes 2017-05-26 16:53:55 -04:00
Chi Vinh Le 681e07306b Require email verification info 2017-05-27 03:13:00 +07:00
Chi Vinh Le ee2068f5f1 Merge branch 'master' into auth-flow
Conflicts:
	client/coral-admin/src/actions/auth.js
2017-05-27 01:07:19 +07:00
Chi Vinh Le a7cdcb0bf7 Fix request options and use better filename 2017-05-27 00:54:36 +07:00
IAmSamHankins 05e5200e79 moderation panel design cleanup PT 144120491 2017-05-26 12:48:15 -04:00
Chi Vinh Le 6a1befc3f0 Detect mobile safari & desktop safari 2017-05-26 20:48:24 +07:00
Chi Vinh Le bab47c9d44 Separate store 2017-05-26 20:37:06 +07:00
Belen Curcio 8171cb53e1 Ádding another extractor 2017-05-25 20:04:32 -03:00
Belen Curcio cbf7cc67f4 Extracting token from cookie if safari 2017-05-25 18:30:01 -03:00
IAmSamHankins 32715d3903 initial style updates on comment stream for PT 142803055 ~ copy translations still needed 2017-05-25 17:21:32 -04:00
Chi Vinh Le a39fcee3f8 More error handling fixes 2017-05-26 03:04:06 +07:00
Chi Vinh Le 841735b787 Restore error functionality 2017-05-26 02:55:09 +07:00
Belen Curcio 21644bda8a Linting 2017-05-25 16:24:39 -03:00
Belen Curcio 75080cfe30 Password reset and valid locations 2017-05-25 16:19:19 -03:00
Chi Vinh Le 209005aff5 More key misspellings 2017-05-26 02:10:00 +07:00
Chi Vinh Le 0107aa67cd Correct keys and translations 2017-05-26 01:59:34 +07:00
gaba 96985b4780 More strings. 2017-05-25 14:05:17 -04:00
Belen Curcio e510553d9a Sending cookies if safari 2017-05-25 13:55:03 -03:00
gaba 492f4a674c OMG. Strings. 2017-05-25 12:02:26 -04:00
Belen Curcio bb6be9a734 BE implementation 2017-05-25 11:53:40 -03:00
Belen Curcio bd21719ea5 Handling non safari browsers 2017-05-24 17:20:23 -03:00
gaba 4ff7da864e Still more strings. 2017-05-24 14:54:52 -04:00
gaba 03f70bcab9 Adds more missing translation. 2017-05-24 11:59:21 -04:00
Chi Vinh Le db3f91cbcc Change to declarative API for plugins 2017-05-24 16:44:33 +07:00
Chi Vinh Le 1b3fe13e9b Fallback to default language for timeago 2017-05-24 16:33:39 +07:00
gaba 86258ba0c3 One more string to translate. 2017-05-23 16:06:07 -04:00
gaba 8da7df353c Adds a bunch of missing strings. 2017-05-23 16:06:04 -04:00
Chi Vinh Le b2798fd35f Merge branch 'i18n-refactor' of ssh://github.com/coralproject/talk into i18n-refactor 2017-05-24 01:39:09 +07:00
Chi Vinh Le 37b8fd8fe3 Simplify i18n + fallback to default language 2017-05-24 01:38:50 +07:00
gaba 2991af67f4 Adds more translation strings. 2017-05-23 14:03:34 -04:00
Chi Vinh Le 5c66009d84 Change to import 2017-05-24 00:30:34 +07:00
Chi Vinh Le 8ae497366b Move locales to top level 2017-05-24 00:28:47 +07:00
Chi Vinh Le 48bef95a4d Simplify yaml loading 2017-05-24 00:26:55 +07:00
gaba adacafb586 Removed extra string. 2017-05-23 12:59:06 -04:00
gaba 259b24faaa A few strings where using -. 2017-05-23 12:53:48 -04:00
gaba a184837ff8 Goes back to load all translations... 2017-05-23 12:46:53 -04:00
Belen Curcio 8266c65043 Merge Conflicts 2017-05-22 09:39:04 -03:00
Belen Curcio 317f7134f2 linting 2017-05-22 09:03:10 -03:00
Belen Curcio 9936b6ec47 Prettier 2017-05-22 08:59:34 -03:00
Belen Curcio 1d96f67db6 Merge branch 'master' of github.com:coralproject/talk into coral-plugin-auth 2017-05-22 08:58:33 -03:00
Belen Curcio 1aacb565d4 linting 2017-05-19 20:10:49 -03:00
Belen Curcio 801a6f8a53 External plugin auth fully working, now refactor 2017-05-19 20:00:33 -03:00
gaba f525af4c6e Added a few more translations that were missing. 2017-05-19 15:42:56 -07:00
Belen Curcio dbfd2aff7c SignInButton 2017-05-19 19:29:50 -03:00
Belen Curcio 3af49de0ce New login slots and auth plugins 2017-05-19 18:04:54 -03:00
gaba 97e9419f02 Missing translations. 2017-05-19 13:34:56 -07:00
Belen Curcio 87ada30eff Ádding Stream Slot 2017-05-19 17:32:16 -03:00