Commit Graph

3951 Commits

Author SHA1 Message Date
Belen Curcio f57fa7cb7b Update Cache 2017-05-17 23:53:07 -03:00
Belen Curcio 6664f73d2d Best tag working, only Optimistic Missing 2017-05-17 11:57:51 -03:00
Belen Curcio fb0e89485c Merge branch '142993479-tags' of github.com:coralproject/talk into 142993479-tags 2017-05-17 11:20:00 -03:00
Belen Curcio b2f1707f17 Fully working offtopic 2017-05-17 11:19:06 -03:00
Wyatt Johnson 9db77360b4 removed unused errors 2017-05-17 08:16:48 -06:00
Belen Curcio 9dc0693530 Linting 2017-05-17 09:43:04 -03:00
Belen Curcio 54eb078a13 Working offtopic tag 2017-05-17 09:37:26 -03:00
Belen Curcio 793f634959 Working tags 2017-05-17 09:01:41 -03:00
Belen Curcio c59346eb0a tags, and assignedby nul 2017-05-15 18:13:45 -03: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
Belén Curcio 820ffb14c1 Merge branch 'master' into 142993479-tags 2017-05-15 16:55:47 -03:00
Belén Curcio afa3123829 Merge pull request #578 from coralproject/auth-tokens
JWT Auth
2017-05-15 16:51:10 -03:00
Wyatt Johnson 5aca83993b fixed build process 2017-05-15 13:35:51 -06:00
Wyatt Johnson 8ff0c3db51 Merge branch 'auth-tokens' of github.com:coralproject/talk into auth-tokens 2017-05-15 13:14:10 -06:00
Belén Curcio 3eea5e1a8a Merge branch 'master' into 142993479-tags 2017-05-15 14:53:54 -03: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
Belen Curcio 5dae7bf4ac Merge branch 'master' of github.com:coralproject/talk into auth-tokens 2017-05-15 13:12:11 -03:00
Belen Curcio 48370db09a Merge branch 'auth-tokens' of github.com:coralproject/talk into auth-tokens 2017-05-15 13:11:32 -03:00
Wyatt Johnson 9bee31198e Added logout routes 2017-05-15 10:03:09 -06:00
Kim Gardner 2a95c1eee2 Merge pull request #583 from coralproject/hooks-docs
[DOCS] - Hooks and Reactions
2017-05-15 11:55:41 -04: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
Kim Gardner cb64d599fe Merge branch 'master' into hooks-docs 2017-05-15 11:50:46 -04: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
Belen Curcio 8754ade5a4 merge 2017-05-12 21:52:29 -03:00
Wyatt Johnson e218de811b removed csrf reference 2017-05-12 15:53:25 -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
David Erwin 7c5e04e820 Merge pull request #584 from coralproject/prevent-empty-edit
Prevent empty edit on the Front-End
2017-05-12 15:44:14 -04:00
David Erwin b60ed166d0 Allow MODERATORs to access tags 2017-05-12 15:38: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
Chi Vinh Le 072437b0fd Prevent empty edit 2017-05-12 22:45:33 +07:00
Belen Curcio 674ac50035 Ádding reaction docs 2017-05-12 12:29:02 -03:00
Belen Curcio 0eb88b30eb Merge branch 'master' of github.com:coralproject/talk into hooks-docs 2017-05-12 12:19:26 -03:00
Belen Curcio e5a4fbc1cd DOCS Hooks 2017-05-12 12:07:55 -03:00
Wyatt Johnson 0a8bfe8a38 Merge branch 'master' into 142993479-tags 2017-05-12 07:54:46 -06:00
Wyatt Johnson e6b2ff19b8 fixing graph merge error 2017-05-12 07:51:53 -06:00
Wyatt Johnson e2f6d5989a Merge branch 'master' into 142993479-tags 2017-05-12 07:49:02 -06:00
David Erwin ce583142ef Merge pull request #567 from coralproject/query-mutation-api
Extendable GraphQL framework
2017-05-12 09:43:50 -04: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 0d957bcfb9 Code cleanup related to old tag services 2017-05-11 14:56:36 -06:00
Wyatt Johnson 899805b956 Merge branch '142993479-tags' of github.com:coralproject/talk into 142993479-tags 2017-05-11 14:42:37 -06:00
Wyatt Johnson aeaf809a0f Made queries more generic related to tags 2017-05-11 14:42:06 -06:00
Kim Gardner 5c5d014e23 Merge pull request #563 from gobengo/edit-comment
Edit comment
2017-05-11 14:28:33 -04:00