wassname/talk
1
0
Fork 0
mirror of https://github.com/wassname/talk.git synced 2026-07-06 05:17:19 +08:00
Code Issues Packages Projects Releases Wiki Activity
8,345 Commits 10 Branches 125 Tags
74d38f16edccf3104e4952c26fcefcb94dea7445
Commit Graph

4030 Commits

Author SHA1 Message Date
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 Curcio 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 Erwin 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
Wyatt Johnson 0a8bfe8a38 Merge branch 'master' into 142993479-tags 2017-05-12 07:54:46 -06:00
Wyatt Johnson e2f6d5989a Merge branch 'master' into 142993479-tags 2017-05-12 07:49:02 -06:00
Chi Vinh Le 95a7a1ca47 Rename registry 2017-05-12 20:15:04 +07:00
Chi Vinh Le 7857cadef5 Merge branch 'master' into query-mutation-api 
Conflicts:
	client/coral-embed-stream/src/components/Comment.js
	client/coral-embed-stream/src/containers/Embed.js
	client/coral-embed-stream/src/containers/Stream.js
	client/coral-embed-stream/src/index.js
	client/coral-framework/graphql/fragments/commentView.graphql
	client/coral-framework/graphql/mutations/index.js
	client/coral-framework/hocs/index.js
	client/coral-framework/hocs/withFragments.js
 2017-05-12 19:50:36 +07:00
Wyatt Johnson ae5da93730 linting fixes 2017-05-11 17:44:51 -06:00
Wyatt Johnson a65d045c65 lint fixes 2017-05-11 17:38:49 -06:00
Wyatt Johnson 08e7a90d69 lint fixes 2017-05-11 17:34:47 -06:00
Wyatt Johnson d497ad3369 initial pagination rewrite, cleanups to comment edit 2017-05-11 17:27:02 -06:00
gaba 3b80ee8b13 Add YAML loader. Fix i18n module to get YAML files. 2017-05-11 15:05:09 -07:00
Riley Davis 14b483d089 create roles helper 2017-05-11 14:23:02 -06:00
Benjamin Goering 923e20f867 Merge branch 'master' into edit-comment 2017-05-11 10:42:41 -07:00
Benjamin Goering cd7b1f2b2b editComment mutation doesn't refetch streamQuery. Instead a reducer updates streamQuery client-side 2017-05-11 10:38:48 -07:00
Kim Gardner 49d0c9bd10 Merge branch 'master' into config-embed 2017-05-11 12:40:11 -04:00
Benjamin Goering cb90802896 Fix bad merge when CommentBox calls setCommentCountCache 2017-05-11 09:34:33 -07:00
gaba 653091fdf9 Merge branch 'master' into i18n-refactor 2017-05-11 09:02:21 -07:00
Gabriela Rodríguez Berón d815d9dc02 Merge branch 'master' into 142993479-tags 2017-05-11 08:30:51 -07:00
riley 964b934efb Merge branch 'master' into multiple-roles 2017-05-11 08:51:06 -06:00
Belén Curcio 06b90041af Merge branch 'master' into config-embed 2017-05-11 09:46:58 -03:00
Riley Davis c3048e599d remove ability to un-flag a comment 2017-05-10 20:57:20 -06:00
Kim Gardner 1314f1972a Merge branch 'master' into edit-comment 2017-05-10 15:25:27 -04:00
Belen Curcio 57d2b81b05 missing _ 2017-05-10 16:05:52 -03:00