Commit Graph

7162 Commits

Author SHA1 Message Date
Kim Gardner 0e8ecb37f3 Merge branch 'master' into bump-version-2-4-0 2017-07-11 16:11:33 -04:00
David Erwin d1b96f5830 Merge branch 'docs-architecture-cli' of https://github.com/coralproject/talk into docs-architecture-cli 2017-07-11 15:06:07 -04:00
David Erwin a9c6014634 Add more info 2017-07-11 15:05:52 -04:00
Kim Gardner 125168c7c8 Merge branch 'master' into docs-architecture-cli 2017-07-11 14:58:41 -04:00
David Erwin eafcadd6a1 Warn users more 2017-07-11 14:43:59 -04:00
David Erwin 211f24476a Create cli docs 2017-07-11 14:39:26 -04:00
David Erwin f55e4ef895 Merge pull request #753 from coralproject/adapt-embed-classnames
Adapt Class Names
2017-07-11 14:20:53 -04:00
Kim Gardner bbf1da88e6 Merge branch 'master' into adapt-embed-classnames 2017-07-11 13:51:18 -04:00
Kim Gardner d688f70c19 Merge pull request #755 from coralproject/docs-qf-register-link
Fix 404
2017-07-11 13:47:11 -04:00
Kim Gardner da7aa8f6d0 Merge branch 'master' into talk-plugin-avatar 2017-07-11 13:46:41 -04:00
Kim Gardner b04a477f6a Merge branch 'master' into adapt-embed-classnames 2017-07-11 13:44:51 -04:00
Kim Gardner 0546f741a5 Bump version to 2.4.0 2017-07-11 13:43:12 -04:00
David Erwin a535baeb31 Merge branch 'master' into docs-qf-register-link 2017-07-11 13:41:56 -04:00
David Erwin 8b125eab48 Fix 404 2017-07-11 13:36:45 -04:00
Kim Gardner 053b687959 Merge pull request #746 from coralproject/create-plugin
Create Plugins - Create plugins through the CLI
2017-07-11 13:33:57 -04:00
Kim Gardner b620ac703b Merge branch 'master' into adapt-embed-classnames 2017-07-11 12:11:33 -04:00
Kim Gardner 3cb0bb052c Merge branch 'master' into create-plugin 2017-07-11 12:06:19 -04:00
Kim Gardner c4985e0007 Merge branch 'master' into talk-plugin-avatar 2017-07-11 12:02:17 -04:00
David Erwin 066d9ce0ec Merge pull request #745 from coralproject/docs-features
Docs Architecture
2017-07-11 11:55:41 -04:00
David Erwin dc6fa74d22 Add more clarity 2017-07-11 11:51:02 -04:00
David Erwin e9e79b4605 Merge branch 'docs-features' of https://github.com/coralproject/talk into docs-features 2017-07-11 11:06:25 -04:00
David Erwin 1d9b627d73 Fix typos and clarify 2017-07-11 11:05:58 -04:00
Chi Vinh Le 40f4419c9d Add flagged unflagged CSS classnames 2017-07-11 21:54:35 +07:00
Chi Vinh Le 8b70dc688d Adapt CSS classnames for Embed 2017-07-11 21:03:27 +07:00
Chi Vinh Le b05a6c00ce Correct aria-controls 2017-07-11 20:37:19 +07:00
Kim Gardner f0bdee415b Merge branch 'master' into featured-comments 2017-07-11 08:18:31 -04:00
Kim Gardner 9063b8adf1 Merge branch 'master' into docs-features 2017-07-11 08:18:25 -04:00
Kim Gardner 01fd667eb4 Merge branch 'master' into talk-plugin-avatar 2017-07-11 08:17:49 -04:00
Kim Gardner 73ac8d16ef Merge branch 'master' into create-plugin 2017-07-11 08:13:59 -04:00
Kim Gardner ced449a148 Merge pull request #747 from coralproject/fix-permalink-live-update
Fix perma view live updates
2017-07-11 08:12:59 -04:00
Kim Gardner ffad851066 Merge branch 'master' into fix-permalink-live-update 2017-07-11 07:49:16 -04:00
Kim Gardner 4281fd590c Merge pull request #750 from coralproject/no-label-on-mobile
Remove labels for comment actions on mobile.
2017-07-11 07:46:11 -04:00
Belen Curcio 0c167fdfc4 Removing talk-plugin-avatar 2017-07-10 17:43:51 -03:00
Belen Curcio 5dfb372c42 Merge branch 'master' of github.com:coralproject/talk 2017-07-10 17:11:06 -03:00
Belen Curcio 932103c204 updated yarn lock 2017-07-10 17:08:49 -03:00
Belen Curcio 666225614b Merge branch 'talk-plugin-avatar' of github.com:coralproject/talk into talk-plugin-avatar 2017-07-10 17:06:57 -03:00
Belen Curcio 636f357186 Reverting changes from old branch 2017-07-10 17:06:40 -03:00
Belén Curcio be6337f17c Merge branch 'master' into talk-plugin-avatar 2017-07-10 17:05:56 -03:00
Belen Curcio 2c7f5ca089 linting 2017-07-10 17:00:01 -03:00
Belen Curcio f09550a4ac Avatar plugin support extending fragments 2017-07-10 16:56:46 -03:00
Belen Curcio 3c3a0523de Avatar support 2017-07-10 16:27:15 -03:00
Chi Vinh Le a2dabcac0e Hide action labels on mobile 2017-07-11 01:26:25 +07:00
Wyatt Johnson a686bc75a7 Some changes to server side stuff + tempalte location 2017-07-10 10:30:20 -06:00
Chi Vinh Le 8960f67a4d Add todo comments 2017-07-10 22:49:06 +07:00
Chi Vinh Le e10c1f1a1f Docs 2017-07-10 22:45:28 +07:00
Chi Vinh Le 55e70dfbec Fix perma view live updates 2017-07-10 22:13:04 +07:00
Chi Vinh Le af46e3a7b1 Merge branch 'master' into extendable-tab-menu
Conflicts:
	client/coral-embed-stream/src/components/Comment.js
2017-07-10 22:03:32 +07:00
Chi Vinh Le 883dfedfab Fix new count styles 2017-07-10 21:57:25 +07:00
Chi Vinh Le ae52b27009 Don't use div inside p 2017-07-10 21:53:55 +07:00
Chi Vinh Le 34a4a005d1 Add margin to highlighted comment 2017-07-10 21:12:52 +07:00