Commit Graph

  • 4b6e562492 Missing "" to send strings instead of objects Belen Curcio 2017-05-15 23:22:36 -03:00
  • 35c941d4d0 Add missing translations from commentbox. gaba 2017-05-15 16:17:53 -07:00
  • 61856c3cf6 Use timeago. gaba 2017-05-15 16:04:10 -07:00
  • 4d3788e4c9 saving my place so i dont have too many threads riley 2017-05-15 16:25:32 -06:00
  • 50db2d1dda Initial merge of trust functionality Wyatt Johnson 2017-05-15 15:28:57 -06:00
  • c0c6dd6252 The merge got back some code to the coral-framework. gaba 2017-05-15 14:23:56 -07:00
  • c59346eb0a tags, and assignedby nul Belen Curcio 2017-05-15 18:13:45 -03:00
  • d02412a734 Merge branch '142993479-tags' of github.com:coralproject/talk into 142993479-tags Belen Curcio 2017-05-15 18:11:30 -03:00
  • c3d02a14a0 Updated queries and hasRoles Belen Curcio 2017-05-15 18:11:14 -03:00
  • 423cb3cade Merge branch 'master' into i18n-refactor gaba 2017-05-15 14:02:34 -07:00
  • 297dee6da8 Merge pull request #587 from coralproject/edit-changes Kim Gardner 2017-05-15 16:47:33 -04:00
  • 54e103b55a Change a few translations that had wrong key. gaba 2017-05-15 13:44:46 -07:00
  • 2b7f545c2d lint Belen Curcio 2017-05-15 17:31:53 -03:00
  • 0ead2cb610 Adds sign in translations. gaba 2017-05-15 13:25:09 -07:00
  • b789a8e107 Removing kiwis fix since this was fixed in auth tokens branch Belen Curcio 2017-05-15 17:23:57 -03:00
  • b2e5c0452a The merge conficts Belen Curcio 2017-05-15 17:13:48 -03:00
  • 820ffb14c1 Merge branch 'master' into 142993479-tags Belén Curcio 2017-05-15 16:55:47 -03:00
  • f32eac4eab Lint YAML and notations gaba 2017-05-15 12:53:28 -07:00
  • afa3123829 Merge pull request #578 from coralproject/auth-tokens Belén Curcio 2017-05-15 16:51:10 -03:00
  • 5aca83993b fixed build process Wyatt Johnson 2017-05-15 13:35:51 -06:00
  • 8ff0c3db51 Merge branch 'auth-tokens' of github.com:coralproject/talk into auth-tokens Wyatt Johnson 2017-05-15 13:14:10 -06:00
  • 74e1436ae4 Use correct error key Chi Vinh Le 2017-05-16 01:09:33 +07:00
  • def35f0a93 Fix login issues Chi Vinh Le 2017-05-16 00:55:12 +07:00
  • 3eea5e1a8a Merge branch 'master' into 142993479-tags Belén Curcio 2017-05-15 14:53:54 -03:00
  • 06001763ff Remove unused files Chi Vinh Le 2017-05-16 00:52:37 +07:00
  • 75aa8d79df linting Belen Curcio 2017-05-15 14:50:26 -03:00
  • 843c3a16c8 Admin share same network interface, and unifying actions Belen Curcio 2017-05-15 14:48:12 -03:00
  • 963827204e Merge branch 'master' into edit-changes Kiwi 2017-05-15 23:22:30 +07:00
  • 4e86e4197c handling logout Belen Curcio 2017-05-15 13:13:28 -03:00
  • 5dae7bf4ac Merge branch 'master' of github.com:coralproject/talk into auth-tokens Belen Curcio 2017-05-15 13:12:11 -03:00
  • 48370db09a Merge branch 'auth-tokens' of github.com:coralproject/talk into auth-tokens Belen Curcio 2017-05-15 13:11:32 -03:00
  • a9207428fe Calculate "until" Chi Vinh Le 2017-05-15 23:07:46 +07:00
  • 9bee31198e Added logout routes Wyatt Johnson 2017-05-15 10:03:03 -06:00
  • 2a95c1eee2 Merge pull request #583 from coralproject/hooks-docs Kim Gardner 2017-05-15 11:55:41 -04:00
  • 57ced201eb WebStorage events Belen Curcio 2017-05-15 12:52:54 -03:00
  • 370cdf8c09 Ádding middlewares to our network interface Belen Curcio 2017-05-15 12:51:07 -03:00
  • cb64d599fe Merge branch 'master' into hooks-docs Kim Gardner 2017-05-15 11:50:46 -04:00
  • b31212f847 Second run of notation change for translations. gaba 2017-05-15 08:35:55 -07:00
  • 63fa3c4de7 Implement suspend user components Chi Vinh Le 2017-05-15 22:28:04 +07:00
  • 292f758ac9 Comment history relies on authtokens Belen Curcio 2017-05-15 12:17:30 -03:00
  • 76b96a66a2 Adding Bearer token to the Graph Client Belen Curcio 2017-05-15 11:41:36 -03:00
  • 633086cfa3 Fix a few more strings and translations. gaba 2017-05-15 07:11:11 -07:00
  • 8754ade5a4 merge Belen Curcio 2017-05-12 21:52:29 -03:00
  • e218de811b removed csrf reference Wyatt Johnson 2017-05-12 15:53:25 -06:00
  • 9403280c56 Merge branch 'master' into edit-changes Wyatt Johnson 2017-05-12 15:44:19 -06:00
  • 964cc362e7 Login, logout with tokens. WIP Belen Curcio 2017-05-12 18:26:24 -03:00
  • a5c9a8e4b0 cleaned up graph, standardised mutation Wyatt Johnson 2017-05-12 14:04:09 -06:00
  • ff6a9cf0d5 Merge branch 'master' into 142993479-tags David Erwin 2017-05-12 15:44:38 -04:00
  • 7c5e04e820 Merge pull request #584 from coralproject/prevent-empty-edit David Erwin 2017-05-12 15:44:14 -04:00
  • b60ed166d0 Allow MODERATORs to access tags David Erwin 2017-05-12 15:38:38 -04:00
  • 7fd5509490 Prettier Belen Curcio 2017-05-12 15:48:19 -03:00
  • 5e8a02c461 Removing CSRF Belen Curcio 2017-05-12 15:40:53 -03:00
  • ffd96f57e9 Comment too short fixes Wyatt Johnson 2017-05-12 11:16:52 -06:00
  • e3017efebf Front end edits to accomedate ignoredUsers Wyatt Johnson 2017-05-12 10:25:59 -06:00
  • ed27209de9 More edit changes Wyatt Johnson 2017-05-12 10:09:25 -06:00
  • e32ab99edf remove hasRoles riley 2017-05-12 09:57:07 -06:00
  • 072437b0fd Prevent empty edit Chi Vinh Le 2017-05-12 22:45:33 +07:00
  • 674ac50035 Ádding reaction docs Belen Curcio 2017-05-12 12:29:02 -03:00
  • 0eb88b30eb Merge branch 'master' of github.com:coralproject/talk into hooks-docs Belen Curcio 2017-05-12 12:19:26 -03:00
  • f4dfb21e15 reverted pagination work Wyatt Johnson 2017-05-12 09:14:25 -06:00
  • e5a4fbc1cd DOCS Hooks Belen Curcio 2017-05-12 12:07:55 -03:00
  • 0a8bfe8a38 Merge branch 'master' into 142993479-tags Wyatt Johnson 2017-05-12 07:54:46 -06:00
  • e6b2ff19b8 fixing graph merge error Wyatt Johnson 2017-05-12 07:51:53 -06:00
  • e2f6d5989a Merge branch 'master' into 142993479-tags Wyatt Johnson 2017-05-12 07:49:02 -06:00
  • ce583142ef Merge pull request #567 from coralproject/query-mutation-api David Erwin 2017-05-12 09:43:50 -04:00
  • 95a7a1ca47 Rename registry Chi Vinh Le 2017-05-12 20:15:04 +07:00
  • 7857cadef5 Merge branch 'master' into query-mutation-api Chi Vinh Le 2017-05-12 19:50:36 +07:00
  • 47186c4eac some changes to loaders Wyatt Johnson 2017-05-11 17:52:07 -06:00
  • ae5da93730 linting fixes Wyatt Johnson 2017-05-11 17:44:51 -06:00
  • a65d045c65 lint fixes Wyatt Johnson 2017-05-11 17:38:49 -06:00
  • 08e7a90d69 lint fixes Wyatt Johnson 2017-05-11 17:34:47 -06:00
  • 547ba126be cleanup to mutators Wyatt Johnson 2017-05-11 17:31:22 -06:00
  • d497ad3369 initial pagination rewrite, cleanups to comment edit Wyatt Johnson 2017-05-11 17:27:02 -06:00
  • 3b80ee8b13 Add YAML loader. Fix i18n module to get YAML files. gaba 2017-05-11 15:05:09 -07:00
  • 0d957bcfb9 Code cleanup related to old tag services Wyatt Johnson 2017-05-11 14:56:36 -06:00
  • 899805b956 Merge branch '142993479-tags' of github.com:coralproject/talk into 142993479-tags Wyatt Johnson 2017-05-11 14:42:37 -06:00
  • aeaf809a0f Made queries more generic related to tags Wyatt Johnson 2017-05-11 14:42:06 -06:00
  • 14b483d089 create roles helper Riley Davis 2017-05-11 14:23:02 -06:00
  • 5c5d014e23 Merge pull request #563 from gobengo/edit-comment Kim Gardner 2017-05-11 14:28:33 -04:00
  • 923e20f867 Merge branch 'master' into edit-comment Benjamin Goering 2017-05-11 10:42:41 -07:00
  • cd7b1f2b2b editComment mutation doesn't refetch streamQuery. Instead a reducer updates streamQuery client-side Benjamin Goering 2017-05-11 10:38:48 -07:00
  • c44eb373c3 Merge pull request #559 from coralproject/config-embed Kim Gardner 2017-05-11 12:56:47 -04:00
  • 49d0c9bd10 Merge branch 'master' into config-embed Kim Gardner 2017-05-11 12:40:11 -04:00
  • cb90802896 Fix bad merge when CommentBox calls setCommentCountCache Benjamin Goering 2017-05-11 09:34:33 -07:00
  • 30bb954e44 Merge pull request #582 from coralproject/losowsky-patch-1 Kim Gardner 2017-05-11 12:17:41 -04:00
  • 4cd2a15f35 Merge branch 'master' into losowsky-patch-1 Kim Gardner 2017-05-11 12:05:32 -04:00
  • 653091fdf9 Merge branch 'master' into i18n-refactor gaba 2017-05-11 09:02:21 -07:00
  • a1f3f550db Merge pull request #580 from coralproject/dont-unreport Kim Gardner 2017-05-11 11:42:15 -04:00
  • d815d9dc02 Merge branch 'master' into 142993479-tags Gabriela Rodríguez Berón 2017-05-11 08:30:51 -07:00
  • 604894e43c removed the beta tag Andrew Losowsky 2017-05-11 11:11:37 -04:00
  • ebf4f7ecc9 Merge branch 'master' into dont-unreport Riley Davis 2017-05-11 09:00:57 -06:00
  • 964b934efb Merge branch 'master' into multiple-roles riley 2017-05-11 08:51:06 -06:00
  • db94158426 Merge pull request #581 from coralproject/license-update Wyatt Johnson 2017-05-11 07:59:29 -06:00
  • ef502bf7a8 Update LICENSE Kim Gardner 2017-05-11 09:46:04 -04:00
  • 06b90041af Merge branch 'master' into config-embed Belén Curcio 2017-05-11 09:46:58 -03:00
  • c3048e599d remove ability to un-flag a comment Riley Davis 2017-05-10 20:56:07 -06:00
  • 1314f1972a Merge branch 'master' into edit-comment Kim Gardner 2017-05-10 15:25:27 -04:00
  • 0c07e39cc0 Merge pull request #571 from coralproject/coral-reaction Belén Curcio 2017-05-10 16:12:32 -03:00
  • 57d2b81b05 missing _ Belen Curcio 2017-05-10 16:05:52 -03:00
  • a75070cf2e Merge branch 'config-embed' of github.com:coralproject/talk into config-embed Belen Curcio 2017-05-10 16:05:16 -03:00