 Erica Irving
|
c3e32f37dc
|
add coral- prefix as requested
|
2017-06-06 13:43:45 -04:00 |
|
|
Riley Davis
|
18f11a84cf
|
Merge branch 'master' into active-tab-classnames
|
2017-06-06 11:14:47 -06:00 |
|
|
Riley Davis
|
b0bdfff785
|
Merge pull request #649 from ebirving/respect-plugin-styles
add classnames to RespectButton component
|
2017-06-06 11:14:32 -06:00 |
|
|
Riley Davis
|
dc55febac8
|
Merge branch 'master' into respect-plugin-styles
|
2017-06-06 11:09:36 -06:00 |
|
|
David Erwin
|
4d6e02228c
|
Merge pull request #643 from coralproject/subscribe-to-comments
Subscribe to comment updates
|
2017-06-06 13:00:58 -04:00 |
|
|
Chi Vinh Le
|
c50fe9f91d
|
Merge branch 'master' into subscribe-to-comments
Conflicts:
client/coral-embed-stream/src/components/Comment.js
|
2017-06-06 23:44:27 +07:00 |
|
|
Riley Davis
|
7d5a73bc95
|
Merge branch 'master' into respect-plugin-styles
|
2017-06-06 10:40:33 -06:00 |
|
|
Riley Davis
|
5f3220dba9
|
Merge pull request #652 from coralproject/css-override-classes
Css override classes + tab bugfix
|
2017-06-06 10:40:21 -06:00 |
|
|
Kim Gardner
|
700ab38cb0
|
Merge branch 'master' into css-override-classes
|
2017-06-06 12:34:13 -04:00 |
|
|
Riley Davis
|
6fcd003e76
|
remove console.log
|
2017-06-06 10:32:14 -06:00 |
|
|
Kiwi
|
0069d17672
|
Merge branch 'master' into subscribe-to-comments
|
2017-06-06 23:19:22 +07:00 |
|
|
Chi Vinh Le
|
afdcdff51e
|
Handle ignored user case
|
2017-06-06 23:18:37 +07:00 |
|
|
Erica Irving
|
3d8478dfb2
|
add semantic classname to active tab
|
2017-06-06 12:17:32 -04:00 |
|
|
Kim Gardner
|
71d2f44d38
|
Merge pull request #650 from coralproject/copy-updates
Copy changes
|
2017-06-06 12:07:40 -04:00 |
|
|
Kim Gardner
|
124ea19b52
|
Update en.yml
|
2017-06-06 12:03:12 -04:00 |
|
|
Erica Irving
|
512a463589
|
add classnames to RespectButton component
|
2017-06-06 11:28:28 -04:00 |
|
|
Chi Vinh Le
|
1ceb72ca5c
|
Fix error with tombstones
|
2017-06-06 21:26:43 +07:00 |
|
|
Chi Vinh Le
|
0fcdd09f9f
|
Lazily create apollo client
|
2017-06-06 20:50:07 +07:00 |
|
|
Chi Vinh Le
|
d3f7e6210c
|
Simplify transition code
|
2017-06-06 19:06:42 +07:00 |
|
|
Chi Vinh Le
|
447ec7e524
|
Deeply pass commentIsIgnored
|
2017-06-06 19:05:18 +07:00 |
|
|
Chi Vinh Le
|
f8ca14d3d3
|
Reset stream after refetching
|
2017-06-06 18:45:45 +07:00 |
|
|
Riley Davis
|
ad4c4a0a5b
|
fix for active tab not showing. user box classNames
|
2017-06-05 16:46:58 -06:00 |
|
|
Wyatt Johnson
|
7956c193c5
|
Merge branch 'master' into subscribe-to-comments
|
2017-06-05 16:38:28 -06:00 |
|
|
Wyatt Johnson
|
2aa3b7a5a0
|
Merge pull request #641 from coralproject/safari-cookie-time
Use same lifespan for cookies as for tokens
|
2017-06-05 16:38:13 -06:00 |
|
|
Wyatt Johnson
|
2f77842072
|
Merge branch 'master' into safari-cookie-time
|
2017-06-05 16:32:29 -06:00 |
|
|
Wyatt Johnson
|
a595e94394
|
Removed parse-duration in favour of ms
|
2017-06-05 16:31:06 -06:00 |
|
|
riley
|
d03647067d
|
Merge branch 'master' into css-override-classes
|
2017-06-05 16:19:46 -06:00 |
|
|
Riley Davis
|
fb537c9990
|
Merge pull request #648 from coralproject/StephanieDClark-master
Stephanie's changes to add classNames to Tab and TabBar
|
2017-06-05 16:18:19 -06:00 |
|
|
Riley Davis
|
8ea7ba9b69
|
Merge branch 'master' into css-override-classes
|
2017-06-05 16:13:45 -06:00 |
|
|
David Erwin
|
15297cd674
|
Update css naming convention
|
2017-06-05 18:12:38 -04:00 |
|
|
Riley Davis
|
e46802910c
|
Merge branch 'master' into StephanieDClark-master
|
2017-06-05 16:09:12 -06:00 |
|
|
riley
|
19b90910ba
|
better tab classNames
|
2017-06-05 16:08:53 -06:00 |
|
|
David Erwin
|
291cee3af4
|
Merge pull request #647 from coralproject/auth-token-hooks
Added new tokenUserNotFound plugin hook
|
2017-06-05 18:05:56 -04:00 |
|
|
Wyatt Johnson
|
069c4c5e50
|
Merge branch 'master' into auth-token-hooks
|
2017-06-05 16:00:23 -06:00 |
|
|
Riley Davis
|
7d54fb60a8
|
use existing className attr instead of custom property
|
2017-06-05 15:57:34 -06:00 |
|
|
Wyatt Johnson
|
e8143aea14
|
Added new tokenUserNotFound plugin hook
|
2017-06-05 15:52:32 -06:00 |
|
|
StephanieDClark
|
9e1d010db3
|
Adjusting tab classes
|
2017-06-05 14:48:50 -07:00 |
|
|
David Erwin
|
728d523b9e
|
Begin adding css override classes
|
2017-06-05 17:25:27 -04:00 |
|
|
StephanieDClark
|
5838f5d486
|
fix lint errors
|
2017-06-05 14:00:21 -07:00 |
|
|
StephanieDClark
|
5e463c00fd
|
Merge branch 'master' into master
|
2017-06-05 13:35:36 -07:00 |
|
|
Kim Gardner
|
933a9371f3
|
Merge branch 'master' into safari-cookie-time
|
2017-06-05 16:35:23 -04:00 |
|
|
Kim Gardner
|
0be77fa5fd
|
Merge pull request #645 from coralproject/fix-typos
Fix typos
|
2017-06-05 16:28:08 -04:00 |
|
|
Kim Gardner
|
49eecaa65b
|
Fix typos
|
2017-06-05 16:22:17 -04:00 |
|
|
StephanieDClark
|
414e5d78bd
|
Fix yarn lint error
|
2017-06-05 12:58:04 -07:00 |
|
|
Kiwi
|
e9a6c3dfe3
|
Merge branch 'master' into subscribe-to-comments
|
2017-06-06 02:42:35 +07:00 |
|
|
StephanieDClark
|
3b7603ee31
|
add supplied classes to tabbar
|
2017-06-05 12:39:35 -07:00 |
|
|
StephanieDClark
|
8c89296007
|
add supplied classes to tab
|
2017-06-05 12:38:36 -07:00 |
|
|
StephanieDClark
|
32fe291847
|
Add classes to tabbar, tab
|
2017-06-05 12:37:13 -07:00 |
|
|
Chi Vinh Le
|
056ddc7010
|
Meaningful comment
|
2017-06-06 02:25:42 +07:00 |
|
|
Chi Vinh Le
|
2d0eec15c1
|
Readd falsely deleted part
|
2017-06-06 02:25:32 +07:00 |
|