wassname/talk
1
0
Fork 0
mirror of https://github.com/wassname/talk.git synced 2026-08-07 11:29:44 +08:00
Code Issues Packages Projects Releases Wiki Activity
4,082 Commits 10 Branches 125 Tags
09bd0a6735f06d8deb7adc1577d46ef68dfa53d7
Commit Graph
650 Commits
Author SHA1 Message Date
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
Belen Curcio b2e5c0452a The merge conficts 2017-05-15 17:13:48 -03:00
Chi Vinh Le def35f0a93 Fix login issues 2017-05-16 00:55:12 +07:00
Chi Vinh Le 06001763ff Remove unused files 2017-05-16 00:52:37 +07:00
Belen Curcio 843c3a16c8 Admin share same network interface, and unifying actions 2017-05-15 14:48:12 -03:00
Belen Curcio 4e86e4197c handling logout 2017-05-15 13:13:28 -03:00
Chi Vinh Le a9207428fe Calculate "until" 2017-05-15 23:07:46 +07:00
Belen Curcio 57ced201eb WebStorage events 2017-05-15 12:52:54 -03:00
Belen Curcio 370cdf8c09 Ádding middlewares to our network interface 2017-05-15 12:51:07 -03:00
Belen Curcio 292f758ac9 Comment history relies on authtokens 2017-05-15 12:17:30 -03:00
Belen Curcio 76b96a66a2 Adding Bearer token to the Graph Client 2017-05-15 11:41:36 -03:00
gaba 633086cfa3 Fix a few more strings and translations. 2017-05-15 07:11:11 -07:00
Belen Curcio 8754ade5a4 merge 2017-05-12 21:52:29 -03:00