Commit Graph

  • 2bb56290c4 fixed bug in template Wyatt Johnson 2018-02-20 12:40:24 -07:00
  • 9426f280cc Update router.js Wyatt Johnson 2018-02-20 12:27:47 -07:00
  • 6a5c643ef2 Merge branch 'master' into refactor-profile Kiwi 2018-02-20 19:57:59 +01:00
  • 22ee7b1d34 fixed docs Wyatt Johnson 2018-02-20 11:34:26 -07:00
  • 234c705f35 Merge branch 'master' into account-h-until Kim Gardner 2018-02-20 12:47:16 -05:00
  • 74d38f16ed Merge pull request #1388 from coralproject/bump-version-4-2-2 v4.2.2 Wyatt Johnson 2018-02-20 10:27:14 -07:00
  • a7e9936671 Merge branch 'master' into refactor-profile Kiwi 2018-02-20 18:24:18 +01:00
  • 9617948493 Merge branch 'master' into account-h-until Belén Curcio 2018-02-20 14:03:22 -03:00
  • 7129896bd6 Merge branch 'master' into bump-version-4-2-2 Wyatt Johnson 2018-02-20 09:57:12 -07:00
  • e2e718494c Merge pull request #1387 from coralproject/action-fixes Wyatt Johnson 2018-02-20 09:57:05 -07:00
  • 284009df55 WIP Chi Vinh Le 2018-02-20 17:54:44 +01:00
  • f918bbea20 Update version to 4.2.2 Kim Gardner 2018-02-20 11:45:36 -05:00
  • 4467f6110f Merge branch 'master' into action-fixes Wyatt Johnson 2018-02-20 09:44:00 -07:00
  • a166404347 fix for action count null Wyatt Johnson 2018-02-20 09:31:08 -07:00
  • 34922a6d42 Merge branch 'master' into account-h-until Kim Gardner 2018-02-20 10:56:40 -05:00
  • 3d2f3ebc59 Merge pull request #1384 from coralproject/user-tooltip-style Kim Gardner 2018-02-20 10:56:04 -05:00
  • c4cdc672b7 Merge branch 'master' into user-tooltip-style Kim Gardner 2018-02-20 10:44:15 -05:00
  • b84a488518 Merge pull request #1380 from leeeandroo/facebook-translations Kim Gardner 2018-02-20 10:44:05 -05:00
  • 8b4b1728bc Merge branch 'master' into account-h-until Kim Gardner 2018-02-20 10:38:14 -05:00
  • 233c514251 Fix small typo Kim Gardner 2018-02-20 10:37:36 -05:00
  • 4b134cbfc2 Merge branch 'master' into facebook-translations Kim Gardner 2018-02-20 10:34:22 -05:00
  • c446098a1e Merge branch 'master' into user-tooltip-style Kim Gardner 2018-02-20 10:24:00 -05:00
  • a9e8f390b8 Merge branch 'master' into plugin-google-auth Kim Gardner 2018-02-20 10:23:05 -05:00
  • b26e938ac5 Merge pull request #1381 from leeeandroo/package-version421 Kim Gardner 2018-02-20 10:22:09 -05:00
  • ee04d9a848 Merge branch 'refactor-profile' into events Chi Vinh Le 2018-02-20 15:12:43 +01:00
  • 0ca8b978a1 Implement profile settings Chi Vinh Le 2018-02-20 13:21:02 +01:00
  • 846df0a5e0 trim dates, style tooltip okbel 2018-02-19 12:27:55 -03:00
  • e7934d9468 trim dates, style tooltip okbel 2018-02-19 12:23:36 -03:00
  • 3deb56750f Merge branch 'refactor-profile' into events Chi Vinh Le 2018-02-19 16:20:02 +01:00
  • 12497a1331 Adding duration asHours and asDays okbel 2018-02-19 12:07:57 -03:00
  • 45dde4636d Merge branch 'master' into refactor-profile Chi Vinh Le 2018-02-19 16:06:42 +01:00
  • 8c2070e345 Refactor Profile Chi Vinh Le 2018-02-19 16:04:43 +01:00
  • 606d5734f9 set a right last release 4.2.1 to package.json Leandro 2018-02-19 11:18:56 +01:00
  • 87ff631eed fix translations keys and add germna translations to facebook plugin Leandro 2018-02-19 09:50:07 +01:00
  • 43d4db085b Merge branch 'master' into plugin-google-auth Kim Gardner 2018-02-16 19:22:02 -05:00
  • b600172380 fixed import cycle Wyatt Johnson 2018-02-16 17:11:02 -07:00
  • 0b547b173a Merge branch 'master' into events Wyatt Johnson 2018-02-16 16:43:03 -07:00
  • 950efba3fe Merge pull request #1378 from coralproject/suspension-fix v4.2.1 Kim Gardner 2018-02-16 18:27:48 -05:00
  • af592e326f Merge branch 'master' into suspension-fix Wyatt Johnson 2018-02-16 16:18:02 -07:00
  • 499a7fe686 add Google auth plugin Kit Westneat 2018-02-16 14:40:28 -05:00
  • c2aa2077f4 Show suspension status on button Wyatt Johnson 2018-02-16 16:14:49 -07:00
  • 91aeb9dbae fixes based on feedback Wyatt Johnson 2018-02-16 16:08:05 -07:00
  • 26476f42f7 Merge pull request #1377 from coralproject/template-fixes Kim Gardner 2018-02-16 18:06:28 -05:00
  • 9a89dfaa29 fixed test Wyatt Johnson 2018-02-16 15:48:38 -07:00
  • 634da8012f Merge branch 'master' into events Wyatt Johnson 2018-02-16 15:47:37 -07:00
  • 3434fb4fed Merge branch 'master' into template-fixes Wyatt Johnson 2018-02-16 15:45:14 -07:00
  • a6bc29af9a Merge pull request #1368 from coralproject/snyk-fix-946937f7 Wyatt Johnson 2018-02-16 15:34:54 -07:00
  • d86ff8418d fixed changes to api Wyatt Johnson 2018-02-16 15:26:18 -07:00
  • e71bcbe58d Yarn install Kim Gardner 2018-02-16 17:14:54 -05:00
  • 77c838ea22 Merge branch 'master' into snyk-fix-946937f7 Kim Gardner 2018-02-16 17:03:50 -05:00
  • 39313a20fa Merge pull request #1374 from coralproject/spam-fixes Kim Gardner 2018-02-16 16:51:37 -05:00
  • ad4427286d Merge branch 'master' into snyk-fix-946937f7 Wyatt Johnson 2018-02-16 14:39:32 -07:00
  • dc82db6eda fixed template bugs Wyatt Johnson 2018-02-16 14:38:57 -07:00
  • 4bb2b3d731 fixes to spam plugin Wyatt Johnson 2018-02-16 14:34:04 -07:00
  • 4c06d5659d initial rewrite Wyatt Johnson 2018-02-16 13:31:37 -07:00
  • d812a0f696 Merge pull request #1371 from coralproject/fix-auth-proptypes Kim Gardner 2018-02-16 10:58:22 -05:00
  • ba11eb233a Fix proptypes errors in auth Chi Vinh Le 2018-02-16 12:31:37 +01:00
  • e76d109f93 Merge branch 'master' into snyk-fix-946937f7 Wyatt Johnson 2018-02-15 14:23:28 -07:00
  • 78db4077e1 Merge pull request #1369 from coralproject/typo-breaks-akismet Kim Gardner 2018-02-15 16:07:00 -05:00
  • 0519b55707 Translation typo is breaking Akismet Kim Gardner 2018-02-15 15:55:51 -05:00
  • 5602bf222c Merge pull request #1365 from coralproject/no-limit Kim Gardner 2018-02-15 15:12:28 -05:00
  • 181d258b5e lint Wyatt Johnson 2018-02-15 10:57:54 -07:00
  • 36e855237f replaced json -> hjson loader Wyatt Johnson 2018-02-15 10:47:36 -07:00
  • 376ffd8486 fixed runtime errors Wyatt Johnson 2018-02-15 10:21:56 -07:00
  • 214d9e5047 Add changes Chi Vinh Le 2018-02-15 17:34:47 +01:00
  • bfd6cfbaa4 Merge branch 'master' into snyk-fix-946937f7 Kim Gardner 2018-02-14 21:03:45 -05:00
  • 9ec7027f3c Merge branch 'master' into no-limit Kim Gardner 2018-02-14 21:03:17 -05:00
  • 4acb6aeb6c Merge pull request #1361 from coralproject/auth-refactor Kim Gardner 2018-02-14 21:01:21 -05:00
  • c3bccaf4a8 fix: package.json to reduce vulnerabilities snyk-bot 2018-02-15 01:19:30 +00:00
  • a867b27f53 emails loaded from graph Wyatt Johnson 2018-02-14 17:10:20 -07:00
  • e162a97919 Remove Facebook Auth from default Talk plugins Kim Gardner 2018-02-14 18:31:12 -05:00
  • f63a7915ea Update Facebook Auth and Recaptcha Docs Kim Gardner 2018-02-14 18:17:18 -05:00
  • 18710e2345 added tests Wyatt Johnson 2018-02-14 15:56:04 -07:00
  • ff29fa04e5 Merge branch 'master' into auth-refactor Kim Gardner 2018-02-14 17:55:06 -05:00
  • 7a9023744a Merge pull request #1363 from coralproject/router-cleanup Kim Gardner 2018-02-14 17:54:45 -05:00
  • b1c03973e6 Merge branch 'master' into router-cleanup Kim Gardner 2018-02-14 17:39:39 -05:00
  • 9e4759cbfd Merge branch 'master' into auth-refactor Kiwi 2018-02-14 20:14:22 +01:00
  • 94c98f000c Merge branch 'master' into no-limit Kiwi 2018-02-14 20:11:39 +01:00
  • 0b2cc29b4a Merge pull request #1367 from coralproject/akismet-docs-patch v4.2.0 Kim Gardner 2018-02-14 13:35:27 -05:00
  • 0efa419b35 Update 04-03-additional-plugins.md Wyatt Johnson 2018-02-14 11:26:43 -07:00
  • c2154b6efa Merge branch 'master' into router-cleanup Wyatt Johnson 2018-02-14 10:44:43 -07:00
  • cfd52144f4 Merge pull request #1366 from coralproject/bump-version-4-2-0 Kim Gardner 2018-02-14 12:43:00 -05:00
  • 239377dd7f Update version to 4.2.0 Kim Gardner 2018-02-14 12:25:40 -05:00
  • c46b29aed9 Merge branch 'master' into router-cleanup Kiwi 2018-02-14 16:06:59 +01:00
  • 43e02e1574 Apply suggestions Chi Vinh Le 2018-02-14 14:59:00 +01:00
  • ffd88e0ef0 Merge branch 'master' into no-limit Wyatt Johnson 2018-02-13 18:32:02 -07:00
  • 9820e575b2 patch Wyatt Johnson 2018-02-13 18:29:07 -07:00
  • 1e329c8967 code cleanup Wyatt Johnson 2018-02-13 17:45:26 -07:00
  • 73034a20f0 added support for configuring limiting, action optims Wyatt Johnson 2018-02-13 17:24:57 -07:00
  • 8f7171b54e fixed old default.css Wyatt Johnson 2018-02-13 13:59:20 -07:00
  • b6e4581ba2 Merge branch 'auth-refactor' of ssh://github.com/coralproject/talk into auth-refactor Chi Vinh Le 2018-02-13 21:27:13 +01:00
  • 78444a0bb4 Remove empty reducers Chi Vinh Le 2018-02-13 21:25:48 +01:00
  • b8e340c471 Merge branch 'master' into auth-refactor Kiwi 2018-02-13 21:19:50 +01:00
  • 4d7e64e1ec Fix css Chi Vinh Le 2018-02-13 21:20:08 +01:00
  • 39c1fcf83a remove before close Chi Vinh Le 2018-02-13 21:17:41 +01:00
  • 4b2d9fc93a Add formatting to Slot Chi Vinh Le 2018-02-13 21:17:24 +01:00
  • f56b8ca3a4 Merge pull request #1364 from coralproject/pym-patch Wyatt Johnson 2018-02-13 12:52:47 -07:00
  • 0a324a2268 template cleanup Wyatt Johnson 2018-02-13 12:46:55 -07:00
  • 5f5f0ffa14 patched pym Wyatt Johnson 2018-02-13 12:32:57 -07:00
  • fc27e02140 removed old unreverted code Wyatt Johnson 2018-02-13 12:28:42 -07:00