wassname/talk
1
0
Fork 0
mirror of https://github.com/wassname/talk.git synced 2026-07-21 12:51:03 +08:00
Code Issues Packages Projects Releases Wiki Activity
2,907 Commits 10 Branches 125 Tags
228fdeac4da20e2bdfcf3e4c8a8c050faf95e2ee
Commit Graph
728 Commits
Author SHA1 Message Date
David ErwinandGitHub 903aa23f19 Revert "Story 138187767 - Moderate Flag User Names" 2017-03-23 11:18:55 -04:00
Riley DavisandGitHub d8e92968a5 Merge branch 'master' into admin-ux 2017-03-22 13:22:21 -06:00
Belen Curcio 71415877b3 comment tweaks 2017-03-22 14:04:08 -03:00
Belen Curcio cd27ffe86a wip 2017-03-22 13:37:44 -03:00
Belen Curcio 6a5f667336 hover, menu order 2017-03-22 13:20:26 -03:00
Riley DavisandGitHub b51cbebe1d Merge branch 'master' into story-138187767-mod-flag-names 2017-03-22 09:57:29 -06:00
gaba 7522bd9cd6 Sends a mail to the suspended user. 2017-03-21 15:08:46 -07:00
gaba a09d41053f It uses Button instead of FabButton from coral-ui. 2017-03-21 10:36:21 -07:00
Riley Davis 9bfc4b5815 how did this get duplicated? 2017-03-20 16:26:52 -06:00
Riley Davis 546dd63d8c why did only this get changed? 2017-03-20 16:21:01 -06:00
gaba e5bac88bb5 Merge branch 'master' into story-138187767-mod-flag-names 2017-03-20 15:02:38 -07:00
gaba be2ecf0838 Adds user and message to flagaction to display in FE. 2017-03-20 13:38:11 -07:00
gaba 9e76ca5d27 Fix CSS. 2017-03-20 12:37:21 -07:00
Riley Davisandgaba 09ec2dba94 combine destructuring 2017-03-20 10:47:00 -07:00
Wyatt Johnsonandgaba 46ecf0c06f Renamed pageData -> config 2017-03-20 10:46:59 -07:00
Wyatt Johnsonandgaba 8eac8d6890 Merge branch 'master' into recaptcha-fix 2017-03-20 10:46:58 -07:00
Wyatt Johnsonandgaba 5768d30a7a Added new pageData action/reducer 2017-03-20 10:46:57 -07:00
Riley Davisandgaba 517ede1977 dashboard reload fix 2017-03-20 10:45:29 -07:00
gaba 2a66a78d41 Merge branch 'master' into recaptcha-support 2017-03-20 10:37:18 -07:00
Riley Davisandgaba d2e2eef046 do a null check. 2017-03-20 10:27:31 -07:00
gaba a2833538a7 move CountdownTimer to its own component 2017-03-20 10:26:12 -07:00
Kim Gardnerandgaba 1a83ffe482 Merge branch 'master' into config-shuffle 2017-03-20 10:21:59 -07:00
Riley Davisandgaba 92055c7814 correctly handle error when not logged in 2017-03-20 10:21:58 -07:00
rileyandgaba e975d6d809 move pre-mod links 2017-03-20 10:21:57 -07:00
Riley Davisandgaba 63c3d02329 change Stream > Story sometimes 2017-03-20 10:21:56 -07:00
Riley Davisandgaba dedcb87435 Merge branch 'master' into recaptcha-support 2017-03-20 10:21:55 -07:00
gaba 7232d09eb3 Merge branch 'master' into remove-like-widget 2017-03-20 07:47:37 -07:00
Riley Davisandgaba 5c767b6aa6 Merge branch 'master' into recaptcha-support 2017-03-20 07:42:31 -07:00
rileyandgaba 1ff5ab2e3e remove like widget for now 2017-03-20 07:42:31 -07:00
David Erwinandgaba c55b4d22d7 Language update 2017-03-20 07:42:29 -07:00
gaba a71b8a4ae4 Merge branch 'master' into asset-comment-metrics 2017-03-20 07:41:12 -07:00
Kim Gardnerandgaba 6af8ef7838 Merge branch 'master' into hide-dashboard-cta 2017-03-20 07:39:31 -07:00
rileyandgaba 39e69f3bdc button text was wrapping in firefox 2017-03-20 07:39:27 -07:00
Riley Davisandgaba 2124ca0f34 save dismissed timer note to localStorage 2017-03-20 07:39:26 -07:00
gaba 6f3cb34817 Merge branch 'master' into asset-comment-metrics 2017-03-20 07:39:00 -07:00
David Erwinandgaba 1d061ce359 Merge branch 'master' into asset-comment-metrics 2017-03-20 07:36:23 -07:00
Riley Davisandgaba f005907894 add some translations 2017-03-20 07:36:23 -07:00
Riley Davisandgaba 2c4bf52f6b add Activity widget 2017-03-20 07:36:22 -07:00
Riley Davisandgaba c8a0ded4ad try to just add recaptcha manually 
use react-recaptcha

remove recaptcha file
 2017-03-20 07:36:21 -07:00
rileyandgaba ca07406b1a Merge branch 'master' into recaptcha-support 2017-03-20 07:36:20 -07:00
Riley Davisandgaba f8b3c5752e Merge branch 'master' into keyboard-shortcut-scroll 2017-03-20 07:36:19 -07:00
Riley Davisandgaba 46e8d30e22 scrollIntoView will work in more browsers 2017-03-20 07:36:18 -07:00
David Jayandgaba ae4bae6cd2 Scrolling to keep selected comments in view. 2017-03-20 07:36:17 -07:00
Riley Davisandgaba eab5832457 Merge branch 'master' into bugfix-ban-dialog-language 2017-03-20 07:32:55 -07:00
David Jayandgaba a243310ecd Merge branch 'master' into bugfix-ban-dialog-language 2017-03-20 07:32:54 -07:00
gaba be351e46fd Merge branch 'master' into bugfix-ban-dialog-language 2017-03-20 07:32:06 -07:00
David Erwinandgaba 2f86b9eecf Merge branch 'master' into bugfix-ban-dialog-language 2017-03-20 07:29:09 -07:00
Riley Davisandgaba db38bcb477 modify to light grey 2017-03-20 07:29:04 -07:00
gaba b2234bc3c9 Merge branch 'master' 
Conflicts:
	client/coral-admin/src/containers/Dashboard/Widget.css
 2017-03-20 07:28:17 -07:00
Riley Davisandgaba e0d3ad32e2 Merge branch 'master' into open-closed-stream-buttons 2017-03-20 07:27:20 -07:00