Commit Graph
2569 Commits
Author SHA1 Message Date
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
Riley DavisandGitHub 8989f3bfc2 Merge pull request #389 from coralproject/keyboard-shortcuts
Keyboard shortcuts
2017-03-08 11:10:24 -07:00
David Jay 15193e97a8 Preventing keys from scrolling past the end of the comment queue. 2017-03-08 13:01:37 -05:00
Riley DavisandGitHub 68d64665a9 Merge branch 'master' into keyboard-shortcuts 2017-03-08 09:34:38 -07:00
Samantha HankinsandGitHub 02767cf060 Merge pull request #395 from coralproject/user-facing
User facing Styles Updates
2017-03-07 17:13:19 -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 DavisandGitHub 9d13eedede Merge pull request #387 from coralproject/notification-warning
move notifications to parent
2017-03-07 12:30:02 -07:00
Riley DavisandGitHub c4f2d876ee Merge branch 'master' into notification-warning 2017-03-07 12:22:42 -07:00
David JayandGitHub 7e55ecab59 Merge pull request #388 from coralproject/reply-box-focus
Focusing on reply box when reply is clicked.
2017-03-07 14:19:37 -05:00
Riley DavisandGitHub 87ef7ffb67 Merge branch 'master' into reply-box-focus 2017-03-07 11:54:55 -07:00
Riley DavisandGitHub 162091a6d0 Merge branch 'master' into story-138187767-mod-flag-names 2017-03-07 11:44:10 -07:00
David JayandGitHub d0d0766ca6 Merge branch 'master' into notification-warning 2017-03-07 13:33:24 -05:00
David JayandGitHub 2b947bebf8 Merge pull request #383 from coralproject/premod-links
Premod links
2017-03-07 13:30:20 -05: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
David Jay 78a2a64671 Not displaying premod or rejected comments. 2017-03-07 13:13:21 -05:00
Gabriela Rodríguez BerónandGitHub 0b280d0de2 Merge branch 'master' into story-138187767-mod-flag-names 2017-03-07 19:12:45 +01:00
David JayandGitHub 3d4521ab1d Merge pull request #384 from coralproject/global-info-bug
Guidelines info box has a word wrapping issue
2017-03-07 13:11:39 -05:00
David JayandGitHub ae5d35273b Merge branch 'master' into global-info-bug 2017-03-07 12:58:25 -05:00
David JayandGitHub 9bf1246d3a Merge pull request #386 from coralproject/configure-bugs
Configure Styles and UX Polish
2017-03-07 12:58:02 -05:00
Riley DavisandGitHub 978bf05128 Merge branch 'master' into premod-links 2017-03-07 10:57:05 -07:00
David JayandGitHub 7379924e21 Merge branch 'master' into global-info-bug 2017-03-07 12:56:19 -05:00
David JayandGitHub bf1d46d60d Merge branch 'master' into configure-bugs 2017-03-07 12:52:57 -05:00
David JayandGitHub 2c8678f9e1 Merge pull request #391 from coralproject/favicon
Favicon Support
2017-03-07 12:52:28 -05:00
gaba f8bc1037d2 Adds the reason. 2017-03-07 18:36:27 +01:00
gaba 62423e620e Remove edge on user. 2017-03-07 18:04:50 +01:00
gaba 54354c3cc6 Translation. 2017-03-07 16:27:12 +01:00
gaba 564b8d8eaa Merge branch 'master' into story-138187767-mod-flag-names 2017-03-07 13:04:28 +01:00
gaba d06a5d37f0 Moves to the loader and work on the user query to add pagination and action type. 2017-03-07 07:29:32 +01:00
Riley Davis 09556c9bef indention 2017-03-06 14:06:32 -07:00
Belen Curcio d0e67592c0 Adding favicon :) 2017-03-06 16:05:56 -05:00
Riley DavisandGitHub 832f3c8abc Merge branch 'master' into configure-bugs 2017-03-06 13:52:54 -07:00
Riley DavisandGitHub aca2af44e2 Merge branch 'master' into notification-warning 2017-03-06 13:51:25 -07:00
Riley DavisandGitHub b7fe4c6802 Merge pull request #390 from coralproject/password-reset-view-fix
Fix password reset view render path
2017-03-06 13:21:37 -07:00
Wyatt JohnsonandGitHub 1c81d0a04f Update index.js 2017-03-06 13:00:22 -07:00
David Jay 450f1fdbac Focusing on reply box when reply is clicked. 2017-03-06 13:25:01 -05:00
Riley Davis 5cb7172bbe Merge branch 'master'
Conflicts:
	client/coral-embed-stream/src/Embed.js
2017-03-06 11:01:37 -07:00
Riley Davis 000833509f remove notification reducer. have parent show notifications 2017-03-06 10:59:12 -07:00
Belen Curcio e80d6e7b0a Configure UX Style Polish! 2017-03-06 12:12:26 -05:00
David JayandGitHub 77386fb21d Merge pull request #385 from coralproject/version-endpoint-fix
Moved to correct route
2017-03-06 12:04:19 -05:00
Wyatt Johnson 56350ffe1a Moved to correct route 2017-03-06 09:58:21 -07:00
Belen Curcio 6cd75b57dc border box 2017-03-03 16:18:58 -05:00
David JayandGitHub 3280ed9ae5 Merge branch 'master' into premod-links 2017-03-03 16:17:40 -05:00
Belen Curcio ec4fc566c1 props 2017-03-03 16:15:30 -05:00
David Jay be8332da66 Switching link action from flag to premod. 2017-03-03 16:12:53 -05:00
David Jay b9488dc36c Updating moderation. 2017-03-03 16:09:34 -05:00