 Riley Davis
|
eab5832457
|
Merge branch 'master' into bugfix-ban-dialog-language
|
2017-03-20 07:32:55 -07:00 |
|
|
David Jay
|
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 Davis
|
e5c108f8fb
|
make notifications wider
|
2017-03-20 07:29:09 -07:00 |
|
|
David Erwin
|
2f86b9eecf
|
Merge branch 'master' into bugfix-ban-dialog-language
|
2017-03-20 07:29:09 -07:00 |
|
|
Wyatt Johnson
|
fcc93963c4
|
Added support for total comment count
|
2017-03-20 07:29:08 -07:00 |
|
|
Riley Davis
|
117b73adf7
|
Merge pull request #398 from coralproject/widget-auto-update
Auto-update Dashboard
|
2017-03-20 07:29:07 -07:00 |
|
|
Riley Davis
|
587ee82787
|
Merge branch 'master' into widget-auto-update
|
2017-03-20 07:29:07 -07:00 |
|
|
Riley Davis
|
66efbf89d4
|
Merge pull request #401 from coralproject/remove-notification-warning
incorrectly using dispatch now that we do pym directly
|
2017-03-20 07:29:06 -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
|
d71ca8d3f9
|
Merge pull request #396 from coralproject/open-closed-stream-buttons
fix some firefox display things
|
2017-03-20 07:27:20 -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
|
1dd0b79a3e
|
Merge pull request #392 from coralproject/mod-queue-load-more
Load More button in mod queue
|
2017-03-20 07:27:17 -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
|
a5e6689f81
|
Merge pull request #402 from coralproject/autoreject-on-ban
Autoreject on ban
|
2017-03-20 07:27:15 -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
|
96cd4056c3
|
Merge pull request #400 from coralproject/flag-username-reset
Resetting report menu on close.
|
2017-03-20 07:24:16 -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 |
|
|
David Erwin
|
471a55c3eb
|
Merge pull request #422 from coralproject/plugin-patch
Update Dockerfile
|
2017-03-17 12:50:17 -04:00 |
|
|
Wyatt Johnson
|
c79d1d40da
|
Update Dockerfile
|
2017-03-17 10:46:45 -06:00 |
|
|
David Erwin
|
dbc3c265a3
|
Merge pull request #421 from coralproject/plugins
Server Graph Plugins
|
2017-03-17 12:35:51 -04:00 |
|
|
David Erwin
|
b3d80b2888
|
Merge branch 'master' into plugins
|
2017-03-17 12:31:40 -04:00 |
|
|
Riley Davis
|
cb3572acc5
|
Merge pull request #418 from coralproject/recaptcha-fix
Added new pageData action/reducer
|
2017-03-17 10:24:22 -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
|
6426663103
|
Merge branch 'master' into plugins
|
2017-03-17 08:26:42 -06:00 |
|
|
Wyatt Johnson
|
edeedfaa71
|
Merge branch 'master' into recaptcha-fix
|
2017-03-17 08:01:47 -06:00 |
|
|
Kim Gardner
|
42beac9a39
|
Merge pull request #420 from coralproject/view-more-bug
show different copy per # of replies
|
2017-03-17 09:05:24 -04: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 |
|
|
David Erwin
|
4b8fb48f63
|
Fix bug in example
|
2017-03-16 14:32:59 -04:00 |
|
|
Wyatt Johnson
|
4a416d9477
|
Fixed bug in docs
|
2017-03-16 12:31:25 -06:00 |
|
|
Wyatt Johnson
|
b277f3be75
|
Merge branch 'master' into recaptcha-fix
|
2017-03-16 11:59:56 -06:00 |
|
|
Kim Gardner
|
4219520002
|
Merge pull request #419 from coralproject/dashboard-reload-bugfix
dashboard refresh fix
|
2017-03-16 13:55:17 -04:00 |
|
|
Riley Davis
|
39596399ec
|
dashboard reload fix
|
2017-03-16 11:45:10 -06:00 |
|