Commit Graph
380 Commits
Author SHA1 Message Date
Gabriela Rodríguez BerónandGitHub 491694b9c1 Merge branch 'master' into story-138187767-mod-flag-names 2017-03-09 17:20:00 +01:00
Belén CurcioandGitHub 9bfc7d2037 Merge branch 'master' into long-titles 2017-03-09 11:05:08 -05:00
Belen Curcio ce7a2d54d0 Font Size 2017-03-09 10:59:28 -05:00
David JayandGitHub 3c28f68d0a Merge branch 'master' into mod-squad 2017-03-08 15:32:48 -05:00
Gabriela Rodríguez BerónandGitHub 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 DavisandGitHub 68d64665a9 Merge branch 'master' into keyboard-shortcuts 2017-03-08 09:34:38 -07: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
Riley DavisandGitHub 162091a6d0 Merge branch 'master' into story-138187767-mod-flag-names 2017-03-07 11:44:10 -07:00
Riley DavisandGitHub e15e4b004f Merge branch 'master' into keyboard-shortcuts 2017-03-07 11:26:58 -07:00
Riley Davis 37dad96fee Merge branch 'master'
Conflicts:
	client/coral-admin/src/containers/Configure/StreamSettings.js
2017-03-07 11:23:22 -07:00
Gabriela Rodríguez BerónandGitHub 0b280d0de2 Merge branch 'master' into story-138187767-mod-flag-names 2017-03-07 19:12:45 +01:00
gaba 564b8d8eaa Merge branch 'master' into story-138187767-mod-flag-names 2017-03-07 13:04:28 +01:00
Riley Davis 09556c9bef indention 2017-03-06 14:06:32 -07:00
Belen Curcio e80d6e7b0a Configure UX Style Polish! 2017-03-06 12:12:26 -05:00
David JayandGitHub 3280ed9ae5 Merge branch 'master' into premod-links 2017-03-03 16:17:40 -05:00
David Jay b912b60428 Removing unecessary log statement. 2017-03-03 16:01:53 -05:00
Belen Curcio 1f0d102115 new components!! textarea stuff and configure bugs 2017-03-03 15:53:53 -05:00
David Jay 2e5d453ea7 Updating link search and adding settings in admin panel. 2017-03-03 15:44:03 -05:00
Belen Curcio a1a45a7969 Styles and disable and enable things 2017-03-03 15:10:15 -05:00
Belen Curcio 5da1af8387 Styles ready! 2017-03-03 13:00:22 -05:00
David Jay 45208b096f Correcting bug in prev keyboard shortcut. 2017-03-03 12:52:20 -05:00
David Jay 3ecb93365a Correcting bug in keyboard shortcut next and previous. 2017-03-03 12:50:39 -05:00
Belen Curcio d218979ee6 Show Story, show and hide Moderate 2017-03-03 11:46:09 -05:00
gaba 0fe456f574 Fix suspend button. 2017-03-02 16:43:52 -08:00
gaba 2fa832a3f4 adds suspendUser func and mutation. 2017-03-02 15:54:50 -08:00
David Jay 57a7000e59 Animating transition in mod queue. 2017-03-02 16:08:24 -05:00
David Jay d554bf5211 Adding single view and restyling selected comment. 2017-03-02 16:03:18 -05:00
David Jay 1146f22613 Accepting and rejecting comments w/ keystrokes. 2017-03-02 15:41:51 -05:00
David Jay 78be17ec6d Adding keyboard selection of comments. 2017-03-02 15:19:33 -05:00
David Jay 7be3b05f22 Re-enabling keyboard shortcut menu. 2017-03-02 14:51:51 -05:00
gaba 1899dcbb7e Suspend User dialog. 2017-03-02 09:27:53 -08:00
gaba 3626d2678e Accept button working. Add suspend user dialog. 2017-03-01 23:43:25 -08:00
riley c4edbd4db4 removing dead code 2017-03-01 15:28:44 -07:00
Riley Davis 0c89dd6d98 sam's feedback 2017-03-01 15:23:17 -07:00
gaba acc9b2d9bf Approve and Reject buttons. Still misssing suspending 2017-03-01 14:21:49 -08:00
Riley DavisandGitHub 97496f8b3d Merge branch 'master' into move-config-around 2017-03-01 14:44:27 -07:00
Riley Davis 62793f5947 keepin' it DRY 2017-03-01 14:40:10 -07:00
gaba f5ef33d24e Ban Button with graphql mutation. 2017-03-01 12:57:12 -08:00
Kim GardnerandGitHub e56a04abf1 Merge branch 'master' into admin-login-upgrade 2017-03-01 13:42:56 -05:00
Riley Davis 00b2bf37ee fix height of the table 2017-03-01 11:14:13 -07:00
Riley Davis 58870e1630 Merged branch master into admin-login-upgrade 2017-03-01 10:40:51 -07:00
Riley Davis 1f70a2d3eb Merged branch master into make-links-less-linky 2017-03-01 10:37:50 -07:00
Riley Davis 674585adeb design updates 2017-03-01 10:37:39 -07:00
Wyatt Johnson 79296999c0 Merge branch 'master' into production-mode 2017-03-01 09:52:46 -07:00
Belen Curcio 6cd0c12ba4 tweaks 2017-03-01 12:35:59 -03:00