Commit Graph

5197 Commits

Author SHA1 Message Date
Kim Gardner 6e6caaf5a9 Merge pull request #782 from coralproject/post-comment-no-alias
Remove remaining username alias in post comment mutation
2017-07-21 09:35:58 -04:00
Kim Gardner 8261c40c8d Merge branch 'master' into post-comment-no-alias 2017-07-21 09:31:01 -04:00
Kim Gardner 316b0a8808 Merge pull request #781 from coralproject/featured-tag-on-replies
Show featured tag on replies too
2017-07-21 09:30:45 -04:00
Kim Gardner ebce930b8c Merge branch 'master' into featured-tag-on-replies 2017-07-21 09:19:21 -04:00
Kim Gardner 8c8a2fcee0 Merge pull request #780 from coralproject/incosistent-state-load-more
Quick fix inconsistent state
2017-07-21 09:18:46 -04:00
Kim Gardner 1733ab8690 Merge branch 'master' into post-comment-no-alias 2017-07-21 09:16:54 -04:00
Kim Gardner 9624a12e39 Merge branch 'master' into featured-tag-on-replies 2017-07-21 09:15:31 -04:00
Kim Gardner 143050cbd5 Merge branch 'master' into incosistent-state-load-more 2017-07-21 09:14:19 -04:00
Kim Gardner 0fd7d9f020 Merge pull request #784 from coralproject/featured-comments-info
Featured Comments Info Tooltip
2017-07-21 09:14:00 -04:00
Belén Curcio 7ac3a325f7 Merge branch 'master' into featured-comments-info 2017-07-21 05:43:05 -03:00
Belen Curcio 149389057d Translations and style 2017-07-21 05:34:28 -03:00
Belen Curcio 3b01218338 Adding translations 2017-07-21 05:34:04 -03:00
Belen Curcio 2d8e36e511 Removing innecesary connects, and classes 2017-07-21 05:27:34 -03:00
Belen Curcio 9c9f088ac3 Containers, reducer and constants 2017-07-21 05:24:45 -03:00
Belen Curcio 392d82e30a Info Icon, and Tooltip 2017-07-21 05:24:27 -03:00
Belen Curcio f86d210bbb Adding actions 2017-07-21 05:23:54 -03:00
Belen Curcio 11ea45ef69 typo with white space 2017-07-21 05:21:13 -03:00
Belén Curcio b0cbddd313 Merge pull request #783 from coralproject/disable-fragment-warnings
Disable false-positive warnings
2017-07-20 19:32:57 -03:00
Chi Vinh Le 1f8f293594 Disable false-positive warnings 2017-07-21 04:17:47 +07:00
Chi Vinh Le 7ca7166c7a Add clarification 2017-07-21 04:08:43 +07:00
Chi Vinh Le 65500eda64 Remove remaining username alias in post comment mutation 2017-07-21 03:57:32 +07:00
Chi Vinh Le 0e37f36e02 Show featured tag on replies too 2017-07-21 02:36:04 +07:00
Chi Vinh Le abed842c23 Quick fix inconsistent state 2017-07-21 02:27:59 +07:00
Kim Gardner e1d1549c93 Merge pull request #736 from coralproject/featured-comments
Featured Comments
2017-07-20 10:45:56 -04:00
Belen Curcio 8f820ace5b Merge branch 'master' of github.com:coralproject/talk 2017-07-20 11:45:54 -03:00
Belen Curcio 1069498323 Merge branch 'master' of github.com:coralproject/talk 2017-07-20 11:31:25 -03:00
Kim Gardner c34daacd8c Merge branch 'master' into featured-comments 2017-07-19 20:07:28 -04:00
Kim Gardner f7f5b42b71 Merge pull request #778 from coralproject/make-permalink-readonly
Make permalink readonly
2017-07-19 20:07:12 -04:00
Chi Vinh Le f8a3b84e94 Make permalink readonly 2017-07-20 04:04:25 +07:00
Chi Vinh Le 44e89bc96c Remove unused style 2017-07-20 04:01:39 +07:00
Chi Vinh Le 2342934f48 Reset star button css 2017-07-20 03:58:22 +07:00
Chi Vinh Le 5328374b73 Make goTo link accessible 2017-07-20 03:51:34 +07:00
Chi Vinh Le 6f64eac5de Merge branch 'featured-comments' of ssh://github.com/coralproject/talk into featured-comments 2017-07-20 03:45:01 +07:00
Chi Vinh Le 0b884a7664 Harmonize classnames 2017-07-20 03:44:25 +07:00
Kim Gardner 64602f1731 Merge branch 'master' into featured-comments 2017-07-19 16:42:37 -04:00
Kim Gardner 3bc26cad80 Merge pull request #776 from coralproject/bump-version-2-5-0
Bump version 2.5.0
2017-07-19 16:41:26 -04:00
Kim Gardner def49d42aa Merge branch 'master' into bump-version-2-5-0 2017-07-19 16:34:43 -04:00
Chi Vinh Le 3d4c296837 Merge branch 'featured-comments' of ssh://github.com/coralproject/talk into featured-comments 2017-07-20 03:31:44 +07:00
Chi Vinh Le 64571d3848 Subtract ignored comments correctly 2017-07-20 03:30:37 +07:00
Kim Gardner ad669b8399 Merge branch 'master' into featured-comments 2017-07-19 16:28:20 -04:00
Kim Gardner 1c8e009366 Merge pull request #777 from coralproject/perma-link-plugin-commentId
Replace deprecated commentId in talk-plugin-permalink
2017-07-19 16:27:59 -04:00
Chi Vinh Le 5d8528fdb5 Replace deprecated commentId 2017-07-20 03:16:05 +07:00
Kim Gardner 6cab2634bf Add space before Go to conversation text 2017-07-19 16:05:28 -04:00
Chi Vinh Le d6adff288c Fix typo 2017-07-20 02:51:09 +07:00
Chi Vinh Le ad4b03bfcd Merge branch 'master' into featured-comments 2017-07-20 02:39:29 +07:00
Kim Gardner 99b8b4e90b Bump version 2.5.0 2017-07-19 15:34:04 -04:00
Chi Vinh Le 3fa475009a Use getDefinition name from plugin-api 2017-07-20 02:32:17 +07:00
Kim Gardner 139802381f Merge pull request #775 from coralproject/recursively-resolve-fragments
Recursively resolve fragments
2017-07-19 15:29:06 -04:00
Chi Vinh Le fd0143da5d Use connect from framework 2017-07-20 02:17:31 +07:00
Chi Vinh Le baa4808364 Allow setting default stream tab 2017-07-20 02:16:19 +07:00