Commit Graph
9018 Commits
Author SHA1 Message Date
Wyatt Johnson 9098537838 removed console.log 2018-02-21 12:42:30 -07:00
Wyatt Johnson ab7cfffa50 improved mailer 2018-02-21 12:40:37 -07:00
okbel bf1bae8999 Support for both htmlBody and original body 2018-02-21 16:37:19 -03:00
Wyatt Johnson eb86fdbd11 mail cleanup 2018-02-21 11:43:19 -07:00
Chi Vinh Le 9ca237f49d Merge branch 'events' of ssh://github.com/coralproject/talk into events 2018-02-21 18:06:02 +01:00
Chi Vinh Le 6935330536 Implemented notification frontend functionality 2018-02-21 18:03:46 +01:00
Wyatt Johnson 60af5135ca Merge branch 'master' into plugin-google-auth 2018-02-21 09:50:30 -07:00
okbel 9cfa5b6a0f Removing old styles from default css 2018-02-21 11:15:23 -03:00
okbel 50748cc032 Updating onChange 2018-02-21 10:45:54 -03:00
okbel 7d7a5a8b59 Buttons styling 2018-02-21 10:43:10 -03:00
okbel d7b4f57350 styles, renaming, func 2018-02-21 10:27:01 -03:00
okbel 8258ccde9b RTE Plugin - Editor working 2018-02-21 10:13:13 -03:00
okbel 096c9a4894 Adding rte plugin 🎉 2018-02-21 09:26:39 -03:00
okbel e895413038 Adding new Slot, adding default component 2018-02-21 09:25:25 -03:00
Wyatt Johnson cb266e651b spelling 2018-02-20 21:47:16 -07:00
Wyatt Johnson b6fa8b92a1 Merge branch 'master' into events 2018-02-20 21:46:41 -07:00
Wyatt Johnson 85f3598e99 added advisory excemption 2018-02-20 21:45:35 -07:00
Wyatt Johnson e5f6188bd2 replaced custom loading with yarn workspaces 2018-02-20 21:39:32 -07:00
Wyatt Johnson 7e2e29c947 updated config 2018-02-20 17:57:40 -07:00
Wyatt Johnson 7404962741 embedded graph docs into static docs 2018-02-20 15:59:44 -07:00
Kim Gardner 8080994975 Merge branch 'master' into refactor-profile 2018-02-20 15:14:12 -05:00
Kim Gardner e8e8b007e3 Merge pull request #1382 from coralproject/account-h-until
Adding suspension and ban support for duration in hours and days
2018-02-20 15:13:48 -05:00
Wyatt Johnson 2bb56290c4 fixed bug in template 2018-02-20 12:40:24 -07:00
Wyatt Johnson 9426f280cc Update router.js 2018-02-20 12:27:47 -07:00
Kiwi 6a5c643ef2 Merge branch 'master' into refactor-profile 2018-02-20 19:57:59 +01:00
Wyatt Johnson 22ee7b1d34 fixed docs 2018-02-20 11:34:26 -07:00
Kim Gardner 234c705f35 Merge branch 'master' into account-h-until 2018-02-20 12:47:16 -05:00
Wyatt Johnson 74d38f16ed Merge pull request #1388 from coralproject/bump-version-4-2-2
Update version to 4.2.2
v4.2.2
2018-02-20 10:27:14 -07:00
Kiwi a7e9936671 Merge branch 'master' into refactor-profile 2018-02-20 18:24:18 +01:00
Belén Curcio 9617948493 Merge branch 'master' into account-h-until 2018-02-20 14:03:22 -03:00
Wyatt Johnson 7129896bd6 Merge branch 'master' into bump-version-4-2-2 2018-02-20 09:57:12 -07:00
Wyatt Johnson e2e718494c Merge pull request #1387 from coralproject/action-fixes
Action Count Fixes
2018-02-20 09:57:05 -07:00
Chi Vinh Le 284009df55 WIP 2018-02-20 17:54:44 +01:00
Kim Gardner f918bbea20 Update version to 4.2.2 2018-02-20 11:45:36 -05:00
Wyatt Johnson 4467f6110f Merge branch 'master' into action-fixes 2018-02-20 09:44:00 -07:00
Wyatt Johnson a166404347 fix for action count null 2018-02-20 09:31:08 -07:00
Kim Gardner 34922a6d42 Merge branch 'master' into account-h-until 2018-02-20 10:56:40 -05:00
Kim Gardner 3d2f3ebc59 Merge pull request #1384 from coralproject/user-tooltip-style
Making the User Info Tooltip more readable and friendly
2018-02-20 10:56:04 -05:00
Kim Gardner c4cdc672b7 Merge branch 'master' into user-tooltip-style 2018-02-20 10:44:15 -05:00
Kim Gardner b84a488518 Merge pull request #1380 from leeeandroo/facebook-translations
Fix translations keys and add german translations to facebook plugin
2018-02-20 10:44:05 -05:00
Kim Gardner 8b4b1728bc Merge branch 'master' into account-h-until 2018-02-20 10:38:14 -05:00
Kim Gardner 233c514251 Fix small typo 2018-02-20 10:37:36 -05:00
Kim Gardner 4b134cbfc2 Merge branch 'master' into facebook-translations 2018-02-20 10:34:22 -05:00
Kim Gardner c446098a1e Merge branch 'master' into user-tooltip-style 2018-02-20 10:24:00 -05:00
Kim Gardner a9e8f390b8 Merge branch 'master' into plugin-google-auth 2018-02-20 10:23:05 -05:00
Kim Gardner b26e938ac5 Merge pull request #1381 from leeeandroo/package-version421
set a right last release 4.2.1 to package.json
2018-02-20 10:22:09 -05:00
Chi Vinh Le ee04d9a848 Merge branch 'refactor-profile' into events 2018-02-20 15:12:43 +01:00
Chi Vinh Le 0ca8b978a1 Implement profile settings 2018-02-20 13:21:02 +01:00
okbel 846df0a5e0 trim dates, style tooltip 2018-02-19 12:27:55 -03:00
okbel e7934d9468 trim dates, style tooltip 2018-02-19 12:23:36 -03:00