 Belen Curcio
|
793f634959
|
Working tags
|
2017-05-17 09:01:41 -03:00 |
|
|
riley
|
03ce044c53
|
merge master
|
2017-05-16 16:33:41 -06:00 |
|
|
Chi Vinh Le
|
2ab8cc9481
|
Allow Apollo to invalidate old user data
|
2017-05-16 18:17:43 +07:00 |
|
|
gaba
|
c0c6dd6252
|
The merge got back some code to the coral-framework.
|
2017-05-15 14:23:56 -07:00 |
|
|
Belen Curcio
|
c3d02a14a0
|
Updated queries and hasRoles
|
2017-05-15 18:11:14 -03:00 |
|
|
gaba
|
423cb3cade
|
Merge branch 'master' into i18n-refactor
|
2017-05-15 14:02:34 -07:00 |
|
|
gaba
|
54e103b55a
|
Change a few translations that had wrong key.
|
2017-05-15 13:44:46 -07:00 |
|
|
Chi Vinh Le
|
74e1436ae4
|
Use correct error key
|
2017-05-16 01:09:33 +07:00 |
|
|
Chi Vinh Le
|
def35f0a93
|
Fix login issues
|
2017-05-16 00:55:12 +07:00 |
|
|
gaba
|
633086cfa3
|
Fix a few more strings and translations.
|
2017-05-15 07:11:11 -07:00 |
|
|
Wyatt Johnson
|
9403280c56
|
Merge branch 'master' into edit-changes
|
2017-05-12 15:44:19 -06:00 |
|
|
Wyatt Johnson
|
e3017efebf
|
Front end edits to accomedate ignoredUsers
|
2017-05-12 10:25:59 -06:00 |
|
|
Wyatt Johnson
|
0a8bfe8a38
|
Merge branch 'master' into 142993479-tags
|
2017-05-12 07:54:46 -06:00 |
|
|
Wyatt Johnson
|
e2f6d5989a
|
Merge branch 'master' into 142993479-tags
|
2017-05-12 07:49:02 -06:00 |
|
|
Chi Vinh Le
|
95a7a1ca47
|
Rename registry
|
2017-05-12 20:15:04 +07: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 |
|
|
Wyatt Johnson
|
a65d045c65
|
lint fixes
|
2017-05-11 17:38:49 -06:00 |
|
|
Wyatt Johnson
|
08e7a90d69
|
lint fixes
|
2017-05-11 17:34:47 -06:00 |
|
|
gaba
|
3b80ee8b13
|
Add YAML loader. Fix i18n module to get YAML files.
|
2017-05-11 15:05:09 -07:00 |
|
|
Riley Davis
|
14b483d089
|
create roles helper
|
2017-05-11 14:23:02 -06:00 |
|
|
Benjamin GoeringandGitHub
|
923e20f867
|
Merge branch 'master' into edit-comment
|
2017-05-11 10:42:41 -07:00 |
|
|
Benjamin Goering
|
cd7b1f2b2b
|
editComment mutation doesn't refetch streamQuery. Instead a reducer updates streamQuery client-side
|
2017-05-11 10:38:48 -07:00 |
|
|
gaba
|
653091fdf9
|
Merge branch 'master' into i18n-refactor
|
2017-05-11 09:02:21 -07:00 |
|
|
Belen Curcio
|
57d2b81b05
|
missing _
|
2017-05-10 16:05:52 -03:00 |
|
|
Belen Curcio
|
74ffc00c20
|
Adding changes
|
2017-05-10 15:02:43 -03:00 |
|
|
Belen Curcio
|
8c219c1c4d
|
Adding config with initial
|
2017-05-09 15:53:57 -03:00 |
|
|
gaba
|
da0cebbda7
|
Fix the plugin TagLabel to show the staff tag.
|
2017-05-08 17:06:49 -07:00 |
|
|
gaba
|
7c09902294
|
The name for the tag is called ID.
|
2017-05-08 16:55:11 -07:00 |
|
|
Chi Vinh Le
|
57e7396997
|
Use correct fragment name
|
2017-05-09 02:58:50 +07:00 |
|
|
Chi Vinh Le
|
80d08bbe2e
|
Port StopIgnoringUser Mutation
|
2017-05-09 02:50:52 +07:00 |
|
|
Chi Vinh Le
|
5c44922d2b
|
Port IgnoreUser mutation
|
2017-05-09 02:46:42 +07:00 |
|
|
Chi Vinh Le
|
774a6f68ac
|
Port RemoveCommentTag Mutation
|
2017-05-09 02:22:44 +07:00 |
|
|
Chi Vinh Le
|
b87c36078a
|
Port AddCommentTag Mutation
|
2017-05-09 02:19:55 +07:00 |
|
|
Chi Vinh Le
|
0e931d023d
|
Port DeleteAction Mutation
|
2017-05-09 01:15:07 +07: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
|
83ef41000c
|
Port PostDontAgree mutation
|
2017-05-08 22:56:01 +07:00 |
|
|
Chi Vinh Le
|
10796ed4b3
|
Port PostFlag mutation
|
2017-05-08 22:35:59 +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 |
|
|
Benjamin Goering
|
81879c9bb9
|
Move getEditableUntilDate into util file
|
2017-05-08 00:05:14 -07:00 |
|
|
Benjamin Goering
|
a7099295d6
|
CountdownSeconds component has its own file
|
2017-05-07 23:47:59 -07:00 |
|
|
Benjamin Goering
|
3d8c521928
|
CommentForm component is in its own file
|
2017-05-07 23:44:41 -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 |
|
|
Benjamin Goering
|
0ba973fb44
|
editComment returns status of comment after edit. UI shows appropriate notifications if PREMOD or REJECTED
|
2017-05-03 18:05:06 -07:00 |
|
|
Benjamin Goering
|
3ac8f09619
|
Notify on unexpected error when saving edit changes
|
2017-05-03 17:31:36 -07:00 |
|
|
Benjamin Goering
|
ab9c2a89b7
|
Edit Window countdown is bold when < 10 seconds left
|
2017-05-03 17:27:36 -07:00 |
|
|
Benjamin Goering
|
e31961716e
|
Remove done todo comments
|
2017-05-03 17:14:36 -07:00 |
|
|
Benjamin Goering
|
b83381719c
|
Style editCommentWindow messages and i18n
|
2017-05-03 15:37:02 -07:00 |
|
|
Benjamin Goering
|
92fd146a8c
|
Add cancel button to editing CommentForm
|
2017-05-03 14:22:15 -07:00 |
|