 Kim Gardner
|
1a83ffe482
|
Merge branch 'master' into config-shuffle
|
2017-03-20 10:21:59 -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 |
|
|
Riley Davis
|
63c3d02329
|
change Stream > Story sometimes
|
2017-03-20 10:21:56 -07:00 |
|
|
gaba
|
7232d09eb3
|
Merge branch 'master' into remove-like-widget
|
2017-03-20 07:47:37 -07:00 |
|
|
riley
|
1ff5ab2e3e
|
remove like widget for now
|
2017-03-20 07:42:31 -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
|
6af8ef7838
|
Merge branch 'master' into hide-dashboard-cta
|
2017-03-20 07:39:31 -07:00 |
|
|
Kim Gardner
|
01db845814
|
Merge branch 'master' into firefox-mod-buttons
|
2017-03-20 07:39:29 -07:00 |
|
|
Riley Davis
|
337b6accec
|
remove fakeurl
|
2017-03-20 07:39:28 -07:00 |
|
|
riley
|
39e69f3bdc
|
button text was wrapping in firefox
|
2017-03-20 07:39:27 -07:00 |
|
|
riley
|
21acb0d1d7
|
indentation and flag -> report
|
2017-03-20 07:39:27 -07:00 |
|
|
Riley Davis
|
2124ca0f34
|
save dismissed timer note to localStorage
|
2017-03-20 07:39:26 -07:00 |
|
|
gaba
|
6f3cb34817
|
Merge branch 'master' into asset-comment-metrics
|
2017-03-20 07:39:00 -07:00 |
|
|
David Erwin
|
1d061ce359
|
Merge branch 'master' into asset-comment-metrics
|
2017-03-20 07:36:23 -07:00 |
|
|
Riley Davis
|
f005907894
|
add some translations
|
2017-03-20 07:36:23 -07:00 |
|
|
Riley Davis
|
2c4bf52f6b
|
add Activity widget
|
2017-03-20 07:36:22 -07:00 |
|
|
Riley Davis
|
f8b3c5752e
|
Merge branch 'master' into keyboard-shortcut-scroll
|
2017-03-20 07:36:19 -07:00 |
|
|
Riley Davis
|
46e8d30e22
|
scrollIntoView will work in more browsers
|
2017-03-20 07:36:18 -07:00 |
|
|
David Jay
|
ae4bae6cd2
|
Scrolling to keep selected comments in view.
|
2017-03-20 07:36:17 -07:00 |
|
|
David Erwin
|
fe6e6fbd2f
|
Merge branch 'master' into widen-notifications
|
2017-03-20 07:32:56 -07:00 |
|
|
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 |
|
|
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 |
|
|
David Jay
|
a0953c0689
|
Adding proptypes to loadmore component.
|
2017-03-09 13:33:00 -05:00 |
|
|
Gabriela Rodríguez Berón
|
491694b9c1
|
Merge branch 'master' into story-138187767-mod-flag-names
|
2017-03-09 17:20:00 +01: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 |
|