Commit Graph

3302 Commits

Author SHA1 Message Date
Belén Curcio c72dfdddf3 Merge branch 'master' into max-resize-other-box 2017-10-05 07:25:09 -03:00
PepeFranco 8d6f79ab79 Fixed typo from LAN to LANG 2017-10-04 16:16:07 -05:00
PepeFranco 841ab53ea7 Added env variable TALK_DEFAULT_LAN 2017-10-04 15:42:02 -05:00
Lance Ruegger 5147ca6b86 Add a max-width to the flag-reason text box to prevent cutoff 2017-10-04 11:04:47 -07:00
Chi Vinh Le 52595bb3f8 Merge branch 'master' into jest-unit-test 2017-10-03 22:48:14 +07:00
Kiwi 8b39613148 Merge branch 'master' into es6-modules-tree-shaking 2017-10-03 17:39:06 +02:00
Chi Vinh Le 79d312df50 Fix styling of edited marker 2017-10-03 22:25:37 +07:00
Chi Vinh Le 33920afc74 Port form chai to jest 2017-10-03 21:54:15 +07:00
Chi Vinh Le bd83e9e118 Add first Snapshot testing 2017-10-03 21:31:10 +07:00
Chi Vinh Le c1f7ef4f32 Introduce Jest Unit Testing framework 2017-10-03 21:08:02 +07:00
Kiwi d07c7de292 Merge branch 'master' into es6-modules-tree-shaking 2017-10-03 15:52:10 +02:00
Chi Vinh Le 942b65648b Adapt plugins-loader to es6 2017-10-03 20:43:19 +07:00
Chi Vinh Le 7ea05e699e Remove deprecated commonjs imports and exports 2017-10-03 20:43:18 +07:00
Belen Curcio dde1f7b5be Assigned by removed 2017-10-02 16:26:21 -03:00
Kim Gardner 4c28e43e62 Merge branch 'master' into subscriber-badge 2017-10-02 18:31:15 +01:00
Chi Vinh Le b1bc97c8d5 Improve styling 2017-10-02 22:34:12 +07:00
Chi Vinh Le 18b802c555 Merge branch 'master' into toxicity-detail 2017-10-02 22:30:49 +07:00
Chi Vinh Le 1c16a75f6b Merge branch 'master' into toxicity-detail
Conflicts:
	plugin-api/beta/client/components/index.js
2017-10-02 22:27:57 +07:00
Chi Vinh Le 075d62a32a Move CommentDetails to plugin-api 2017-10-02 20:50:43 +07:00
Kim Gardner 2d92284622 Merge branch 'master' into subscriber-badge 2017-10-02 13:00:45 +01:00
Belen Curcio 17f5800363 Shorcuts working again! 2017-10-02 01:24:59 -03:00
Belen Curcio 43cb0efe7e bug: usertags 2017-10-02 01:03:20 -03:00
Chi Vinh Le d396f43fe3 Merge branch 'master' into use-talk-linting-preset
Conflicts:
	package.json
2017-09-29 23:55:33 +07:00
Chi Vinh Le 7d41421526 adminCommentMoreFlagDetails slot and more 2017-09-29 23:34:40 +07:00
Chi Vinh Le 9bd55b267e excludeIf now returns a new component 2017-09-29 23:33:37 +07:00
Chi Vinh Le 90470b8331 Make IfSlotIsEmpty and IfSloIsNotEmpty accept an array of slot names 2017-09-29 23:33:12 +07:00
Ryan Yun 36ba7367d1 add talk-embed-stream- prefix to classes 2017-09-29 10:57:23 -04:00
Chi Vinh Le f9693c7154 Refactor and pluginize comment details 2017-09-29 19:42:44 +07:00
Chi Vinh Le 5d718f6dd4 Only shw user flags in detail 2017-09-28 22:02:06 +07:00
Chi Vinh Le 219399a231 Refactor ComemntDetail and implement ToxicDetail 2017-09-27 22:50:45 +07:00
Kim Gardner 0362dad14b Merge branch 'master' into add-class-names 2017-09-27 16:06:21 +01:00
Kim Gardner 8d6b9dd23c Merge branch 'master' into featured-comment-content-slot 2017-09-27 10:54:37 +01:00
Wyatt Johnson 921eea59c8 Merge branch 'master' into password-reset-fix 2017-09-26 10:36:47 -06:00
Kim Gardner 762f4f7898 Merge branch 'master' into cleanup-dependencies 2017-09-26 17:15:13 +01:00
Kiwi e400ae37f4 Merge branch 'master' into password-reset-fix 2017-09-26 18:14:20 +02:00
Kiwi 45b0ec48de Merge branch 'master' into featured-comment-content-slot 2017-09-26 18:11:21 +02:00
Belen Curcio baa5bddd19 Merge branch 'mod-indicator' of github.com:coralproject/talk into mod-indicator 2017-09-26 12:43:05 -03:00
Belen Curcio bea7d75db7 Polling to update the Header Indicator 2017-09-26 12:42:39 -03:00
Belén Curcio 8e5edd65c7 Merge branch 'master' into mod-indicator 2017-09-26 12:36:59 -03:00
Wyatt Johnson 9ae59ef998 added parent url to the login popup 2017-09-26 09:35:33 -06:00
Chi Vinh Le 0f382bd742 Use commentContent slot in Featured Comments 2017-09-26 22:31:54 +07:00
Kiwi c40393347a Merge branch 'master' into use-talk-linting-preset 2017-09-26 14:39:25 +02:00
Chi Vinh Le 8c05e3df87 Use eslint-config-talk preset 2017-09-26 19:35:24 +07:00
Chi Vinh Le 3db406bf26 Rename Community Query 2017-09-26 03:31:04 +07:00
Belén Curcio c5e078f1e1 Merge branch 'master' into mod-indicator 2017-09-25 13:49:56 -03:00
Belen Curcio e6f18d8558 Updates 2017-09-25 13:49:26 -03:00
Ryan Yun 76f259a2aa Merge branch 'master' into add-class-names 2017-09-25 12:34:20 -04:00
Ryan Yun 3f90f72bee update classes to follow talk naming convention 2017-09-25 12:33:59 -04:00
Chi Vinh Le f211bdf34e Fix contains links styling 2017-09-25 23:20:32 +07:00
Kiwi d2e5633d91 Merge branch 'master' into cleanup-dependencies 2017-09-25 18:20:07 +02:00