Commit Graph

1404 Commits

Author SHA1 Message Date
David Jay 2d968126ab Merge branch 'master' into remove-notification-warning 2017-03-20 07:29:05 -07:00
David Jay 203776d07c Merge branch 'mod-queue-load-more' of github.com:coralproject/talk into mod-queue-load-more 2017-03-20 07:27:16 -07:00
David Jay a78648fc0d Merge branch 'master' into mod-queue-load-more 2017-03-20 07:27:15 -07:00
Belén Curcio 6d43969e3b Merge branch 'master' into autoreject-on-ban 2017-03-20 07:27:14 -07:00
Riley Davis aec0f678c0 Merge branch 'master' into autoreject-on-ban 2017-03-20 07:27:13 -07:00
gaba ff71908a10 Merge branch 'master' into mod-queue-load-more 2017-03-20 07:26:00 -07:00
David Erwin ede6c44c93 Merge branch 'master' into flag-username-reset 2017-03-20 07:24:15 -07:00
David Erwin 8b0f01f2aa Merge pull request #394 from coralproject/bugfix-mod-queue-refresh
Preventing admin panel refresh on accept and reject
2017-03-20 07:24:14 -07:00
Riley Davis 065ccfbfc4 Merge branch 'master' into flag-username-reset 2017-03-20 07:24:13 -07:00
David Jay a0953c0689 Adding proptypes to loadmore component. 2017-03-09 13:33:00 -05:00
Gabriela Rodríguez Berón 491694b9c1 Merge branch 'master' into story-138187767-mod-flag-names 2017-03-09 17:20:00 +01:00
Belén Curcio 9bfc7d2037 Merge branch 'master' into long-titles 2017-03-09 11:05:08 -05:00
Belen Curcio 438877d58f Merge branch 'long-titles' of github.com:coralproject/talk into long-titles 2017-03-09 11:03:37 -05:00
Belen Curcio ce7a2d54d0 Font Size 2017-03-09 10:59:28 -05:00
David Jay 9b53930861 Merge branch 'master' into flag-username-reset 2017-03-08 17:49:59 -05:00
David Jay a8d090d5a2 Merge branch 'master' into autoreject-on-ban 2017-03-08 17:07:26 -05:00
Riley Davis ee84b821fc Merge branch 'master' into mod-squad 2017-03-08 14:57:19 -07:00
David Jay fac3d26c22 Closing ban dialog after ban is complete. 2017-03-08 16:39:53 -05:00
Riley Davis 5a50ae0d10 incorrectly using dispatch now that we do pym directly 2017-03-08 14:16:20 -07:00
David Jay d203a9afe0 Auto-rejecting comments on ban. 2017-03-08 16:06:34 -05:00
David Jay 3262d136b7 Resetting report menu on close. 2017-03-08 15:44:19 -05:00
David Jay 3c28f68d0a Merge branch 'master' into mod-squad 2017-03-08 15:32:48 -05:00
David Jay be3212e144 Merge branch 'master' into banned-optimize-bug 2017-03-08 15:05:12 -05:00
David Jay 510ee2c28e Merge branch 'master' into bugfix-mod-queue-refresh 2017-03-08 15:04:45 -05:00
David Jay 3861d14a07 Merge branch 'master' into mod-queue-load-more 2017-03-08 15:04:24 -05:00
Gabriela Rodríguez Berón dae2e7d9d6 Merge branch 'master' into story-138187767-mod-flag-names 2017-03-08 20:09:50 +01:00
gaba 69916a6ef2 I could not figure out how to send the parameter to the graphql query through the client. 2017-03-08 19:39:28 +01:00
David Jay 15193e97a8 Preventing keys from scrolling past the end of the comment queue. 2017-03-08 13:01:37 -05:00
Riley Davis 0863ca26ff update dashboard links 2017-03-08 09:56:36 -07:00
Riley Davis 097fc30ac9 Merge branch 'master' into bugfix-mod-queue-refresh 2017-03-08 09:35:05 -07:00
Riley Davis bc1fc15572 Merge branch 'master' into banned-optimize-bug 2017-03-08 09:34:55 -07:00
Riley Davis 8c67acf609 Merge branch 'master' into mod-queue-load-more 2017-03-08 09:34:49 -07:00
Riley Davis 68d64665a9 Merge branch 'master' into keyboard-shortcuts 2017-03-08 09:34:38 -07:00
Samantha Hankins 9d2d878790 Merge branch 'master' into long-titles 2017-03-07 17:17:44 -05:00
Belen Curcio cceeafadec Indent 2017-03-07 16:53:42 -05:00
Belen Curcio af4a69a677 Changing icon and link 2017-03-07 16:50:36 -05:00
Belen Curcio f563bcf119 Adding fix for long text 2017-03-07 16:35:01 -05:00
Belen Curcio d1119604e0 ícon styling for infobox 2017-03-07 15:59:05 -05:00
Belen Curcio eb06f3892d changes 2017-03-07 15:27:43 -05:00
Belen Curcio ee30f549a1 Lato all the things 2017-03-07 15:04:35 -05:00
Belen Curcio dc96b550a6 Button should inherit font 2017-03-07 14:56:28 -05:00
Riley Davis d66dcd8548 Merge branch 'master' into mod-queue-load-more 2017-03-07 12:33:04 -07:00
riley c1d6a4dc7e Merged master into banned-optimize-bug 2017-03-07 12:31:42 -07:00
Riley Davis c4f2d876ee Merge branch 'master' into notification-warning 2017-03-07 12:22:42 -07:00
David Jay 95aa89faed Switching premod status update to updateQueries function. 2017-03-07 14:16:44 -05:00
Riley Davis 87ef7ffb67 Merge branch 'master' into reply-box-focus 2017-03-07 11:54:55 -07:00
Riley Davis 162091a6d0 Merge branch 'master' into story-138187767-mod-flag-names 2017-03-07 11:44:10 -07:00
David Jay d0d0766ca6 Merge branch 'master' into notification-warning 2017-03-07 13:33:24 -05:00
David Jay 1e34ffd075 Merge branch 'master' into banned-optimize-bug 2017-03-07 13:31:12 -05:00
Riley Davis 21003ca994 Merge branch 'master' into mod-queue-load-more 2017-03-07 11:29:59 -07:00