 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
|
801555e66e
|
button text was wrapping in firefox
|
2017-03-13 12:08:57 -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
|
cf753632bf
|
Merge branch 'master' into asset-comment-metrics
|
2017-03-13 10:18:57 -04:00 |
|
|
David Erwin
|
9f5648b4c3
|
Merge branch 'master' into widen-notifications
|
2017-03-13 10:14:51 -04: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 |
|
|
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 Davis
|
0a88d3da97
|
Merge branch 'master' into widget-auto-update
|
2017-03-09 13:15:56 -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 |
|
|
David Jay
|
3232c04997
|
Merge branch 'master' into remove-notification-warning
|
2017-03-09 13:50:09 -05:00 |
|
|
Riley Davis
|
e6dfb3f64a
|
Merge branch 'master' into open-closed-stream-buttons
|
2017-03-09 11:44:47 -07:00 |
|
|
Riley Davis
|
fb7895b02f
|
Merge branch 'master' into widget-auto-update
|
2017-03-09 11:44:16 -07:00 |
|
|
David Jay
|
542ccc6190
|
Merge branch 'master' into bugfix-ban-dialog-language
|
2017-03-09 13:40:44 -05:00 |
|
|
David Jay
|
8f988c898d
|
Merge branch 'mod-queue-load-more' of github.com:coralproject/talk into mod-queue-load-more
|
2017-03-09 13:36:59 -05:00 |
|
|
David Jay
|
66adf19b97
|
Merge branch 'master' into mod-queue-load-more
|
2017-03-09 13:36:37 -05:00 |
|
|
David Jay
|
a0953c0689
|
Adding proptypes to loadmore component.
|
2017-03-09 13:33:00 -05:00 |
|
|
Belén Curcio
|
c3749c5e31
|
Merge branch 'master' into autoreject-on-ban
|
2017-03-09 13:27:30 -05:00 |
|
|
David Erwin
|
ebdf4b5ec7
|
Merge branch 'master' into open-closed-stream-buttons
|
2017-03-09 13:15:45 -05:00 |
|
|
David Erwin
|
53043051f3
|
Merge branch 'master' into bugfix-ban-dialog-language
|
2017-03-09 13:13:10 -05:00 |
|
|
David Erwin
|
a195879556
|
Merge branch 'master' into widget-auto-update
|
2017-03-09 13:11:17 -05:00 |
|
|
David Jay
|
39386a9fcf
|
Merge branch 'master' into mod-queue-load-more
|
2017-03-09 13:07:41 -05:00 |
|
|
Riley Davis
|
0db92974c4
|
make only the title clickable
|
2017-03-09 11:05:18 -07:00 |
|
|
David Erwin
|
f64063ba14
|
Merge branch 'master' into flag-username-reset
|
2017-03-09 12:57:09 -05:00 |
|
|
David Jay
|
fd9f838948
|
Merge branch 'master' into open-closed-stream-buttons
|
2017-03-09 12:39:54 -05:00 |
|
|
Riley Davis
|
db5df1699c
|
Merge branch 'master' into autoreject-on-ban
|
2017-03-09 10:30:10 -07:00 |
|
|
Riley Davis
|
c064bee4f6
|
Merge branch 'master' into flag-username-reset
|
2017-03-09 10:27:27 -07:00 |
|
|
Riley Davis
|
895d3c31fc
|
Merge branch 'master' into bugfix-mod-queue-refresh
|
2017-03-09 10:24:25 -07:00 |
|
|
Riley Davis
|
070ed13495
|
Merge branch 'master' into mod-queue-load-more
|
2017-03-09 10:15:08 -07:00 |
|
|
Belén Curcio
|
9bfc7d2037
|
Merge branch 'master' into long-titles
|
2017-03-09 11:05:08 -05:00 |
|
|
Belen Curcio
|
438877d58f
|
Merge branch 'long-titles' of github.com:coralproject/talk into long-titles
|
2017-03-09 11:03:37 -05:00 |
|
|
Belen Curcio
|
ce7a2d54d0
|
Font Size
|
2017-03-09 10:59:28 -05:00 |
|
|
David Jay
|
9b53930861
|
Merge branch 'master' into flag-username-reset
|
2017-03-08 17:49:59 -05:00 |
|
|
riley
|
2cdf2bb332
|
add moderate button
|
2017-03-08 15:26:45 -07:00 |
|
|
David Jay
|
7bf5285a1d
|
Merge branch 'master' into bugfix-ban-dialog-language
|
2017-03-08 17:10:14 -05:00 |
|
|
David Jay
|
a8d090d5a2
|
Merge branch 'master' into autoreject-on-ban
|
2017-03-08 17:07:26 -05:00 |
|
|
David Jay
|
377563c798
|
Hiding rejected note on ban dialog for rejected comments.
|
2017-03-08 17:02:47 -05:00 |
|