wassname/talk
1
0
Fork 0
mirror of https://github.com/wassname/talk.git synced 2026-08-06 13:41:02 +08:00
Code Issues Packages Projects Releases Wiki Activity
4,158 Commits 10 Branches 125 Tags
bbed3e2a7fee4cf6141bbcd0fe61f675fa74cb53
Commit Graph
662 Commits
Author SHA1 Message Date
KiwiandGitHub 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
Chi Vinh Le 681e07306b Require email verification info 2017-05-27 03:13:00 +07:00
Chi Vinh Le a7cdcb0bf7 Fix request options and use better filename 2017-05-27 00:54:36 +07: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
Belen Curcio e510553d9a Sending cookies if safari 2017-05-25 13:55:03 -03: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
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
Chi Vinh Le 37b8fd8fe3 Simplify i18n + fallback to default language 2017-05-24 01:38:50 +07: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 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
gaba f525af4c6e Added a few more translations that were missing. 2017-05-19 15:42:56 -07:00
gaba 97e9419f02 Missing translations. 2017-05-19 13:34:56 -07:00
gaba 625362d51e Merge branch 'master' into i18n-refactor 2017-05-19 12:44:34 -07:00
gaba 9be443eda8 Moves i18n into coral-framework. 2017-05-19 12:28:44 -07:00
gaba 88b5a4169d Remove promise 2017-05-19 10:48:47 -07:00
riley 2c620c868d merge master 2017-05-19 11:05:46 -06:00
KiwiandGitHub 8cb9945e25 Merge branch 'master' into multiple-roles 2017-05-19 23:26:45 +07:00
riley 17ceadd8c9 move client-side perms to services 2017-05-19 09:18:24 -06:00
Chi Vinh Le 1374217680 Merge branch 'master' into suspend-user 2017-05-19 17:46:06 +07:00
gaba 12cb59ce30 Merge branch 'master' into i18n-refactor 2017-05-18 15:44:14 -07:00
Chi Vinh Le f641a3ec40 Complete suspend user implementation 2017-05-19 01:52:03 +07:00
Riley Davis 88377b3180 do not show Config tab for non-admins 2017-05-17 15:37:13 -06:00
Benjamin Goering 9eac05c8fb Ignored user tombstones work again 2017-05-17 13:18:59 -07:00
gaba 3aceb0dc38 Merge branch 'master' into i18n-refactor 2017-05-17 12:59:24 -07:00
gaba 5bd9bc992b Move i18n into a service 2017-05-17 12:53:36 -07:00
Chi Vinh Le 2bdf413b88 Integrate into embed stream 2017-05-18 02:28:01 +07:00
Chi Vinh Le 76e87f4c34 Move previous suspendUser feature to rejectUsername 2017-05-18 02:28:01 +07:00
Riley Davis c66e3141e0 actually check permissions 2017-05-17 11:38:43 -06:00
Chi Vinh Le 71c743dda7 Extend backend to support new suspend feature 2017-05-17 20:05:18 +07:00
riley 03ce044c53 merge master 2017-05-16 16:33:41 -06:00
riley 31647fb2f0 have function params in the correct order 2017-05-16 15:41:27 -06:00
Chi Vinh Le 97121382c7 Merge branch 'master' into suspend-user 
Conflicts:
	client/coral-admin/src/containers/ModerationQueue/ModerationContainer.js
	client/coral-admin/src/containers/ModerationQueue/components/Comment.js
	client/coral-framework/utils/index.js
	package.json
 2017-05-16 21:02:33 +07:00
Chi Vinh Le 81f51b69ec Clear token before dispatching logout action 2017-05-16 17:13:19 +07:00
Belen Curcio d3252b8c87 Done :) 2017-05-15 23:47:29 -03:00
Belen Curcio 1eada688fe Prettier 2017-05-15 23:23:22 -03:00
riley 4d3788e4c9 saving my place so i dont have too many threads 2017-05-15 16:25:32 -06:00
gaba c0c6dd6252 The merge got back some code to the coral-framework. 2017-05-15 14:23:56 -07:00
gaba 423cb3cade Merge branch 'master' into i18n-refactor 2017-05-15 14:02:34 -07:00
Belen Curcio 2b7f545c2d lint 2017-05-15 17:31:53 -03:00
Belen Curcio b789a8e107 Removing kiwis fix since this was fixed in auth tokens branch 2017-05-15 17:23:57 -03:00