Commit Graph

8775 Commits

Author SHA1 Message Date
okbel 58897f7571 removing vscode 2018-02-27 14:18:48 -03:00
Kiwi d750ed5d6c Merge branch 'master' into purge-config-auth-token 2018-02-27 18:05:45 +01:00
Wyatt Johnson 8fe94e5ead Merge pull request #1394 from coralproject/post-message
postMessage API
2018-02-27 09:49:11 -07:00
Belén Curcio a0305e6cb1 Merge branch 'master' into rte-plugin 2018-02-27 12:41:35 -03:00
Kim Gardner e47ab0fa37 Merge branch 'master' into patch-1 2018-02-26 20:03:58 -05:00
Chi Vinh Le 1fd64e873d Purge config.auth_token from redux on logout 2018-02-26 22:58:29 +01:00
Chi Vinh Le 918ce04e83 fix jsdoc 2 2018-02-26 22:51:46 +01:00
Chi Vinh Le 09eaba5a2e fix jsdoc 2018-02-26 22:51:02 +01:00
Chi Vinh Le 6d48c62679 Fix closedAt wrong datatype 2018-02-26 22:42:51 +01:00
Chi Vinh Le 81026af3ee Bye bye old code 2018-02-26 22:38:43 +01:00
Chi Vinh Le 0e2a49ef1f Merge branch 'post-message' of ssh://github.com/coralproject/talk into post-message 2018-02-26 22:33:50 +01:00
Chi Vinh Le c0293a4487 Remove deprecated part <3 2018-02-26 22:32:29 +01:00
Chi Vinh Le 17a0aebdf7 Refactor postMessage service 2018-02-26 22:10:01 +01:00
Wyatt Johnson 19320eb063 Merge branch 'master' into post-message 2018-02-26 13:36:34 -07:00
Kim Gardner 00a40c9e34 Merge pull request #1402 from coralproject/single-slot
slotSize Slot
2018-02-26 12:15:46 -05:00
Chi Vinh Le 1b05f146fe Remove redudant request for user object 2018-02-26 17:29:53 +01:00
Wyatt Johnson 31e5eb8685 linting 2018-02-26 09:10:55 -07:00
Wyatt Johnson d1951c8504 Update plugins.js 2018-02-26 08:48:11 -07:00
Wyatt Johnson 9158faf295 Update Slot.js 2018-02-26 08:42:39 -07:00
Tomas 77c7bb3cab Update setting.js 2018-02-24 03:08:03 -05:00
Kim Gardner beafb42c15 Merge branch 'master' into post-message 2018-02-23 19:13:15 -05:00
Wyatt Johnson 9437c5f5a3 implemented unsubscribe button 2018-02-23 17:01:19 -07:00
Wyatt Johnson f0572d1e34 Merge branch 'master' into events 2018-02-23 15:09:32 -07:00
Wyatt Johnson 894940cd0b replaced singleSlot with slotSize 2018-02-23 14:48:57 -07:00
Wyatt Johnson 105ed1454d added singleSlot on the commentContent 2018-02-23 14:35:48 -07:00
Wyatt Johnson 1a9f9c2056 added support for the singleSlot 2018-02-23 14:32:52 -07:00
Wyatt Johnson 8ce0b784e2 added comment 2018-02-23 14:32:29 -07:00
Wyatt Johnson 22c876fa02 introduced some safety checks 2018-02-23 14:02:44 -07:00
Wyatt Johnson 735ecbcef3 linting updates 2018-02-23 14:00:07 -07:00
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