 David Erwin
|
2f86b9eecf
|
Merge branch 'master' into bugfix-ban-dialog-language
|
2017-03-20 07:29:09 -07:00 |
|
|
Riley Davis
|
587ee82787
|
Merge branch 'master' into widget-auto-update
|
2017-03-20 07:29:07 -07:00 |
|
|
David Jay
|
88538d7b64
|
Merge branch 'master' into remove-notification-warning
|
2017-03-20 07:29:05 -07:00 |
|
|
David Jay
|
2d968126ab
|
Merge branch 'master' into remove-notification-warning
|
2017-03-20 07:29:05 -07:00 |
|
|
Riley Davis
|
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 Davis
|
e0d3ad32e2
|
Merge branch 'master' into open-closed-stream-buttons
|
2017-03-20 07:27:20 -07:00 |
|
|
David Erwin
|
5f5d33931e
|
Merge branch 'master' into open-closed-stream-buttons
|
2017-03-20 07:27:19 -07:00 |
|
|
Riley Davis
|
b94401a8cf
|
make only the title clickable
|
2017-03-20 07:27:19 -07:00 |
|
|
David Jay
|
1fd74068cd
|
Merge branch 'master' into open-closed-stream-buttons
|
2017-03-20 07:27:18 -07:00 |
|
|
Riley Davis
|
90298436c6
|
Merge branch 'master' into widget-auto-update
|
2017-03-20 07:27:17 -07:00 |
|
|
David Jay
|
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 Jay
|
a78648fc0d
|
Merge branch 'master' into mod-queue-load-more
|
2017-03-20 07:27:15 -07:00 |
|
|
Belén Curcio
|
6d43969e3b
|
Merge branch 'master' into autoreject-on-ban
|
2017-03-20 07:27:14 -07:00 |
|
|
Riley Davis
|
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 Erwin
|
a430ca65c2
|
Merge branch 'master' into widget-auto-update
|
2017-03-20 07:24:17 -07:00 |
|
|
David Erwin
|
ede6c44c93
|
Merge branch 'master' into flag-username-reset
|
2017-03-20 07:24:15 -07:00 |
|
|
David Erwin
|
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 Davis
|
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 Johnson
|
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 Johnson
|
b277f3be75
|
Merge branch 'master' into recaptcha-fix
|
2017-03-16 11:59:56 -06:00 |
|
|
Riley Davis
|
39596399ec
|
dashboard reload fix
|
2017-03-16 11:45:10 -06:00 |
|
|
Wyatt Johnson
|
598fcc4cb0
|
Added new pageData action/reducer
|
2017-03-16 11:07:38 -06:00 |
|
|
Riley Davis
|
736ac11782
|
Merge branch 'master' into recaptcha-support
|
2017-03-16 10:12:28 -06:00 |
|
|
Riley Davis
|
1043a37eef
|
do a null check.
|
2017-03-16 09:28:17 -06:00 |
|
|
Riley Davis
|
378e855c4c
|
remove logs
|
2017-03-15 14:20:27 -06:00 |
|
|
Riley Davis
|
9ddc3aa0b7
|
move CountdownTimer to its own component
|
2017-03-15 14:13:18 -06:00 |
|
|
Kim Gardner
|
babd1b3d8d
|
Merge branch 'master' into config-shuffle
|
2017-03-15 13:30:43 -04:00 |
|
|
Riley Davis
|
9beff74862
|
correctly handle error when not logged in
|
2017-03-15 11:16:13 -06:00 |
|
|
riley
|
3071b3783e
|
move pre-mod links
|
2017-03-15 10:15:47 -06:00 |
|
|
Riley Davis
|
04298aca7d
|
change Stream > Story sometimes
|
2017-03-14 16:30:02 -06:00 |
|
|
Riley Davis
|
dbd1366c26
|
Merge branch 'master' into recaptcha-support
|
2017-03-14 15:56:20 -06:00 |
|
|
Riley Davis
|
b612bbd96c
|
Merge branch 'master' into remove-like-widget
|
2017-03-14 15:35:07 -06:00 |
|
|
Riley Davis
|
099cc36b89
|
Merge branch 'master' into recaptcha-support
|
2017-03-14 15:33:18 -06:00 |
|
|
Riley Davis
|
7bbf8abd3d
|
try to just add recaptcha manually
use react-recaptcha
remove recaptcha file
|
2017-03-14 15:32:16 -06:00 |
|
|
David Erwin
|
13dad0c895
|
Language update
|
2017-03-14 17:07:48 -04:00 |
|
|
Riley Davis
|
b4d236df36
|
Merge branch 'master' into asset-comment-metrics
|
2017-03-14 15:00:27 -06:00 |
|
|
Kim Gardner
|
c50d25c0e9
|
Merge branch 'master' into hide-dashboard-cta
|
2017-03-14 13:19:23 -04:00 |
|
|
Kim Gardner
|
d85473e20c
|
Merge branch 'master' into firefox-mod-buttons
|
2017-03-14 13:01:24 -04:00 |
|
|
Riley Davis
|
fa66bab937
|
Merge branch 'master' into asset-comment-metrics
|
2017-03-14 10:46:21 -06:00 |
|
|
Riley Davis
|
f0eaf01ccc
|
remove fakeurl
|
2017-03-13 13:33:31 -06:00 |
|
|
riley
|
147345505f
|
indentation and flag -> report
|
2017-03-13 13:23:00 -06:00 |
|
|
riley
|
b1f426e70d
|
Merge branch 'master' into recaptcha-support
|
2017-03-13 12:27:19 -06:00 |
|