Commit Graph

7162 Commits

Author SHA1 Message Date
Kim Gardner d8e7b25d0e Merge pull request #576 from coralproject/FE_Plugin_DOCS
FE Plugin Docs cleanup
2017-05-09 13:49:49 -04:00
Belen Curcio 52b0819e78 Adding example for plugins within the Admin Comment Queue 2017-05-09 14:02:35 -03:00
Benjamin Goering 994b5006b6 Merge branch 'master' into edit-comment 2017-05-09 09:12:14 -07:00
riley a187472d5c merge master 2017-05-09 10:11:04 -06:00
Kim Gardner a20bacd78d Merge branch 'master' into FE_Plugin_DOCS 2017-05-09 12:07:27 -04:00
Riley Davis 084f6b28ed merge master 2017-05-09 10:06:41 -06:00
Kim Gardner 87bc3e0a72 Merge pull request #565 from coralproject/approve-reject-noop
Don't redo actions on comments
2017-05-09 12:06:21 -04:00
Belen Curcio 3c06ee9360 Adds slots to admin stream 2017-05-09 12:21:21 -03:00
Belén Curcio 5b22bfbac2 Merge branch 'master' into coral-reaction 2017-05-09 11:40:30 -03:00
Belén Curcio c020008fad Merge branch 'master' into config-embed 2017-05-09 10:54:52 -03:00
Kiwi 4eb20108b1 Merge branch 'master' into approve-reject-noop 2017-05-09 20:06:11 +07:00
Kim Gardner 42db896d33 Merge branch 'master' into FE_Plugin_DOCS 2017-05-09 08:09:36 -04:00
Kim Gardner c0b526e98d Fix typo 2017-05-09 08:03:18 -04: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 Gardner 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 Curcio 58ce5d5055 Merge branch 'master' into coral-reaction 2017-05-09 08:52:04 -03:00
Kiwi f9259ead50 Merge branch 'master' into query-mutation-api 2017-05-09 17:49:50 +07:00
Kiwi 6fb227eb72 Merge branch 'master' into approve-reject-noop 2017-05-09 17:49:30 +07:00
Gabriela Rodríguez Berón b8e530ca1f Merge branch 'master' into 142993479-tags 2017-05-08 21:08:28 -07:00
Benjamin Goering 8af7168f4f Merge branch 'master' into edit-comment 2017-05-08 19:26:38 -07:00
gaba da0cebbda7 Fix the plugin TagLabel to show the staff tag. 2017-05-08 17:06:49 -07:00
gaba 7c09902294 The name for the tag is called ID. 2017-05-08 16:55:11 -07: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
gaba 96cd5197e3 Test was failing as I was not returning an error. 2017-05-08 16:05:40 -07: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
Wyatt Johnson e30bdd1cdc Merge branch 'master' into auth-tokens 2017-05-08 16:11:27 -06:00
Kim Gardner 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 Gardner b2c8e3b254 Merge branch 'master' into context-from-comment 2017-05-08 17:34:55 -04:00
Kim Gardner 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 Gardner 19d7a3323e Merge branch 'master' into mod-is-main-tab 2017-05-08 17:30:56 -04:00
Wyatt Johnson 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 Gardner 6dd01b4334 Merge branch 'master' into mod-is-main-tab 2017-05-08 17:26:55 -04:00
Wyatt Johnson b6e3796afe Merge branch 'master' into sub-fix 2017-05-08 15:25:57 -06:00
Kim Gardner 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 Johnson 85d634c221 Merge branch 'master' into sub-fix 2017-05-08 15:21:43 -06:00
Belén Curcio 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 Gardner e04bf7f9bc Merge branch 'master' into approve-reject-noop 2017-05-08 16:22:42 -04:00
David Erwin 50d832c2f8 Remove pseudocode 2017-05-08 16:21:24 -04:00
Kim Gardner 0b06c233a8 Merge pull request #523 from coralproject/FE_Plugin_DOCS
Frontend Plugins DOCS
2017-05-08 16:20:27 -04:00
Kim Gardner 7a3b36433a Merge branch 'master' into FE_Plugin_DOCS 2017-05-08 16:16:34 -04:00
Belén Curcio d478910a81 Merge pull request #570 from coralproject/add-supported-browsers-docs
Supported Browsers (docs)
2017-05-08 17:15:16 -03:00
gaba 743a96cd21 Removes debug statements. 2017-05-08 13:12:24 -07:00
gaba c4c0ee79cd Fix tests. 2017-05-08 13:12:24 -07:00