Commit Graph

7162 Commits

Author SHA1 Message Date
Riley Davis fd968b2070 position permalink popup given different comment scenarios 2017-03-30 10:50:58 -06:00
Belen Curcio 79cbdaf92b Merge branch 'plugin' of github.com:coralproject/talk into plugin 2017-03-30 13:33:00 -03:00
Belén Curcio 5fe96cf47c Merge branch 'master' into plugin 2017-03-30 13:22:29 -03:00
Kiwi b9f0633365 Merge pull request #454 from coralproject/markdown-infobox
Markdown InfoBox
2017-03-30 23:10:14 +07:00
Belen Curcio 52b6ce06e6 Linting 2017-03-30 13:07:32 -03:00
Belén Curcio 0ec582e411 Merge branch 'master' into markdown-infobox 2017-03-30 13:04:07 -03:00
Belen Curcio a7def6fc2b Adding the state of plugins to the main 2017-03-30 12:57:05 -03:00
Belen Curcio 7efbdc8b59 Plugins can trigger own actions with core reducers 2017-03-30 12:40:04 -03:00
Belen Curcio 679962168c Plugins can trigger own actions with core reducers 2017-03-30 12:24:19 -03:00
Chi Vinh Le 4c79f45556 Support Markdown in Infobox 2017-03-30 22:19:02 +07:00
Riley Davis f7f0a9d99e Merge pull request #453 from coralproject/upgrade-react
Upgrade React
2017-03-30 08:31:32 -06:00
David Erwin a22d7af8bb Merge branch 'master' into change-permalink-behavior 2017-03-30 10:20:58 -04:00
Belen Curcio 17a8f48b4f Plugins have access to ParentComponent Properties 2017-03-30 11:15:20 -03:00
Belen Curcio ab6f455ec7 Plugins: Reducers and Actions - Working 2017-03-30 11:10:11 -03:00
Chi Vinh Le 4d89db931e Integrate MarkdownEditor 2017-03-30 20:49:18 +07:00
Chi Vinh Le 2d0208046b Implement MarkdownEditor 2017-03-30 20:49:18 +07:00
Chi Vinh Le e878d1ebfd Upgrade React 2017-03-30 17:13:02 +07:00
Belen Curcio 659c63e5cb Adds graph functionality for plugins 2017-03-29 22:14:56 -03:00
Belen Curcio 9df334866d Adds graph functionality for plugins 2017-03-29 19:11:43 -03:00
Riley Davis f37c768662 only highlight the actual comment permalinked 2017-03-29 15:21:41 -06:00
Riley Davis 3007ba68f8 load more replies on a permalinked comment 2017-03-29 15:12:33 -06:00
Belen Curcio 4ca2a48bc9 typeDefs for respect added 2017-03-29 17:40:29 -03:00
Belen Curcio 635df54a2c Extended context 2017-03-29 17:21:31 -03:00
Belen Curcio cfb28c4c2a Merge 2017-03-29 16:42:59 -03:00
David Erwin 1e80991614 Merge pull request #445 from coralproject/dynamic-email-templates
hot-load email templates during development
2017-03-29 15:38:42 -04:00
Wyatt Johnson 0dc105405c Added new dockerfile for plugin development 2017-03-29 13:37:36 -06:00
Belen Curcio 5dc9811e06 Stable Version with reducers and actions 2017-03-29 16:24:09 -03:00
Wyatt Johnson ebcb3b4b02 Merge branch 'master' into dynamic-email-templates 2017-03-29 13:09:31 -06:00
Riley Davis f11a11cf67 show view more button on a permalinked comment if applicable 2017-03-29 13:04:28 -06:00
Kim Gardner c5d36a9f19 Merge branch 'master' into change-permalink-behavior 2017-03-29 14:49:21 -04:00
Kim Gardner f80f253b98 Merge pull request #452 from coralproject/bump-version-1-4-0
Bump version to 1.4.0
2017-03-29 14:49:02 -04:00
Wyatt Johnson dd3d1e9fe7 fix for session service 2017-03-29 12:45:57 -06:00
Kim Gardner 71d2baa010 Bump version to 1.4.0 2017-03-29 14:43:19 -04:00
Kim Gardner 55973859ef Merge branch 'master' into change-permalink-behavior 2017-03-29 14:29:16 -04:00
Kim Gardner 6548a76bfb Merge pull request #451 from coralproject/username-fix
Fixes issues with wordlist and usernames
2017-03-29 14:28:57 -04:00
riley 009b381744 Merge branch 'master' into dynamic-email-templates 2017-03-29 12:28:14 -06:00
riley 3e00a4e842 Merge branch 'master' into change-permalink-behavior 2017-03-29 12:27:52 -06:00
Kim Gardner 57c1e58bc3 Merge branch 'master' into username-fix 2017-03-29 14:10:24 -04:00
Kim Gardner 0726603a4e Merge pull request #447 from coralproject/total-counts
show the total comment count instead of the parent count
2017-03-29 14:10:05 -04:00
Kim Gardner 9d59c95cdf Merge branch 'master' into total-counts 2017-03-29 13:55:21 -04:00
Kiwi 771f99cee8 Merge pull request #450 from coralproject/rm_duplicate_css
Remove duplicate material.css
2017-03-30 00:52:28 +07:00
Belen Curcio 6bb9d23fdc Stable Version with reducers and actions 2017-03-29 14:46:45 -03:00
Belen Curcio 520392829b Stable Version with reducers and actions 2017-03-29 14:45:59 -03:00
Chi Vinh Le 00a74f05cb Use standard mdl theme 2017-03-30 00:44:26 +07:00
Wyatt Johnson 8680d6cab8 Fixes issues with wordlist and usernames
- Ensure that the wordlist can't contain emoji's
- Ensure that username checks user the correct tokenizer
2017-03-29 10:57:12 -06:00
Riley Davis 184b6c00a6 Merge branch 'master' into total-counts 2017-03-29 10:06:41 -06:00
Wyatt Johnson ffbe976760 working websockets 2017-03-29 09:35:56 -06:00
Riley Davis 870fcac3b1 Merge branch 'master' into dynamic-email-templates 2017-03-29 09:31:24 -06:00
Chi Vinh Le d80ed467f1 Remove duplicate material.css 2017-03-29 21:41:22 +07:00
Kim Gardner 8435358879 Merge pull request #448 from pablocubico/patch-1
Found some typos on the spanish side :)
2017-03-29 07:53:24 -04:00