Commit Graph
2068 Commits
Author SHA1 Message Date
Belén CurcioandGitHub 06b90041af Merge branch 'master' into config-embed 2017-05-11 09:46:58 -03:00
Belen Curcio 57d2b81b05 missing _ 2017-05-10 16:05:52 -03:00
Belen Curcio 10e8a32c21 Changes 2017-05-10 15:57:21 -03:00
Belen Curcio 0a2b26b599 Exports 2017-05-10 15:53:33 -03:00
Belen Curcio c3dff79e6e Updated 2017-05-10 15:35:32 -03:00
Belen Curcio 7313aaa473 Merge branch 'config-embed' of github.com:coralproject/talk into config-embed 2017-05-10 15:09:19 -03:00
Belen Curcio 74ffc00c20 Adding changes 2017-05-10 15:02:43 -03:00
Belen Curcio 2673de5059 lintin 2017-05-10 14:59:10 -03:00
Belen Curcio 644d00d5d8 Adding coral-plugin-api 2017-05-10 14:57:24 -03:00
Belén CurcioandGitHub 07778844dc Merge branch 'master' into config-embed 2017-05-10 14:17:23 -03:00
Belen Curcio cb45e33b41 merge 2017-05-10 14:15:24 -03:00
Belen Curcio 26e5631f52 Changing path for hocs 2017-05-10 14:13:32 -03:00
Belen Curcio 3e1b7591e0 Adds displayName for WrappedReactions and alreadyReacted 2017-05-10 14:07:58 -03:00
Belen Curcio 19bf7f6cf8 Adds displayName for WrappedReactions 2017-05-10 13:58:05 -03:00
Belen Curcio ad24ff78d2 Merge branch 'master' of github.com:coralproject/talk into coral-reaction 2017-05-10 13:46:11 -03:00
Belén CurcioandGitHub ca51821d7b Merge branch 'master' into config-embed 2017-05-10 12:01:29 -03:00
Belen Curcio 250a578dd7 lint, and merge conficts 2017-05-10 11:05:21 -03:00
Belén CurcioandGitHub af89ef45f2 Merge branch 'master' into coral-reaction 2017-05-09 15:54:36 -03:00
Belen Curcio 8c219c1c4d Adding config with initial 2017-05-09 15:53:57 -03:00
Belen Curcio 3c06ee9360 Adds slots to admin stream 2017-05-09 12:21:21 -03:00
Belén CurcioandGitHub 5b22bfbac2 Merge branch 'master' into coral-reaction 2017-05-09 11:40:30 -03:00
Belén CurcioandGitHub c020008fad Merge branch 'master' into config-embed 2017-05-09 10:54:52 -03:00
KiwiandGitHub 4eb20108b1 Merge branch 'master' into approve-reject-noop 2017-05-09 20:06:11 +07:00
Belén CurcioandGitHub 58ce5d5055 Merge branch 'master' into coral-reaction 2017-05-09 08:52:04 -03:00
KiwiandGitHub 6fb227eb72 Merge branch 'master' into approve-reject-noop 2017-05-09 17:49:30 +07: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 b2c8e3b254 Merge branch 'master' into context-from-comment 2017-05-08 17:34:55 -04:00
Kim GardnerandGitHub 6dd01b4334 Merge branch 'master' into mod-is-main-tab 2017-05-08 17:26:55 -04: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
Riley Davis c00e6c1ece default view is moderate > all 2017-05-08 13:40:24 -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
Belen Curcio a5f6e1f343 Adding coral-reaction 2017-05-08 11:32:46 -03:00
Kim GardnerandGitHub 70bb6f6632 Merge branch 'master' into approve-reject-noop 2017-05-05 16:53:14 -04:00
Riley Davis 4ff42385e3 remove dead code 2017-05-05 14:41:19 -06:00
Riley Davis f8e8eef989 float: right; in css is just fine. 2017-05-05 14:05:52 -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
Riley Davis f3f0b9c858 change mouse cursor for disabled buttons 2017-05-04 15:55:46 -06:00
Riley Davis 4507059a04 same thing for BanUserDialog and the keyboard shortcuts 2017-05-04 15:43:23 -06:00
Riley Davis 67b17160cb don't accept/reject when a comment is already accepted/rejected respectively 2017-05-04 14:42:43 -06:00
Belén CurcioandGitHub 04812797a0 Merge branch 'master' into config-embed 2017-05-04 13:40:39 -03:00
Kim GardnerandGitHub 7d0d4aa397 Merge branch 'master' into admin-queue-polish 2017-05-03 17:57:34 -04:00
riley d02c82d0cd Merge branch 'master' into admin-queue-polish 2017-05-03 14:25:46 -06:00