 gaba
|
adacafb586
|
Removed extra string.
|
2017-05-23 12:59:06 -04:00 |
|
|
gaba
|
f525af4c6e
|
Added a few more translations that were missing.
|
2017-05-19 15:42:56 -07:00 |
|
|
gaba
|
97e9419f02
|
Missing translations.
|
2017-05-19 13:34:56 -07:00 |
|
|
gaba
|
67fb829717
|
A few more issues from the merge.
|
2017-05-19 13:29:23 -07:00 |
|
|
gaba
|
625362d51e
|
Merge branch 'master' into i18n-refactor
|
2017-05-19 12:44:34 -07:00 |
|
|
gaba
|
9be443eda8
|
Moves i18n into coral-framework.
|
2017-05-19 12:28:44 -07:00 |
|
|
gaba
|
88b5a4169d
|
Remove promise
|
2017-05-19 10:48:47 -07: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 |
|
|
gaba
|
12cb59ce30
|
Merge branch 'master' into i18n-refactor
|
2017-05-18 15:44:14 -07:00 |
|
|
Kim GardnerandGitHub
|
12ec058588
|
Merge branch 'master' into edit-comment-settings
|
2017-05-18 17:07:37 -04:00 |
|
|
Chi Vinh Le
|
061c18670b
|
Merge branch 'master' into suspend-user
Conflicts:
client/coral-admin/src/constants/moderation.js
client/coral-admin/src/containers/ModerationQueue/ModerationContainer.js
|
2017-05-19 02:19:24 +07:00 |
|
|
Chi Vinh Le
|
f641a3ec40
|
Complete suspend user implementation
|
2017-05-19 01:52:03 +07:00 |
|
|
Kim GardnerandGitHub
|
e80e79f267
|
Merge branch 'master' into edit-comment-settings
|
2017-05-18 14:23:14 -04:00 |
|
|
riley
|
ff75b9474a
|
merge master
|
2017-05-18 12:18:00 -06:00 |
|
|
Benjamin GoeringandGitHub
|
1d322d8c70
|
Merge branch 'master' into fix-ignore-user
|
2017-05-18 10:50:00 -07:00 |
|
|
Benjamin Goering
|
aaa2da6c23
|
Stream container refetch then setCommentCountCache to asset.commentCount instead of silly zero
|
2017-05-18 10:43:38 -07:00 |
|
|
Wyatt Johnson
|
12713dae86
|
Removed unused assets
|
2017-05-18 11:18:08 -06:00 |
|
|
Benjamin Goering
|
fb33eefe8e
|
trivial changes requested by review
|
2017-05-18 08:19:52 -07:00 |
|
|
Benjamin Goering
|
6bbeee3a6b
|
StopIgnoringUser does not refetch EmbedQuery
|
2017-05-18 08:11:39 -07:00 |
|
|
Benjamin Goering
|
340d3cea62
|
contains/Stream setCommentCountCache waits for refetch promise
|
2017-05-18 08:10:20 -07:00 |
|
|
Benjamin Goering
|
d93ad38dd1
|
Admins can change Edit Comment Window length in Moderation Settings
|
2017-05-17 15:39:19 -07:00 |
|
|
Benjamin Goering
|
9eac05c8fb
|
Ignored user tombstones work again
|
2017-05-17 13:18:59 -07:00 |
|
|
gaba
|
3aceb0dc38
|
Merge branch 'master' into i18n-refactor
|
2017-05-17 12:59:24 -07:00 |
|
|
gaba
|
5bd9bc992b
|
Move i18n into a service
|
2017-05-17 12:53:36 -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 |
|
|
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 |
|
|
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 |
|
|
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 |
|