Commit Graph

8345 Commits

Author SHA1 Message Date
Andrew Losowsky ef5e70f179 Merge pull request #793 from coralproject/remove-cache
Removed yarn cache
2017-07-24 21:51:49 -04:00
Wyatt Johnson b8bd997fed removed yarn cache 2017-07-25 11:39:36 +10:00
Kim Gardner 6013b4b136 Merge branch 'master' into renaming-talk 2017-07-24 21:22:10 -04:00
Kim Gardner 712c7e2ad2 Merge branch 'master' into commentsid 2017-07-24 21:22:03 -04:00
Kim Gardner 6c43a8accd Merge branch 'master' into bump-version-3-0-0 2017-07-24 21:21:54 -04:00
Wyatt Johnson 4b5942dab8 Merge branch 'master' into docs-update 2017-07-25 11:21:27 +10:00
Wyatt Johnson 9e1d22b988 Merge pull request #792 from coralproject/version-bump
Bumped node version, replaced bcrypt -> bcryptjs
2017-07-25 11:20:56 +10:00
Wyatt Johnson 9ffe542234 added some forcing logic to circle 2017-07-25 10:51:29 +10:00
Wyatt Johnson e292475f1e Added yarn global add node-gyp back 2017-07-25 10:20:54 +10:00
Wyatt Johnson c8f3be4bf5 fixed docker version number 2017-07-25 10:03:50 +10:00
Wyatt Johnson 3e09d28308 Bumped node version, replaced bcrypt -> bcryptjs 2017-07-25 10:01:05 +10:00
Belen Curcio 85a10ba693 Touch events for mobile :) 2017-07-24 18:49:51 -03:00
Kim Gardner be46ac826b Update version to 3.0.0 2017-07-24 16:51:35 -04:00
Belen Curcio a036a051cb Using async await 2017-07-24 16:40:08 -03:00
Belen Curcio 36df7cb784 Extended Asset with comment 2017-07-24 16:31:24 -03:00
Belen Curcio 4b74c3312f typo 2017-07-24 15:36:00 -03:00
Chi Vinh Le c68cca0e5b Change some remaining coral-plugin-* strings 2017-07-24 22:45:20 +07:00
Wyatt Johnson 2ef219cc7c fixed link 2017-07-24 19:44:32 +10:00
Wyatt Johnson f35cce866a Updated docs, theme, jekyll 2017-07-24 19:41:51 +10:00
Kim Gardner 6383abd445 Merge branch 'master' into renaming-talk 2017-07-23 21:03:38 -04:00
Wyatt Johnson 7e917c9611 Merge branch 'master' into next 2017-07-23 18:35:53 -06:00
Kim Gardner 661354998f Merge branch 'master' into event-emitter 2017-07-22 18:54:35 -04:00
Kim Gardner db183124c9 Merge pull request #787 from coralproject/long-title
Fix for long titles in the All Streams Queue
v2.5.0
2017-07-21 21:18:44 -04:00
Kim Gardner ee220ca936 Merge branch 'master' into long-title 2017-07-21 21:13:24 -04:00
Kim Gardner 907e9bf226 Merge pull request #786 from coralproject/featured-comments-info
Featured Comments Tooltips
2017-07-21 15:18:15 -04:00
Belen Curcio 25bccde40f fix 2017-07-21 16:08:18 -03:00
Belen Curcio 6343a0d621 Adding tooltip to badges too 2017-07-21 16:01:43 -03:00
Chi Vinh Le 1db61941ed Comment WithEmit 2017-07-22 00:10:45 +07:00
Chi Vinh Le 7b1c0dfbaa Docs & stuff 2017-07-22 00:05:36 +07:00
Chi Vinh Le 6ea7e9d564 Use correct name 2017-07-21 23:58:41 +07:00
Chi Vinh Le 92d1fc5759 Comment out events listener 2017-07-21 23:55:15 +07:00
Chi Vinh Le 8b582e85f8 No redux prefix 2017-07-21 23:42:10 +07:00
Chi Vinh Le 970fe6fe04 Provide event emitter on admin side 2017-07-21 23:39:28 +07:00
Chi Vinh Le f5d4b7216e Merge branch 'master' into event-emitter 2017-07-21 22:57:51 +07:00
Chi Vinh Le cb95e9a308 Implement support for events 2017-07-21 22:54:45 +07:00
Kim Gardner 537311704d Merge branch 'master' into renaming-talk 2017-07-21 10:33:13 -04:00
Chi Vinh Le 0f82fa8bc5 Get store from context 2017-07-21 20:36:07 +07:00
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 be63ee86b6 Merge branch 'master' into renaming-talk 2017-07-21 09:17:22 -04:00
Kim Gardner 10a82f277d Merge branch 'master' into next 2017-07-21 09:17:11 -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