 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
|
9d25a4c14a
|
Merge pull request #661 from coralproject/comment-stream-cleanup
Refinement of design for banned and suspend user messaging on comment stream.
v1.9.0
|
2017-06-07 17:12:25 -04:00 |
|
|
Kim Gardner
|
801d0a92af
|
Merge branch 'master' into comment-stream-cleanup
|
2017-06-07 17:07:39 -04:00 |
|
|
David Erwin
|
8bf86f34ee
|
Merge pull request #654 from coralproject/off-topic-features
Off Topic Features
|
2017-06-07 15:43:03 -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
|
05da69d097
|
Remove falsely commited css styles
|
2017-06-08 01:23:22 +07:00 |
|
|
Chi Vinh Le
|
ffce78ef60
|
Move Icon and translation service to plugin-api
|
2017-06-08 01:18:02 +07:00 |
|
|
Chi Vinh Le
|
6561f733b7
|
Use correct prefix
|
2017-06-08 01:17:36 +07:00 |
|
|
Chi Vinh Le
|
b9758ba942
|
Fix overlap not clickable
|
2017-06-08 00:59:44 +07:00 |
|
|
Chi Vinh Le
|
4e56406c37
|
Fix tabsize in css
|
2017-06-08 00:49:18 +07:00 |
|
|
Chi Vinh Le
|
06858bf071
|
Move Slot and withReaction to beta
|
2017-06-08 00:42:21 +07:00 |
|
|
Chi Vinh Le
|
66e4f02a1a
|
Selectors, resolving merge errors, better class names, removing comment reducer
|
2017-06-08 00:29:05 +07:00 |
|
|
Wyatt Johnson
|
4cbc8b2226
|
Updates to setup process
|
2017-06-07 11:08:39 -06: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 |
|
|
Wyatt Johnson
|
6827ff2f1f
|
Added support for version enforcing
|
2017-06-07 10:27:42 -06:00 |
|
|
Belén Curcio
|
830441c531
|
Merge branch 'master' into off-topic-features
|
2017-06-07 13:24:58 -03:00 |
|
|
Riley Davis
|
7417d51973
|
Merge pull request #660 from coralproject/math-is-hard
percents have to be multiplied by 100
|
2017-06-07 10:22:45 -06: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 |
|
|
Belen Curcio
|
d780eea357
|
Merge branch 'off-topic-features' of github.com:coralproject/talk into off-topic-features
|
2017-06-07 12:38:31 -03:00 |
|
|
Belen Curcio
|
20aba92ad2
|
Linting
|
2017-06-07 12:37:59 -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 |
|
|
David Erwin
|
fa33fe2ed2
|
Merge pull request #657 from coralproject/better-refetch-detection
Better refetch detection
|
2017-06-07 09:29:19 -04:00 |
|
|
Belen Curcio
|
456eedfd31
|
Clearing tags and naming convention
|
2017-06-07 10:04:52 -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 |
|
|
Kiwi
|
e47d3b085e
|
Merge pull request #656 from coralproject/service-fix
Resolve facebook login issue
|
2017-06-07 16:57:19 +07:00 |
|
|
Belén Curcio
|
5e1fcc48e1
|
Merge branch 'master' into service-fix
|
2017-06-06 20:45:06 -03:00 |
|
|
Belen Curcio
|
b5c9e92cc6
|
Adding streamBox slot and coral-plugin-viewing-options 🎉
|
2017-06-06 20:42:42 -03:00 |
|
|
Wyatt Johnson
|
cf82f5b707
|
fixed enum
|
2017-06-06 17:32:52 -06:00 |
|
|
Wyatt Johnson
|
1e904584e7
|
Added model migrations
|
2017-06-06 17:31:52 -06:00 |
|
|
Wyatt Johnson
|
71ff1c31f8
|
moved plugin to lazy load
|
2017-06-06 16:49:51 -06: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 |
|
|
Belen Curcio
|
2202c8ae5b
|
Fully working filter
|
2017-06-06 18:08:13 -03:00 |
|
|
Kim Gardner
|
6d8133b1b5
|
Merge pull request #655 from coralproject/move-config
move edit comment config
|
2017-06-06 16:57:48 -04: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
|
0dc61f33f5
|
Merge pull request #646 from coralproject/bulk-actions
bulk operations on User Detail comments
|
2017-06-06 13:26:28 -06:00 |
|
|
Riley Davis
|
8af0d929c2
|
Merge branch 'master' into bulk-actions
|
2017-06-06 13:15:04 -06:00 |
|