Commit Graph
3746 Commits
Author SHA1 Message Date
Belén CurcioandGitHub 5b22bfbac2 Merge branch 'master' into coral-reaction 2017-05-09 11:40:30 -03:00
Belen Curcio 743580fd08 Merge branch 'coral-reaction' of github.com:coralproject/talk into coral-reaction 2017-05-09 09:02:32 -03:00
Belen Curcio 788610a5f6 Like button params 2017-05-09 09:02:04 -03:00
Kim GardnerandGitHub 3129828f83 Merge pull request #575 from coralproject/suspect-partial
do not highlight partial word matches in admin since this is not how the backend works
2017-05-09 07:53:11 -04:00
Belén CurcioandGitHub 58ce5d5055 Merge branch 'master' into coral-reaction 2017-05-09 08:52:04 -03:00
Riley Davis d77fcfe9de Merge branch 'master' into suspect-partial 2017-05-08 17:13:50 -06:00
Riley Davis 2490e65981 merge master 2017-05-08 17:09:23 -06:00
Riley Davis 242f3ea5ea do not highlight partial word matches in admin since this is not how the backend works 2017-05-08 17:01:36 -06:00
Kim GardnerandGitHub 5625f5b4b8 Merge pull request #566 from coralproject/context-from-comment
open the comment in context when clicked
2017-05-08 17:38:42 -04:00
Kim GardnerandGitHub b2c8e3b254 Merge branch 'master' into context-from-comment 2017-05-08 17:34:55 -04:00
Kim GardnerandGitHub 3dff07de40 Merge pull request #572 from coralproject/mod-is-main-tab
default view is moderate > all
2017-05-08 17:34:43 -04:00
Kim GardnerandGitHub 19d7a3323e Merge branch 'master' into mod-is-main-tab 2017-05-08 17:30:56 -04:00
Wyatt JohnsonandGitHub dc86b87a62 Merge pull request #574 from coralproject/sub-fix
Fix for incorrect options passed to pubsub
2017-05-08 15:29:56 -06:00
Kim GardnerandGitHub 6dd01b4334 Merge branch 'master' into mod-is-main-tab 2017-05-08 17:26:55 -04:00
Wyatt JohnsonandGitHub b6e3796afe Merge branch 'master' into sub-fix 2017-05-08 15:25:57 -06:00
Kim GardnerandGitHub 34ee1c56ea Merge pull request #573 from coralproject/move-queues
move approved tab to be next to rejected tab
2017-05-08 17:25:47 -04:00
Wyatt JohnsonandGitHub 85d634c221 Merge branch 'master' into sub-fix 2017-05-08 15:21:43 -06:00
Belén CurcioandGitHub 513a841aac Merge branch 'master' into coral-reaction 2017-05-08 18:19:05 -03:00
Belen Curcio 88861754f1 Adding full example with translations 2017-05-08 18:05:54 -03:00
Belen Curcio fe58a5076e Adding coral-plugin-love 2017-05-08 18:05:39 -03:00
Riley Davis 3e258b1787 move approved tab 2017-05-08 14:59:23 -06:00
Belen Curcio b82cab0655 Lint 2017-05-08 17:50:15 -03:00
Belen Curcio b547ad44f1 Better and more friendly API 2017-05-08 17:46:56 -03:00
Kim GardnerandGitHub 0b06c233a8 Merge pull request #523 from coralproject/FE_Plugin_DOCS
Frontend Plugins DOCS
2017-05-08 16:20:27 -04:00
Kim GardnerandGitHub 7a3b36433a Merge branch 'master' into FE_Plugin_DOCS 2017-05-08 16:16:34 -04:00
Belén CurcioandGitHub d478910a81 Merge pull request #570 from coralproject/add-supported-browsers-docs
Supported Browsers (docs)
2017-05-08 17:15:16 -03:00
Riley Davis c00e6c1ece default view is moderate > all 2017-05-08 13:40:24 -06:00
Wyatt Johnson bc3c73a992 Fix for incorrect options passed to pubsub 2017-05-08 13:26:07 -06:00
Belen Curcio 6934263f71 Ádding uuid v4 2017-05-08 15:59:52 -03:00
Belen Curcio cd18a7e76f Fully working. replaced typename by typereaction. Thanks kiwi 😂 2017-05-08 15:51:17 -03:00
Belen Curcio b7de01b0ad no console 2017-05-08 15:47:08 -03:00
Belen Curcio 011e5da26f Almost fully working 2017-05-08 15:44:11 -03:00
David Erwin e2ed21e113 Adding building block documentation 2017-05-08 12:00:22 -04:00
David Erwin b019c5e180 Separate supported and experimental plugin guildes 2017-05-08 10:36:36 -04:00
Belen Curcio a5f6e1f343 Adding coral-reaction 2017-05-08 11:32:46 -03:00
Belén CurcioandGitHub c920c7e9bc Merge branch 'master' into FE_Plugin_DOCS 2017-05-08 08:27:04 -03:00
Kim GardnerandGitHub 19d62a8c63 Merge branch 'master' into add-supported-browsers-docs 2017-05-05 16:46:21 -04:00
Kim Gardner b15a2af38c Update formatting of License info 2017-05-05 16:45:15 -04:00
Riley Davis 4ff42385e3 remove dead code 2017-05-05 14:41:19 -06:00
Kim Gardner dc81a59908 Supported Browsers 2017-05-05 16:40:17 -04:00
Kim GardnerandGitHub fe5ddbe323 Merge pull request #569 from coralproject/ui-overlaps
Apply button overlapped text
2017-05-05 16:16:06 -04:00
Riley Davis f8e8eef989 float: right; in css is just fine. 2017-05-05 14:05:52 -06:00
Riley DavisandGitHub 3fc19df240 Merge branch 'master' into context-from-comment 2017-05-05 13:56:28 -06:00
Wyatt JohnsonandGitHub d0cca476e6 Merge pull request #568 from coralproject/user-fix
Added privacy fix
2017-05-05 13:19:59 -06:00
Wyatt Johnson 7ccf9552c2 Added privacy fix 2017-05-05 13:14:34 -06:00
Riley Davis 519ca7beb5 en español 2017-05-05 11:55:28 -06:00
Riley Davis 5db48e8c0f make it a blue link instead of the whole thing 2017-05-05 11:35:18 -06:00
Riley Davis 5f9240f201 open the comment in context when clicked 2017-05-04 16:32:07 -06:00
Kim GardnerandGitHub 5168f563ef Merge pull request #557 from coralproject/admin-queue-polish
load more comments to moderate if available
v1.6.0
2017-05-03 18:02:35 -04:00
Kim GardnerandGitHub 7d0d4aa397 Merge branch 'master' into admin-queue-polish 2017-05-03 17:57:34 -04:00