Commit Graph

7162 Commits

Author SHA1 Message Date
Wyatt Johnson ad3958a2e0 Merge branch 'master' into update-translation-pt 2017-09-28 09:45:12 -06:00
Wyatt Johnson 58acdef043 Merge branch 'master' into bump-version-3-6-0 2017-09-28 09:44:09 -06:00
Ryan Yun 99aad0f74b Merge branch 'master' into add-class-names 2017-09-28 11:38:14 -04:00
Chi Vinh Le 5d718f6dd4 Only shw user flags in detail 2017-09-28 22:02:06 +07:00
Kim Gardner 44ce71ef14 Merge pull request #974 from coralproject/redis-cluster-support
Redis Cluster Support
2017-09-28 15:44:02 +01:00
Kim Gardner 47cde9a842 Merge branch 'master' into redis-cluster-support 2017-09-28 15:38:51 +01:00
Chi Vinh Le 219399a231 Refactor ComemntDetail and implement ToxicDetail 2017-09-27 22:50:45 +07:00
Ryan Yun 95114bc847 Merge branch 'add-class-names' of github.com:ryanyun/talk into add-class-names 2017-09-27 11:21:19 -04:00
Ryan Yun 12047d1ae1 fix typo for dynamic class names for like and respect buttons 2017-09-27 11:20:57 -04:00
Kim Gardner 0362dad14b Merge branch 'master' into add-class-names 2017-09-27 16:06:21 +01:00
Kim Gardner 97b81cc1cc Merge pull request #991 from coralproject/featured-comment-content-slot
Use commentContent slot in Featured Comments
2017-09-27 16:05:51 +01:00
Kim Gardner 8d6b9dd23c Merge branch 'master' into featured-comment-content-slot 2017-09-27 10:54:37 +01:00
Kim Gardner 9adf11e1d1 Merge branch 'master' into update-translation-pt 2017-09-27 10:53:52 +01:00
Kim Gardner ef49d9a3d2 Merge pull request #988 from coralproject/password-reset-fix
Password reset fixes
2017-09-26 17:42:06 +01:00
Wyatt Johnson 921eea59c8 Merge branch 'master' into password-reset-fix 2017-09-26 10:36:47 -06:00
Kim Gardner c5cd88f4c0 Merge pull request #986 from coralproject/cleanup-dependencies
Cleanup dependencies
2017-09-26 17:25:10 +01: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
Kim Gardner f3f8c6b24e Merge pull request #985 from coralproject/mod-indicator
Moderate Indicator
2017-09-26 17:03:34 +01: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
Kim Gardner 55b1f4831a Add translation of "new" queue in Portuguese 2017-09-26 16:30:09 +01:00
Wyatt Johnson 3d2575413d Merge branch 'master' into password-reset-fix 2017-09-26 09:07:07 -06: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
Kim Gardner fa4adda61e Merge branch 'master' into redis-cluster-support 2017-09-26 12:26:24 +01:00
Kim Gardner ea06b334f6 Merge pull request #987 from coralproject/fix-contains-link-styling
Fix contains links styling
2017-09-26 12:25:30 +01:00
Wyatt Johnson 203d3c7ee9 bug fixes 2017-09-25 16:12:40 -06:00
Wyatt Johnson 825e1b5e5c Fixes to password reset flow 2017-09-25 14:50:33 -06: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
Kiwi b01e919029 Merge pull request #983 from coralproject/modqueue-live-new-comments
Modqueue live new comments
2017-09-25 18:19:46 +02:00
Wyatt Johnson 62b407179f Merge branch 'master' into redis-cluster-support 2017-09-25 10:10:09 -06:00
Belén Curcio 536ef70415 Merge branch 'master' into mod-indicator 2017-09-25 12:50:29 -03:00
Chi Vinh Le 981c319810 Clean dependencies 2017-09-25 21:34:35 +07:00
Belen Curcio 19e23479ee Showing the indicators 2017-09-22 17:45:28 -03:00
Belen Curcio 86687f10d8 Working indicators 2017-09-22 17:38:46 -03:00
Belen Curcio 3b6bcba055 Indicator for Community 2017-09-22 17:25:59 -03:00
Belen Curcio acdfaeee9f Moving the initial query up 2017-09-22 16:58:06 -03:00
Chi Vinh Le 792d0b9a2d Add comments 2017-09-23 02:18:45 +07:00
Chi Vinh Le 9be2379f30 Merge branch 'modqueue-live-new-comments' of ssh://github.com/coralproject/talk into modqueue-live-new-comments 2017-09-23 02:03:49 +07:00