Commit Graph

  • 2217c89aa7 Merge pull request #815 from coralproject/embed-control-object Wyatt Johnson 2017-07-31 11:27:20 +10:00
  • b8eacf43a6 Merge branch 'master' into embed-control-object Wyatt Johnson 2017-07-31 10:25:43 +10:00
  • c1660030cd Merge pull request #816 from coralproject/router-fix Wyatt Johnson 2017-07-31 10:25:30 +10:00
  • 299bb35c9d added more path fixes Wyatt Johnson 2017-07-31 09:52:46 +10:00
  • 1b583fb945 Reported has priority over premod queue or new queue Belen Curcio 2017-07-28 15:51:21 -03:00
  • 9bfdfc86b9 Refactor menu too Belen Curcio 2017-07-28 15:42:59 -03:00
  • 3e6e991609 Merge branch 'new-queue' of github.com:coralproject/talk into new-queue Belen Curcio 2017-07-28 15:32:39 -03:00
  • 7ada3106d2 Default routing working Belen Curcio 2017-07-28 15:23:40 -03:00
  • 2af0f2bf65 Merge branch 'master' into new-queue Kim Gardner 2017-07-28 14:03:05 -04:00
  • b9583dd55d Merge branch 'master' into embed-control-object Kiwi 2017-07-28 19:31:31 +02:00
  • 85e478cf3f Return an object on Talk.render to control the embed Chi Vinh Le 2017-07-29 00:17:23 +07:00
  • 993688837a Merge pull request #814 from coralproject/optimize-permalink-queries Kim Gardner 2017-07-28 12:28:32 -04:00
  • 3740dd98e8 Merge branch 'master' into feature/talk-plugin-toxic-comments Belén Curcio 2017-07-28 13:22:29 -03:00
  • 8aa086af02 Merge branch 'master' into optimize-permalink-queries Belén Curcio 2017-07-28 13:21:59 -03:00
  • f5369802e6 Merge branch 'master' into new-queue Kim Gardner 2017-07-28 11:39:12 -04:00
  • 7f38c70e58 Merge pull request #812 from coralproject/view-context-non-public Kim Gardner 2017-07-28 11:04:30 -04:00
  • 7dd20d740d Merge branch 'master' into view-context-non-public Kim Gardner 2017-07-28 10:58:54 -04:00
  • 4db1cf2656 Merge branch 'master' into feature/talk-plugin-toxic-comments Kim Gardner 2017-07-28 10:58:34 -04:00
  • 50c8d3f314 Merge pull request #811 from coralproject/user-detail-everywhere Kim Gardner 2017-07-28 10:56:59 -04:00
  • 0f41165751 New Queue names Belen Curcio 2017-07-28 11:16:49 -03:00
  • 5ce9c950b8 Query search goes to the specific queue Belen Curcio 2017-07-28 10:44:59 -03:00
  • 91bc7eaa53 Make condition more clear Chi Vinh Le 2017-07-28 20:10:03 +07:00
  • eb44c55e05 Merge branch 'master' into feature/talk-plugin-toxic-comments Belén Curcio 2017-07-28 10:02:03 -03:00
  • 58a6333e02 Merge branch 'master' into user-detail-everywhere Belén Curcio 2017-07-28 09:57:34 -03:00
  • 4b0eeca08b Merge branch 'new-queue' of github.com:coralproject/talk into new-queue Belen Curcio 2017-07-28 09:54:55 -03:00
  • 0111e08bc1 lintin Belen Curcio 2017-07-28 09:48:34 -03:00
  • 0767c680fc Merge branch 'master' into new-queue Belén Curcio 2017-07-28 09:44:29 -03:00
  • 7323c92b26 Optimize query during permalink view Chi Vinh Le 2017-07-28 19:43:33 +07:00
  • c0ff056354 Old file Belen Curcio 2017-07-28 09:39:12 -03:00
  • 1f3d97fd6b Allow admins / mods to view context of rejected or premod comments Chi Vinh Le 2017-07-28 17:47:25 +07:00
  • 4ed68259c6 Merge pull request #807 from coralproject/basepath Wyatt Johnson 2017-07-28 08:44:29 +10:00
  • d5b7fd0413 Merge branch 'master' into user-detail-everywhere Kiwi 2017-07-27 22:12:52 +02:00
  • 389ff0ca0d Change reducer property names Chi Vinh Le 2017-07-28 03:03:19 +07:00
  • 7a9aa331c5 viewUserDetail everywhere Chi Vinh Le 2017-07-28 02:50:32 +07:00
  • 673cb0ed04 Merge branch 'master' into basepath Kim Gardner 2017-07-27 15:21:31 -04:00
  • 3f8b2b947c Merge pull request #806 from coralproject/docs-update Kim Gardner 2017-07-27 15:09:15 -04:00
  • dd8167a204 Check premod by asset Belen Curcio 2017-07-27 14:42:36 -03:00
  • fba4b23dd0 Reordering Menu Belen Curcio 2017-07-27 14:20:15 -03:00
  • 200d41f2a5 New Queue Belen Curcio 2017-07-27 14:15:49 -03:00
  • 75da26ff7a Merge branch 'master' into feature/talk-plugin-toxic-comments Kim Gardner 2017-07-27 13:02:53 -04:00
  • c9442c7412 Merge branch 'master' into docs-update Kim Gardner 2017-07-27 13:02:50 -04:00
  • 3c960db93d Merge branch 'master' of github.com:coralproject/talk into new-queue Belen Curcio 2017-07-27 14:01:53 -03:00
  • 1994e44e94 Merge pull request #810 from coralproject/fix-viewing-options-plugin Kim Gardner 2017-07-27 13:02:25 -04:00
  • 47d37e31d8 prefixing translations Belen Curcio 2017-07-27 13:50:14 -03:00
  • 447c3aa7cc Wrong reducer name Belen Curcio 2017-07-27 13:48:03 -03:00
  • b3d1ff8003 Renaming flag by reported Belen Curcio 2017-07-27 13:43:40 -03:00
  • ce2f8f97e8 Move userDetail out of Moderation route Chi Vinh Le 2017-07-27 23:23:40 +07:00
  • cf8528dcf1 Remove file Kim Gardner 2017-07-27 12:23:18 -04:00
  • 9bd3e6b541 Fix translation file Kim Gardner 2017-07-27 12:20:07 -04:00
  • f8758bd755 Fix folders Kim Gardner 2017-07-27 11:58:36 -04:00
  • 93d0a265b5 Merge branch 'master' into feature/talk-plugin-toxic-comments Kim Gardner 2017-07-27 11:05:17 -04:00
  • 46a2699ecb Merge branch 'master' into docs-update Kim Gardner 2017-07-27 11:05:06 -04:00
  • ce0479ae5f Merge pull request #779 from coralproject/renaming-talk Kim Gardner 2017-07-27 11:04:31 -04:00
  • 57fb77008a Make UserDetail work independently Chi Vinh Le 2017-07-27 21:44:29 +07:00
  • 433c4fcd03 Merge branch 'master' into renaming-talk Kim Gardner 2017-07-27 10:06:17 -04:00
  • 0f84586e1e Merge pull request #805 from coralproject/redis-fixes Kim Gardner 2017-07-27 10:05:55 -04:00
  • f4b765ccc5 template updates Wyatt Johnson 2017-07-27 16:50:49 +10:00
  • 0d7e4d6541 Added support for hosting Talk under a different path Wyatt Johnson 2017-07-27 16:37:26 +10:00
  • 30b3e91fdb documented more env vars Wyatt Johnson 2017-07-27 15:34:04 +10:00
  • a54a240ae6 fixed bug with job init Wyatt Johnson 2017-07-27 15:14:11 +10:00
  • b482cf0a0f updated styles Wyatt Johnson 2017-07-27 12:03:25 +10:00
  • 3a1a5e4e37 Fix merge conflicts Kim Gardner 2017-07-26 21:49:50 -04:00
  • 1a1d28c915 Merge pull request #788 from coralproject/docs-update Wyatt Johnson 2017-07-27 11:33:56 +10:00
  • 1359dfdc0b Merge branch 'master' into renaming-talk Kim Gardner 2017-07-26 21:29:19 -04:00
  • e7bc3002ef Add translations file for viewing options plugin Kim Gardner 2017-07-26 21:21:42 -04:00
  • 7eee40368a Merge branch 'master' into docs-update Wyatt Johnson 2017-07-27 11:21:40 +10:00
  • 8d59678c8c Merge pull request #802 from coralproject/no-yarn-generate-introspection Wyatt Johnson 2017-07-27 11:21:17 +10:00
  • 7058e7e7e8 Merge branch 'master' into renaming-talk Kim Gardner 2017-07-26 21:16:18 -04:00
  • 0d7acbd44d Merge branch 'master' into no-yarn-generate-introspection Wyatt Johnson 2017-07-27 11:12:22 +10:00
  • 9c425c371d Merge pull request #801 from coralproject/jwt Wyatt Johnson 2017-07-27 11:10:19 +10:00
  • 8cee74ae06 Merge branch 'master' into jwt Wyatt Johnson 2017-07-27 11:05:26 +10:00
  • ea16d50516 docs update for jwt Wyatt Johnson 2017-07-27 11:04:47 +10:00
  • 98a638cb4d Merge branch 'master' into no-yarn-generate-introspection Kim Gardner 2017-07-26 21:02:28 -04:00
  • 59a1435089 Updated config Wyatt Johnson 2017-07-27 11:01:31 +10:00
  • 4733233cae Added new cookie config params Wyatt Johnson 2017-07-27 10:58:12 +10:00
  • 9b37767674 refactored secret parsing Wyatt Johnson 2017-07-27 10:49:33 +10:00
  • 22b3a59351 Merge branch 'master' into renaming-talk Kim Gardner 2017-07-26 15:17:19 -04:00
  • fdb3a27616 Merge pull request #804 from coralproject/offtopic-style-change Kim Gardner 2017-07-26 15:07:06 -04:00
  • 67f1ee1e39 changes to off-topic badge colors Samantha Hankins 2017-07-26 15:00:48 -04:00
  • 13434556fd Merge pull request #798 from coralproject/live-reactions-no-comment Kim Gardner 2017-07-26 14:52:08 -04:00
  • 2713254358 Merge branch 'master' into live-reactions-no-comment Belén Curcio 2017-07-26 15:22:20 -03:00
  • 605cefaeac Merge pull request #799 from coralproject/prefix-redux-actions-plugins Belén Curcio 2017-07-26 15:21:35 -03:00
  • 494d52ca36 Merge branch 'master' into feature/talk-plugin-toxic-comments Kim Gardner 2017-07-26 11:39:31 -04:00
  • b00435bfe3 Click on flagged user shows correct drawer Chi Vinh Le 2017-07-26 18:43:10 +07:00
  • b1b4e9fc57 Don't use yarn generate-introspection Chi Vinh Le 2017-07-26 16:34:07 +07:00
  • cd3adb93dd Merge branch 'master' into prefix-redux-actions-plugins Kiwi 2017-07-26 11:15:44 +02:00
  • 0ea3422126 Merge branch 'master' into live-reactions-no-comment Kiwi 2017-07-26 11:15:34 +02:00
  • e848df0976 docs update for jwt + move code of conduct Wyatt Johnson 2017-07-26 18:09:04 +10:00
  • 6a12ab28db fixes for tests Wyatt Johnson 2017-07-26 15:58:52 +10:00
  • a91624bf4b Expanded JWT Capabilities Wyatt Johnson 2017-07-26 15:24:16 +10:00
  • 2dbcb0fe45 Updates to docs, fix bug with jwt Wyatt Johnson 2017-07-26 11:23:09 +10:00
  • 557bda6444 Merge branch 'master' into docs-update Wyatt Johnson 2017-07-26 08:55:32 +10:00
  • f22350c92e Merge pull request #794 from coralproject/fix-vc Kim Gardner 2017-07-25 16:45:56 -04:00
  • 772e68f72e Merge branch 'master' into fix-vc Kim Gardner 2017-07-25 14:26:04 -04:00
  • 49943ddac0 Merge pull request #785 from coralproject/event-emitter Kim Gardner 2017-07-25 14:11:18 -04:00
  • 11a735f82e Merge branch 'master' into event-emitter Kim Gardner 2017-07-25 14:04:22 -04:00
  • c7515ff126 Merge pull request #800 from coralproject/fix-docker-deploy Kim Gardner 2017-07-25 13:55:50 -04:00
  • 21d19d170d Exclude generateIntrospectionResult from dockerignore Chi Vinh Le 2017-07-26 00:49:16 +07:00
  • 608ad26e88 deleting unused utils Belen Curcio 2017-07-25 14:18:40 -03:00
  • 17e6064b9e Adding react touch events Belen Curcio 2017-07-25 14:15:52 -03:00