Commit Graph
10700 Commits
Author SHA1 Message Date
Wyatt Johnson 37dc3a27dc updated yarn.lock after merge conflict 2018-02-23 13:58:42 -07:00
Wyatt Johnson 12a1ed0de3 Merge branch 'master' into rte-plugin 2018-02-23 13:58:21 -07:00
Kim Gardner eb0265bbb3 Merge pull request #1400 from coralproject/pregit
pre-commit linting
2018-02-23 15:55:19 -05:00
Wyatt Johnson 36438c7f38 Merge branch 'master' into pregit 2018-02-23 13:17:20 -07:00
Wyatt Johnson bd08debb40 Merge pull request #1401 from coralproject/account-history-patches
Account history
2018-02-23 13:17:07 -07:00
Kim Gardner 7e41619732 Update new translation keys 2018-02-23 14:54:45 -05:00
Wyatt Johnson c869869436 Merge branch 'master' into account-history-patches 2018-02-23 12:33:05 -07:00
Wyatt Johnson 8b4fe46120 added support for new system icon 2018-02-23 12:32:49 -07:00
Kim Gardner 1707cd7d98 Merge branch 'master' into pregit 2018-02-23 14:30:57 -05:00
Wyatt Johnson 23e71221a6 Merge branch 'master' into rte-plugin 2018-02-23 12:20:50 -07:00
Wyatt Johnson c12b3ca2b2 Merge pull request #1395 from nikoferro/quiet-logs
issue #1022 - quiet logs on production mode
2018-02-23 12:17:24 -07:00
okbel 4fe3d582b8 commentBox slot 2018-02-23 15:55:32 -03:00
Wyatt Johnson ecf040ebf7 Merge branch 'master' into quiet-logs 2018-02-23 11:55:25 -07:00
okbel 632f80a202 Readme for talk-rich-text-pell 2018-02-23 15:54:34 -03:00
Wyatt Johnson 025c82a6cc migrated pregit linting 2018-02-23 11:48:44 -07:00
okbel 02374345e1 Adding README.md, modifying mutation, changing htmlBody to richTextBody to make it generic 2018-02-23 15:35:14 -03:00
Wyatt Johnson 627170a970 Updated server version 2018-02-23 11:31:20 -07:00
Kim Gardner 3a04e492c2 Merge pull request #1398 from mkonikov/patch-2
Fix typos
2018-02-23 12:53:03 -05:00
okbel e45b09b32a Adding support for links! 2018-02-23 14:52:20 -03:00
Wyatt Johnson fa3373ec94 added docs to workspace 2018-02-23 10:34:52 -07:00
Wyatt Johnson 5baa20b06f Merge branch 'master' into post-message 2018-02-23 10:30:07 -07:00
Kim Gardner 8571fdc957 Merge branch 'master' into patch-2 2018-02-23 12:27:32 -05:00
Kim Gardner 25f4f8c1c8 Merge pull request #1397 from mkonikov/patch-1
Typos in comments
2018-02-23 12:17:33 -05:00
Mendel Konikov cccac6a8bc Add more translations 2018-02-23 12:17:13 -05:00
Mendel Konikov 69117f2fa5 Fixed one more typo
And once we're going all out, capitalized ;)
2018-02-23 12:01:56 -05:00
Mendel Konikov e775a9f092 Add Hebrew template to all translation files 2018-02-23 12:00:01 -05:00
okbel 9b5c0c2ca7 classNames 2018-02-23 13:50:00 -03:00
Mendel Konikov 76237f42da Begin adding Hebrew translation 2018-02-23 11:29:28 -05:00
okbel e6832dc2b4 classNames 2018-02-23 13:23:08 -03:00
okbel 7422575aba Initializing purifier config 2018-02-23 13:16:00 -03:00
Mendel Konikov 820087f49c Fix typos 2018-02-23 11:12:34 -05:00
Mendel Konikov 6e942a1121 Fix typos in comments 2018-02-23 11:11:41 -05:00
okbel 907ffea1f9 Adding strict and secure rules for html injection and jsom config 2018-02-23 13:06:56 -03:00
okbel d6818366ec yarn locks 2018-02-23 12:40:44 -03:00
okbel 912ccd6dd9 Adding a plugin for the backend and a plugin for the frontend 2018-02-23 12:38:33 -03:00
okbel ab3133c8aa Merge branch 'rte-plugin' of github.com:coralproject/talk into rte-plugin
* 'rte-plugin' of github.com:coralproject/talk:
  moved lock file
  updated plugin reconciler, replaced docker commands
  Rm accident added file
  Fix CI
  added advisory excemption
  replaced custom loading with yarn workspaces
  Implement profile settings
  Refactor Profile
  add Google auth plugin
2018-02-23 12:30:45 -03:00
okbel 2f5c4906f7 Adding DOM Sanitizer 2018-02-23 12:29:30 -03:00
Mendel Konikov 898e28fe1b Typos in comments 2018-02-23 08:27:21 -05:00
Wyatt Johnson 139d036b42 changed styles + added translations 2018-02-22 17:32:37 -07:00
Wyatt Johnson 0406fe7d1c cleaned up notifications manager 2018-02-22 17:19:02 -07:00
Wyatt Johnson cbf33b29fb fixed permission bug 2018-02-22 17:18:42 -07:00
Belén Curcio 322740bda0 Merge branch 'master' into rte-plugin 2018-02-22 21:15:27 -03:00
Nicolas Ferro e33ccb57b6 invoke console warning through window to prevent from being discarded on prod 2018-02-22 21:00:55 -03:00
Wyatt Johnson 9ce94c97d0 merged lockfiles 2018-02-22 16:03:28 -07:00
Wyatt Johnson 31c643e4eb Merge branch 'master' into events 2018-02-22 16:02:07 -07:00
Wyatt Johnson 0a3acbc7ba added linting rules 2018-02-22 15:49:13 -07:00
Wyatt Johnson ec285dc87a Merge branch 'master' into docs 2018-02-22 15:40:06 -07:00
Nicolas Ferro a3e2448f25 Merge branch 'quiet-logs' of https://github.com/nikoferro/talk into quiet-logs 2018-02-22 19:34:53 -03:00
Nicolas Ferro 855e972bec fix pre-commit errors 2018-02-22 19:34:33 -03:00
Nicolas Ferro 361dc6c441 Merge branch 'master' into quiet-logs 2018-02-22 19:25:51 -03:00