wassname/talk
1
0
Fork 0
mirror of https://github.com/wassname/talk.git synced 2026-08-08 11:28:12 +08:00
Code Issues Packages Projects Releases Wiki Activity
2,633 Commits 10 Branches 125 Tags
5ceaa24217c19bb34a59ac360d589ae53ba6a1ab
Commit Graph
612 Commits
Author SHA1 Message Date
Riley DavisandGitHub e159435293 Merge branch 'master' into bugfix-ban-dialog-language 2017-03-10 14:50:49 -07:00
Riley Davis cb10de6c7a modify to light grey 2017-03-09 12:58:57 -07:00
Riley Davis 98a87f4595 Merge branch 'master' 
Conflicts:
	client/coral-admin/src/containers/Dashboard/Widget.css
 2017-03-09 12:22:20 -07:00
David JayandGitHub 1884ad6437 Merge branch 'master' into bugfix-ban-dialog-language 2017-03-09 13:51:51 -05:00
Riley DavisandGitHub e6dfb3f64a Merge branch 'master' into open-closed-stream-buttons 2017-03-09 11:44:47 -07:00
Riley DavisandGitHub fb7895b02f Merge branch 'master' into widget-auto-update 2017-03-09 11:44:16 -07:00
David JayandGitHub 542ccc6190 Merge branch 'master' into bugfix-ban-dialog-language 2017-03-09 13:40:44 -05:00
David Jay 8f988c898d Merge branch 'mod-queue-load-more' of github.com:coralproject/talk into mod-queue-load-more 2017-03-09 13:36:59 -05:00
David JayandGitHub 66adf19b97 Merge branch 'master' into mod-queue-load-more 2017-03-09 13:36:37 -05:00
David Jay a0953c0689 Adding proptypes to loadmore component. 2017-03-09 13:33:00 -05:00
Belén CurcioandGitHub c3749c5e31 Merge branch 'master' into autoreject-on-ban 2017-03-09 13:27:30 -05:00
David ErwinandGitHub ebdf4b5ec7 Merge branch 'master' into open-closed-stream-buttons 2017-03-09 13:15:45 -05:00
David ErwinandGitHub 53043051f3 Merge branch 'master' into bugfix-ban-dialog-language 2017-03-09 13:13:10 -05:00
David ErwinandGitHub a195879556 Merge branch 'master' into widget-auto-update 2017-03-09 13:11:17 -05:00
David JayandGitHub 39386a9fcf Merge branch 'master' into mod-queue-load-more 2017-03-09 13:07:41 -05:00
Riley Davis 0db92974c4 make only the title clickable 2017-03-09 11:05:18 -07:00
David JayandGitHub fd9f838948 Merge branch 'master' into open-closed-stream-buttons 2017-03-09 12:39:54 -05:00
Riley DavisandGitHub db5df1699c Merge branch 'master' into autoreject-on-ban 2017-03-09 10:30:10 -07:00
Riley DavisandGitHub 895d3c31fc Merge branch 'master' into bugfix-mod-queue-refresh 2017-03-09 10:24:25 -07:00
Riley DavisandGitHub 070ed13495 Merge branch 'master' into mod-queue-load-more 2017-03-09 10:15:08 -07: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
riley 2cdf2bb332 add moderate button 2017-03-08 15:26:45 -07:00
David JayandGitHub 7bf5285a1d Merge branch 'master' into bugfix-ban-dialog-language 2017-03-08 17:10:14 -05:00
David JayandGitHub a8d090d5a2 Merge branch 'master' into autoreject-on-ban 2017-03-08 17:07:26 -05:00
David Jay 377563c798 Hiding rejected note on ban dialog for rejected comments. 2017-03-08 17:02:47 -05:00
Riley Davis b34758e8cc unused vars 2017-03-08 14:59:55 -07:00
Riley Davis eaf035acd6 simplify dashboard table rendering 2017-03-08 14:53:07 -07:00
David Jay fac3d26c22 Closing ban dialog after ban is complete. 2017-03-08 16:39:53 -05:00
David Jay d203a9afe0 Auto-rejecting comments on ban. 2017-03-08 16:06:34 -05:00
Riley Davis e4cdc73bf8 fix for react-mdn-selectfield in FF 2017-03-08 13:53:39 -07:00
David JayandGitHub 3c28f68d0a Merge branch 'master' into mod-squad 2017-03-08 15:32:48 -05:00
David JayandGitHub a13e0205de Merge branch 'master' into open-closed-stream-buttons 2017-03-08 15:22:08 -05:00
David JayandGitHub 510ee2c28e Merge branch 'master' into bugfix-mod-queue-refresh 2017-03-08 15:04:45 -05:00
David JayandGitHub 3861d14a07 Merge branch 'master' into mod-queue-load-more 2017-03-08 15:04:24 -05:00
Riley DavisandGitHub 4d69ecc425 Merge branch 'master' into widget-auto-update 2017-03-08 11:12:53 -07:00
Riley Davis ec634fa3c0 add translations 2017-03-08 11:12:44 -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 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
Riley Davis 47f6f4cb6c styles and auto-update Dashboard 2017-03-07 16:51:22 -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 Davis e578f901b2 fix some firefox display things 2017-03-07 13:38:01 -07:00
Riley DavisandGitHub d66dcd8548 Merge branch 'master' into mod-queue-load-more 2017-03-07 12:33:04 -07:00
David Jay 95aa89faed Switching premod status update to updateQueries function. 2017-03-07 14:16:44 -05:00
Riley DavisandGitHub 21003ca994 Merge branch 'master' into mod-queue-load-more 2017-03-07 11:29:59 -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