 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 |
|
|
gaba
|
ac8c73c4e9
|
Merge branch 'master' into story-138187767-mod-flag-names
|
2017-03-20 10:47:04 -07:00 |
|
|
David Erwin
|
9ccdaec063
|
Merge pull request #422 from coralproject/plugin-patch
Update Dockerfile
|
2017-03-20 10:47:03 -07:00 |
|
|
Wyatt Johnson
|
69ad11adf5
|
Update Dockerfile
|
2017-03-20 10:47:03 -07:00 |
|
|
David Erwin
|
af93953b17
|
Merge pull request #421 from coralproject/plugins
Server Graph Plugins
|
2017-03-20 10:47:02 -07:00 |
|
|
Riley Davis
|
a7908f3399
|
Merge pull request #418 from coralproject/recaptcha-fix
Added new pageData action/reducer
|
2017-03-20 10:47:01 -07:00 |
|
|
David Erwin
|
17deea5b96
|
Merge branch 'master' into plugins
|
2017-03-20 10:47:01 -07:00 |
|
|
Riley Davis
|
09ec2dba94
|
combine destructuring
|
2017-03-20 10:47:00 -07:00 |
|
|
Wyatt Johnson
|
46ecf0c06f
|
Renamed pageData -> config
|
2017-03-20 10:46:59 -07:00 |
|
|
Wyatt Johnson
|
b35170484e
|
Merge branch 'master' into recaptcha-fix
|
2017-03-20 10:46:59 -07:00 |
|
|
Wyatt Johnson
|
8eac8d6890
|
Merge branch 'master' into recaptcha-fix
|
2017-03-20 10:46:58 -07:00 |
|
|
Wyatt Johnson
|
dfffbbe619
|
bug fix
|
2017-03-20 10:46:58 -07:00 |
|
|
Wyatt Johnson
|
5768d30a7a
|
Added new pageData action/reducer
|
2017-03-20 10:46:57 -07:00 |
|
|
gaba
|
2fff47c753
|
Merge branch 'master' into plugins
|
2017-03-20 10:46:30 -07:00 |
|
|
Kim Gardner
|
74a561a770
|
Merge pull request #420 from coralproject/view-more-bug
show different copy per # of replies
|
2017-03-20 10:45:32 -07:00 |
|
|
Riley Davis
|
9d64639f8e
|
differentiate between top- and comment-level LoadMore
|
2017-03-20 10:45:31 -07:00 |
|
|
Riley Davis
|
316aa12481
|
add spanish translations
|
2017-03-20 10:45:31 -07:00 |
|
|
Kim Gardner
|
369d867e77
|
Merge pull request #419 from coralproject/dashboard-reload-bugfix
dashboard refresh fix
|
2017-03-20 10:45:30 -07:00 |
|
|
Riley Davis
|
73c59cb137
|
show different copy per # of replies
|
2017-03-20 10:45:30 -07:00 |
|
|
Riley Davis
|
517ede1977
|
dashboard reload fix
|
2017-03-20 10:45:29 -07:00 |
|
|
Kim Gardner
|
5514f45ab3
|
Merge pull request #412 from coralproject/recaptcha-support
recaptcha + RL support
|
2017-03-20 10:45:28 -07:00 |
|
|
gaba
|
2a66a78d41
|
Merge branch 'master' into recaptcha-support
|
2017-03-20 10:37:18 -07:00 |
|
|
Kim Gardner
|
61a2f1ed36
|
Merge pull request #417 from coralproject/dashboard-bug
move CountdownTimer to its own component
|
2017-03-20 10:27:31 -07:00 |
|
|
Riley Davis
|
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 Gardner
|
ecb1c51a9f
|
Merge pull request #415 from coralproject/config-shuffle
move pre-mod links
|
2017-03-20 10:21:59 -07:00 |
|
|
Kim Gardner
|
1a83ffe482
|
Merge branch 'master' into config-shuffle
|
2017-03-20 10:21:59 -07:00 |
|
|
Kim Gardner
|
2c2cbb720b
|
Merge pull request #416 from coralproject/login-error-fix
correctly handle error when not logged in
|
2017-03-20 10:21:58 -07:00 |
|
|
Riley Davis
|
92055c7814
|
correctly handle error when not logged in
|
2017-03-20 10:21:58 -07:00 |
|
|
riley
|
e975d6d809
|
move pre-mod links
|
2017-03-20 10:21:57 -07:00 |
|
|
Kim Gardner
|
8459c31b42
|
Merge pull request #414 from coralproject/streams-to-stories
change Stream > Story sometimes
|
2017-03-20 10:21:56 -07:00 |
|
|
Riley Davis
|
63c3d02329
|
change Stream > Story sometimes
|
2017-03-20 10:21:56 -07:00 |
|
|
Riley Davis
|
dedcb87435
|
Merge branch 'master' into recaptcha-support
|
2017-03-20 10:21:55 -07:00 |
|
|
Kim Gardner
|
22753e1e14
|
Merge pull request #411 from coralproject/remove-like-widget
remove like widget for now
|
2017-03-20 10:21:54 -07:00 |
|
|
gaba
|
7232d09eb3
|
Merge branch 'master' into remove-like-widget
|
2017-03-20 07:47:37 -07:00 |
|
|
Riley Davis
|
5c767b6aa6
|
Merge branch 'master' into recaptcha-support
|
2017-03-20 07:42:31 -07:00 |
|
|
riley
|
1ff5ab2e3e
|
remove like widget for now
|
2017-03-20 07:42:31 -07:00 |
|
|
David Erwin
|
75cb83014b
|
Merge pull request #406 from coralproject/asset-comment-metrics
Asset comment metrics
|
2017-03-20 07:42:30 -07:00 |
|
|
David Erwin
|
abd0b51441
|
Removing log
|
2017-03-20 07:42:29 -07:00 |
|
|
David Erwin
|
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 Gardner
|
4ff6c08d4d
|
Merge pull request #407 from coralproject/hide-dashboard-cta
save dismissed timer note to localStorage
|
2017-03-20 07:39:31 -07:00 |
|
|
Kim Gardner
|
6af8ef7838
|
Merge branch 'master' into hide-dashboard-cta
|
2017-03-20 07:39:31 -07:00 |
|
|
Kim Gardner
|
465e2012c5
|
Merge pull request #410 from coralproject/firefox-mod-buttons
button text was wrapping in firefox
|
2017-03-20 07:39:30 -07:00 |
|
|
Kim Gardner
|
01db845814
|
Merge branch 'master' into firefox-mod-buttons
|
2017-03-20 07:39:29 -07:00 |
|
|
Kim Gardner
|
aba9488aab
|
Merge pull request #413 from coralproject/reporting-messaging
indentation and flag -> report
|
2017-03-20 07:39:28 -07:00 |
|
|
Riley Davis
|
337b6accec
|
remove fakeurl
|
2017-03-20 07:39:28 -07:00 |
|