 riley
|
ec03c6b48c
|
merge master
|
2017-05-22 13:10:43 -06:00 |
|
|
riley
|
2c620c868d
|
merge master
|
2017-05-19 11:05:46 -06:00 |
|
|
KiwiandGitHub
|
8cb9945e25
|
Merge branch 'master' into multiple-roles
|
2017-05-19 23:26:45 +07:00 |
|
|
riley
|
17ceadd8c9
|
move client-side perms to services
|
2017-05-19 09:18:24 -06:00 |
|
|
Chi Vinh Le
|
1374217680
|
Merge branch 'master' into suspend-user
|
2017-05-19 17:46:06 +07:00 |
|
|
Chi Vinh Le
|
f641a3ec40
|
Complete suspend user implementation
|
2017-05-19 01:52:03 +07:00 |
|
|
Benjamin Goering
|
9eac05c8fb
|
Ignored user tombstones work again
|
2017-05-17 13:18:59 -07:00 |
|
|
Chi Vinh Le
|
2bdf413b88
|
Integrate into embed stream
|
2017-05-18 02:28:01 +07:00 |
|
|
Riley Davis
|
c66e3141e0
|
actually check permissions
|
2017-05-17 11:38:43 -06:00 |
|
|
Wyatt Johnson
|
7a256bdd2b
|
Merge branch 'master' into 142993479-tags
|
2017-05-17 10:01:58 -06:00 |
|
|
Belen Curcio
|
6664f73d2d
|
Best tag working, only Optimistic Missing
|
2017-05-17 11:57:51 -03:00 |
|
|
riley
|
03ce044c53
|
merge master
|
2017-05-16 16:33:41 -06:00 |
|
|
Wyatt Johnson
|
9403280c56
|
Merge branch 'master' into edit-changes
|
2017-05-12 15:44:19 -06:00 |
|
|
Chi Vinh Le
|
7857cadef5
|
Merge branch 'master' into query-mutation-api
Conflicts:
client/coral-embed-stream/src/components/Comment.js
client/coral-embed-stream/src/containers/Embed.js
client/coral-embed-stream/src/containers/Stream.js
client/coral-embed-stream/src/index.js
client/coral-framework/graphql/fragments/commentView.graphql
client/coral-framework/graphql/mutations/index.js
client/coral-framework/hocs/index.js
client/coral-framework/hocs/withFragments.js
|
2017-05-12 19:50:36 +07:00 |
|
|
Wyatt Johnson
|
ae5da93730
|
linting fixes
|
2017-05-11 17:44:51 -06:00 |
|
|
Riley Davis
|
14b483d089
|
create roles helper
|
2017-05-11 14:23:02 -06:00 |
|
|
Benjamin Goering
|
096025b72a
|
Add asset_id to editComment mutation to allow mongo query happy path to be atomic
|
2017-05-08 09:57:52 -07:00 |
|
|
Chi Vinh Le
|
7f0b3c2ddd
|
Merge branch 'master' into query-mutation-api
Conflicts:
client/coral-embed-stream/src/components/Comment.js
client/coral-embed-stream/src/containers/Stream.js
|
2017-05-08 21:44:35 +07:00 |
|
|
Chi Vinh Le
|
1b7eedfd8d
|
Implement extendable GraphQL framework
|
2017-05-05 22:51:19 +07:00 |
|
|
Benjamin Goering
|
b97fa228b1
|
merge with master after huge coral-embed-stream refactor
|
2017-05-03 19:19:03 -07:00 |
|
|
Belen Curcio
|
f1bebaa627
|
Merge
|
2017-05-01 11:54:00 -03:00 |
|
|
Belen Curcio
|
322434f751
|
Removing LIKE from talk
|
2017-05-01 11:13:35 -03:00 |
|
|
Belen Curcio
|
37e093f60a
|
Linting
|
2017-04-26 23:15:40 -03:00 |
|
|
Belen Curcio
|
9fa3e361b5
|
Ref Stream
|
2017-04-26 22:34:17 -03:00 |
|
|
Chi Vinh Le
|
eb9846ba40
|
Merge branch 'master' into query-composition
Conflicts:
client/coral-embed-stream/src/Embed.js
client/coral-embed-stream/src/Stream.js
|
2017-04-26 01:22:14 +07:00 |
|
|
Chi Vinh Le
|
54ea71bedf
|
Support fragments in plugins
|
2017-04-25 18:24:25 +07:00 |
|
|
Chi Vinh Le
|
027358913d
|
Use container
|
2017-04-24 23:35:49 +07:00 |
|
|
Chi Vinh Le
|
11fb5421b5
|
Implement Stream Container
|
2017-04-24 19:27:54 +07:00 |
|
|
Chi Vinh Le
|
4dc3b0c2f4
|
Merge branch 'master' into query-composition-2
Conflicts:
client/coral-embed-stream/src/Embed.js
client/coral-embed-stream/src/components/Comment.js
client/coral-embed-stream/src/index.js
client/coral-framework/services/store.js
client/coral-settings/containers/ProfileContainer.js
graph/resolvers/root_query.js
|
2017-04-24 15:24:34 +07:00 |
|
|
Chi Vinh Le
|
af5be0469f
|
Refactor embed
|
2017-04-18 23:20:39 +07:00 |
|
|
Chi Vinh Le
|
b40eed4751
|
Move to components folder
|
2017-04-18 23:14:28 +07:00 |
|