wassname/talk
1
0
Fork 0
mirror of https://github.com/wassname/talk.git synced 2026-07-29 11:28:24 +08:00
Code Issues Packages Projects Releases Wiki Activity
9,348 Commits 10 Branches 125 Tags
ff7ee2aefc61522cbef173e4e5d3a31fcf7ff3fa
Commit Graph
4301 Commits
Author SHA1 Message Date
Gabriela Rodríguez BerónandGitHub b9960c3cc7 Merge branch 'master' into story-138187767-mod-flag-names 2017-03-21 10:42:48 -07:00
gaba a09d41053f It uses Button instead of FabButton from coral-ui. 2017-03-21 10:36:21 -07:00
Riley Davis c8dc3c5ad2 disable replies too 2017-03-21 10:27:11 -06:00
Riley DavisandGitHub ffc5379e11 Merge branch 'master' into stream-sorting 2017-03-21 09:12:04 -06:00
Riley DavisandGitHub f5d1e0df8f Merge branch 'master' into no-reply-closed-streams 2017-03-21 09:11:54 -06:00
Riley DavisandGitHub 894ea634c9 Merge branch 'master' into view-more-no-worky 2017-03-21 09:09:57 -06: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
Wyatt Johnson 20348d5f05 Fixed bug in loading more comments 2017-03-20 15:58:33 -06:00
Riley Davis 0383d86021 load more replies if there are currently no replies 2017-03-20 15:09:45 -06:00
riley fb503798e8 use the reply id so we don't get weird behavior. fix a console warning 2017-03-20 14:46:59 -06: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 d7e554a055 hide reply button if stream is closed 2017-03-20 13:01:38 -06: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 b35170484e Merge branch 'master' into recaptcha-fix 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 9d64639f8e differentiate between top- and comment-level LoadMore 2017-03-20 10:45:31 -07:00
Riley Davisandgaba 316aa12481 add spanish translations 2017-03-20 10:45:31 -07:00
Riley Davisandgaba 73c59cb137 show different copy per # of replies 2017-03-20 10:45:30 -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
Kim Gardnerandgaba 01db845814 Merge branch 'master' into firefox-mod-buttons 2017-03-20 07:39:29 -07:00
Riley Davisandgaba 337b6accec remove fakeurl 2017-03-20 07:39:28 -07:00
rileyandgaba 39e69f3bdc button text was wrapping in firefox 2017-03-20 07:39:27 -07:00
rileyandgaba 21acb0d1d7 indentation and flag -> report 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