wassname/talk
1
0
Fork 0
mirror of https://github.com/wassname/talk.git synced 2026-07-29 11:28:24 +08:00
Code Issues Packages Projects Releases Wiki Activity
9,348 Commits 10 Branches 125 Tags
ff7ee2aefc61522cbef173e4e5d3a31fcf7ff3fa
Commit Graph
4301 Commits
Author SHA1 Message Date
Belen Curcio 793f634959 Working tags 2017-05-17 09:01:41 -03: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
riley 7896b3f33b merge master 2017-05-16 09:43:49 -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 c7e0577708 Merge branch 'master' into invalidate-old-data 2017-05-16 18:17:45 +07:00
Chi Vinh Le 2ab8cc9481 Allow Apollo to invalidate old user data 2017-05-16 18:17:43 +07:00
Chi Vinh Le e1b80c3317 Only refetch for login 2017-05-16 17:50:17 +07:00
Chi Vinh Le ec19618052 Readd login fixes 2017-05-16 17:26:53 +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
gaba 35c941d4d0 Add missing translations from commentbox. 2017-05-15 16:17:53 -07:00
gaba 61856c3cf6 Use timeago. 2017-05-15 16:04:10 -07: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
Belen Curcio d02412a734 Merge branch '142993479-tags' of github.com:coralproject/talk into 142993479-tags 2017-05-15 18:11:30 -03:00
Belen Curcio c3d02a14a0 Updated queries and hasRoles 2017-05-15 18:11:14 -03:00
gaba 423cb3cade Merge branch 'master' into i18n-refactor 2017-05-15 14:02:34 -07:00
gaba 54e103b55a Change a few translations that had wrong key. 2017-05-15 13:44:46 -07:00
Belen Curcio 2b7f545c2d lint 2017-05-15 17:31:53 -03:00
gaba 0ead2cb610 Adds sign in translations. 2017-05-15 13:25:09 -07: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
Belén CurcioandGitHub 820ffb14c1 Merge branch 'master' into 142993479-tags 2017-05-15 16:55:47 -03:00
gaba f32eac4eab Lint YAML and notations 2017-05-15 12:53:28 -07:00
Chi Vinh Le 74e1436ae4 Use correct error key 2017-05-16 01:09:33 +07: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 75aa8d79df linting 2017-05-15 14:50:26 -03: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
gaba b31212f847 Second run of notation change for translations. 2017-05-15 08:35:55 -07:00
Chi Vinh Le 63fa3c4de7 Implement suspend user components 2017-05-15 22:28:04 +07: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
Wyatt Johnson 9403280c56 Merge branch 'master' into edit-changes 2017-05-12 15:44:19 -06:00
Belen Curcio 964cc362e7 Login, logout with tokens. WIP 2017-05-12 18:26:24 -03:00
David ErwinandGitHub ff6a9cf0d5 Merge branch 'master' into 142993479-tags 2017-05-12 15:44:38 -04:00
Belen Curcio 7fd5509490 Prettier 2017-05-12 15:48:19 -03:00
Belen Curcio 5e8a02c461 Removing CSRF 2017-05-12 15:40:53 -03:00
Wyatt Johnson ffd96f57e9 Comment too short fixes 2017-05-12 11:16:52 -06:00
Wyatt Johnson e3017efebf Front end edits to accomedate ignoredUsers 2017-05-12 10:25:59 -06:00
riley e32ab99edf remove hasRoles 2017-05-12 09:57:07 -06:00
Chi Vinh Le 072437b0fd Prevent empty edit 2017-05-12 22:45:33 +07:00