 Belen Curcio
|
38077cf3cf
|
Missing fragment
|
2017-06-08 11:56:38 -03:00 |
|
|
Belen Curcio
|
ef43ba3a35
|
new merge conflicts to master
|
2017-06-08 11:55:06 -03:00 |
|
|
Kim Gardner
|
801d0a92af
|
Merge branch 'master' into comment-stream-cleanup
|
2017-06-07 17:07:39 -04:00 |
|
|
Belen Curcio
|
63a35cbceb
|
Merge issues
|
2017-06-07 16:38:36 -03:00 |
|
|
Kim Gardner
|
14a35033da
|
Merge branch 'master' into comment-stream-cleanup
|
2017-06-07 14:33:29 -04:00 |
|
|
Chi Vinh Le
|
4e56406c37
|
Fix tabsize in css
|
2017-06-08 00:49:18 +07:00 |
|
|
Chi Vinh Le
|
66e4f02a1a
|
Selectors, resolving merge errors, better class names, removing comment reducer
|
2017-06-08 00:29:05 +07:00 |
|
|
IAmSamHankins
|
c3d76c6a4f
|
messaging style updates, and update to translation files.
|
2017-06-07 12:55:40 -04:00 |
|
|
Belen Curcio
|
c8534a91a6
|
Merge branch 'off-topic-features' of github.com:coralproject/talk into off-topic-features
|
2017-06-07 13:53:54 -03:00 |
|
|
Belen Curcio
|
87ddfea689
|
indexes css
|
2017-06-07 13:53:33 -03:00 |
|
|
Belén Curcio
|
830441c531
|
Merge branch 'master' into off-topic-features
|
2017-06-07 13:24:58 -03:00 |
|
|
Belen Curcio
|
847a30ff92
|
Adding correct classNames
|
2017-06-07 13:19:36 -03:00 |
|
|
Riley Davis
|
9f4df35c3a
|
percents have to be multiplied by 100
|
2017-06-07 10:15:50 -06:00 |
|
|
Belen Curcio
|
f6ad9c9373
|
Adding camelcase for plugin reducers 🎉 <3
|
2017-06-07 13:14:52 -03:00 |
|
|
Belen Curcio
|
8872248d63
|
Addiing Stable API Architecture
|
2017-06-07 13:10:17 -03:00 |
|
|
Chi Vinh Le
|
7a2fd95eca
|
Merge branch 'master' into off-topic-features
Conflicts:
client/coral-embed-stream/src/components/Comment.css
client/coral-embed-stream/src/components/Comment.js
client/coral-embed-stream/src/components/Stream.js
client/coral-embed-stream/src/reducers/index.js
client/coral-framework/helpers/plugins.js
|
2017-06-07 22:37:06 +07:00 |
|
|
Belen Curcio
|
d7dfae89a3
|
Global classNames, and more
|
2017-06-07 12:05:53 -03:00 |
|
|
Belen Curcio
|
4725f07757
|
Viewing Options state and name conventions
|
2017-06-07 09:53:53 -03:00 |
|
|
Belen Curcio
|
e24f6ca9f1
|
Renaming to commentClassNames
|
2017-06-07 09:28:12 -03:00 |
|
|
Chi Vinh Le
|
ceb99cf205
|
Better refetch detection
|
2017-06-07 17:45:33 +07:00 |
|
|
Belen Curcio
|
b5c9e92cc6
|
Adding streamBox slot and coral-plugin-viewing-options 🎉
|
2017-06-06 20:42:42 -03:00 |
|
|
IAmSamHankins
|
cc76517ba8
|
minor copy changes in Configure tab on stream, and style updates to banned user message on stream
|
2017-06-06 17:37:14 -04:00 |
|
|
Belen Curcio
|
6f909c3451
|
Containers and Components structure
|
2017-06-06 18:21:03 -03:00 |
|
|
Riley Davis
|
2384ae4baa
|
move edit comment config
|
2017-06-06 14:49:07 -06:00 |
|
|
Belen Curcio
|
1c7ad9a8ac
|
Plugin reducers working again with reducer name
|
2017-06-06 17:29:56 -03:00 |
|
|
Belen Curcio
|
c3360aa020
|
Plugin reducers working again
|
2017-06-06 17:23:35 -03:00 |
|
|
Belen Curcio
|
4aa7900769
|
Not connecting comment Component to the Store
|
2017-06-06 17:09:13 -03:00 |
|
|
Riley Davis
|
8af0d929c2
|
Merge branch 'master' into bulk-actions
|
2017-06-06 13:15:04 -06:00 |
|
|
Riley Davis
|
4e19d5eecf
|
don't have functions re-created every render
|
2017-06-06 13:11:31 -06:00 |
|
|
Riley Davis
|
5465563856
|
reload and clear selections
|
2017-06-06 12:52:26 -06:00 |
|
|
Belen Curcio
|
b5a64bd2f9
|
Filter State
|
2017-06-06 15:45:56 -03:00 |
|
|
Chi Vinh Le
|
7cb05cebef
|
Use wss when connection is secure
|
2017-06-07 01:32:37 +07:00 |
|
|
Kim Gardner
|
80d4ffa5bf
|
Merge branch 'master' into bulk-actions
|
2017-06-06 14:13:47 -04:00 |
|
|
Kim Gardner
|
eff923424c
|
Merge branch 'master' into bulk-actions
|
2017-06-06 14:11:16 -04:00 |
|
|
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 |
|
|
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
|
6fcd003e76
|
remove console.log
|
2017-06-06 10:32:14 -06: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 |
|
|
Belen Curcio
|
e9cb61a534
|
Arrow for filtering
|
2017-06-06 12:13:26 -03:00 |
|
|
Belen Curcio
|
a6db60096c
|
Fully working, needs docs
|
2017-06-06 11:58:51 -03:00 |
|
|
Belen Curcio
|
9364272ffc
|
Ádd classnames based on tags
|
2017-06-06 11:53:19 -03:00 |
|
|
Chi Vinh Le
|
1ceb72ca5c
|
Fix error with tombstones
|
2017-06-06 21:26:43 +07:00 |
|
|
Belen Curcio
|
9e001f5ce9
|
addClassNames, removeClassNames, reducers and actions for Comment Component
|
2017-06-06 11:15:35 -03:00 |
|
|
Chi Vinh Le
|
0fcdd09f9f
|
Lazily create apollo client
|
2017-06-06 20:50:07 +07:00 |
|
|
Belen Curcio
|
3ad3b3af1c
|
Adding filters
|
2017-06-06 09:43:34 -03: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 |
|