wassname/talk
1
0
Fork 0
mirror of https://github.com/wassname/talk.git synced 2026-07-16 11:22:16 +08:00
Code Issues Packages Projects Releases Wiki Activity
5,039 Commits 10 Branches 125 Tags
b8d00ec9ceee3b5fd41e809c6400a6cf435d0ee1
Commit Graph
2716 Commits
Author SHA1 Message Date
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
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
David Erwinandgaba fe6e6fbd2f Merge branch 'master' into widen-notifications 2017-03-20 07:32:56 -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
Riley Davisandgaba e5c108f8fb make notifications wider 2017-03-20 07:29:09 -07:00
David Erwinandgaba 2f86b9eecf Merge branch 'master' into bugfix-ban-dialog-language 2017-03-20 07:29:09 -07:00
Riley Davisandgaba 587ee82787 Merge branch 'master' into widget-auto-update 2017-03-20 07:29:07 -07:00
David Jayandgaba 88538d7b64 Merge branch 'master' into remove-notification-warning 2017-03-20 07:29:05 -07:00
David Jayandgaba 2d968126ab Merge branch 'master' into remove-notification-warning 2017-03-20 07:29:05 -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
David Erwinandgaba 5f5d33931e Merge branch 'master' into open-closed-stream-buttons 2017-03-20 07:27:19 -07:00
Riley Davisandgaba b94401a8cf make only the title clickable 2017-03-20 07:27:19 -07:00
David Jayandgaba 1fd74068cd Merge branch 'master' into open-closed-stream-buttons 2017-03-20 07:27:18 -07:00
Riley Davisandgaba 90298436c6 Merge branch 'master' into widget-auto-update 2017-03-20 07:27:17 -07:00
David Jayandgaba 203776d07c Merge branch 'mod-queue-load-more' of github.com:coralproject/talk into mod-queue-load-more 2017-03-20 07:27:16 -07:00
David Jayandgaba a78648fc0d Merge branch 'master' into mod-queue-load-more 2017-03-20 07:27:15 -07:00
Belén Curcioandgaba 6d43969e3b Merge branch 'master' into autoreject-on-ban 2017-03-20 07:27:14 -07:00
Riley Davisandgaba aec0f678c0 Merge branch 'master' into autoreject-on-ban 2017-03-20 07:27:13 -07:00
gaba ff71908a10 Merge branch 'master' into mod-queue-load-more 2017-03-20 07:26:00 -07:00
David Erwinandgaba a430ca65c2 Merge branch 'master' into widget-auto-update 2017-03-20 07:24:17 -07:00
David Erwinandgaba ede6c44c93 Merge branch 'master' into flag-username-reset 2017-03-20 07:24:15 -07:00
David Erwinandgaba 8b0f01f2aa Merge pull request #394 from coralproject/bugfix-mod-queue-refresh 
Preventing admin panel refresh on accept and reject
 2017-03-20 07:24:14 -07:00
Riley Davisandgaba 065ccfbfc4 Merge branch 'master' into flag-username-reset 2017-03-20 07:24:13 -07:00
Riley Davis 43119e5e15 sort the stories by date 2017-03-17 14:30:11 -06:00
Riley Davis c48ce8323d combine destructuring 2017-03-17 10:18:07 -06:00
Wyatt Johnson df4e07d39c Renamed pageData -> config 2017-03-17 08:37:58 -06:00
Wyatt JohnsonandGitHub edeedfaa71 Merge branch 'master' into recaptcha-fix 2017-03-17 08:01:47 -06:00
Riley Davis a7cdce3579 differentiate between top- and comment-level LoadMore 2017-03-16 15:35:38 -06:00
Riley Davis 528e2ff851 add spanish translations 2017-03-16 14:54:09 -06:00
Riley Davis c61b249a37 show different copy per # of replies 2017-03-16 14:37:29 -06:00
Wyatt JohnsonandGitHub b277f3be75 Merge branch 'master' into recaptcha-fix 2017-03-16 11:59:56 -06:00