 Kim Gardner
|
babd1b3d8d
|
Merge branch 'master' into config-shuffle
|
2017-03-15 13:30:43 -04:00 |
|
|
Kim Gardner
|
9e890101fa
|
Merge pull request #416 from coralproject/login-error-fix
correctly handle error when not logged in
|
2017-03-15 13:28:45 -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 |
|
|
Kim Gardner
|
8a84587e54
|
Merge pull request #414 from coralproject/streams-to-stories
change Stream > Story sometimes
|
2017-03-15 11:28:11 -04:00 |
|
|
Riley Davis
|
04298aca7d
|
change Stream > Story sometimes
|
2017-03-14 16:30:02 -06:00 |
|
|
Kim Gardner
|
d8ce015b98
|
Merge pull request #411 from coralproject/remove-like-widget
remove like widget for now
|
2017-03-14 17:45:26 -04:00 |
|
|
Riley Davis
|
b612bbd96c
|
Merge branch 'master' into remove-like-widget
|
2017-03-14 15:35:07 -06:00 |
|
|
David Erwin
|
66d04ab5ca
|
Merge pull request #406 from coralproject/asset-comment-metrics
Asset comment metrics
|
2017-03-14 17:16:15 -04:00 |
|
|
David Erwin
|
6758a178eb
|
Removing log
|
2017-03-14 17:10:37 -04: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
|
8876c10254
|
Merge pull request #407 from coralproject/hide-dashboard-cta
save dismissed timer note to localStorage
|
2017-03-14 13:29:45 -04:00 |
|
|
Kim Gardner
|
c50d25c0e9
|
Merge branch 'master' into hide-dashboard-cta
|
2017-03-14 13:19:23 -04:00 |
|
|
Kim Gardner
|
1330ffd394
|
Merge pull request #410 from coralproject/firefox-mod-buttons
button text was wrapping in firefox
|
2017-03-14 13:17:45 -04:00 |
|
|
Kim Gardner
|
d85473e20c
|
Merge branch 'master' into firefox-mod-buttons
|
2017-03-14 13:01:24 -04:00 |
|
|
Kim Gardner
|
13e2766ae9
|
Merge pull request #413 from coralproject/reporting-messaging
indentation and flag -> report
|
2017-03-14 13:00:49 -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
|
7bfa718830
|
remove like widget for now
|
2017-03-13 12:15:38 -06:00 |
|
|
riley
|
801555e66e
|
button text was wrapping in firefox
|
2017-03-13 12:08:57 -06:00 |
|
|
Riley Davis
|
bf31f07053
|
Merge pull request #404 from coralproject/keyboard-shortcut-scroll
Scrolling to keep selected comments in view.
|
2017-03-13 11:52:08 -06:00 |
|
|
Riley Davis
|
6d3bb6af03
|
Merge branch 'master' into keyboard-shortcut-scroll
|
2017-03-13 11:14:04 -06:00 |
|
|
Riley Davis
|
f999be6fbf
|
scrollIntoView will work in more browsers
|
2017-03-13 11:13:28 -06:00 |
|
|
David Erwin
|
15e962c985
|
Merge pull request #409 from coralproject/revert-version-pin
Removed the version pin
|
2017-03-13 12:01:18 -04:00 |
|
|
Wyatt Johnson
|
8e6c2e8075
|
Resolved #357
|
2017-03-13 09:43:47 -06:00 |
|
|
David Erwin
|
eb00320a0c
|
Merge pull request #405 from coralproject/asset-comment-total-count
Added support for total comment count
|
2017-03-13 11:32:35 -04:00 |
|
|
David Erwin
|
33062ca43e
|
Merge branch 'master' into asset-comment-total-count
|
2017-03-13 11:14:36 -04:00 |
|
|
David Erwin
|
cf753632bf
|
Merge branch 'master' into asset-comment-metrics
|
2017-03-13 10:18:57 -04:00 |
|
|
David Erwin
|
5ceaa24217
|
Merge pull request #408 from coralproject/widen-notifications
make notifications wider
|
2017-03-13 10:18:28 -04:00 |
|
|
David Erwin
|
9f5648b4c3
|
Merge branch 'master' into widen-notifications
|
2017-03-13 10:14:51 -04:00 |
|
|
Riley Davis
|
087851f694
|
Merge pull request #403 from coralproject/bugfix-ban-dialog-language
Hiding rejected note on ban dialog for rejected comments.
|
2017-03-10 15:08:27 -07:00 |
|
|
Riley Davis
|
e159435293
|
Merge branch 'master' into bugfix-ban-dialog-language
|
2017-03-10 14:50:49 -07:00 |
|
|
Riley Davis
|
9d9d336e06
|
make notifications wider
|
2017-03-10 13:54:33 -07:00 |
|
|
Riley Davis
|
9e7b710faa
|
save dismissed timer note to localStorage
|
2017-03-10 13:48:14 -07:00 |
|
|
Riley Davis
|
4a10122f34
|
add some translations
|
2017-03-10 12:16:20 -07:00 |
|
|
Wyatt Johnson
|
93221de563
|
Added support for total comment count
|
2017-03-09 17:07:07 -07:00 |
|
|
David Jay
|
255807858d
|
Scrolling to keep selected comments in view.
|
2017-03-09 18:06:44 -05:00 |
|
|
Riley Davis
|
f6af847bfb
|
add Activity widget
|
2017-03-09 16:05:09 -07:00 |
|
|
riley
|
25fe268872
|
Merge branch 'master' into asset-comment-metrics
|
2017-03-09 13:20:51 -07:00 |
|
|
Riley Davis
|
5893e0cbde
|
Merge pull request #398 from coralproject/widget-auto-update
Auto-update Dashboard
|
2017-03-09 13:19:39 -07:00 |
|
|
Riley Davis
|
0a88d3da97
|
Merge branch 'master' into widget-auto-update
|
2017-03-09 13:15:56 -07:00 |
|
|
Riley Davis
|
d46b06da1c
|
Merge pull request #401 from coralproject/remove-notification-warning
incorrectly using dispatch now that we do pym directly
|
2017-03-09 13:01:37 -07:00 |
|
|
Riley Davis
|
cb10de6c7a
|
modify to light grey
|
2017-03-09 12:58:57 -07:00 |
|
|
Riley Davis
|
98a87f4595
|
Merge branch 'master'
Conflicts:
client/coral-admin/src/containers/Dashboard/Widget.css
|
2017-03-09 12:22:20 -07:00 |
|
|
David Jay
|
1884ad6437
|
Merge branch 'master' into bugfix-ban-dialog-language
|
2017-03-09 13:51:51 -05:00 |
|
|
David Jay
|
3c296ea4e9
|
Merge branch 'master' into remove-notification-warning
|
2017-03-09 13:51:21 -05:00 |
|
|
Riley Davis
|
82f47e27ac
|
Merge pull request #396 from coralproject/open-closed-stream-buttons
fix some firefox display things
|
2017-03-09 11:50:28 -07:00 |
|
|
David Jay
|
3232c04997
|
Merge branch 'master' into remove-notification-warning
|
2017-03-09 13:50:09 -05:00 |
|