Commit Graph

8345 Commits

Author SHA1 Message Date
Wyatt Johnson 53c32518b4 Merge branch 'master' into paginate-flagged-users 2017-08-30 14:14:45 -06:00
Kiwi 9d08dc2490 Merge branch 'master' into ioredis 2017-08-30 21:52:30 +02:00
Chi Vinh Le e5c385ae21 Use correct event name in queries 2017-08-31 02:05:00 +07:00
Belén Curcio 5e5e0028c9 Merge pull request #904 from coralproject/exclude-ignored-fc
Exclude Ignored users in Featured Comments Plugin
2017-08-30 16:01:36 -03:00
Belen Curcio cb7e7eae97 Using a variable 2017-08-30 15:45:25 -03:00
Belen Curcio e98432b17e Exclude Ignored 2017-08-30 15:35:52 -03:00
Chi Vinh Le 5434413308 Use fetchPolicy network-only 2017-08-30 23:47:48 +07:00
Chi Vinh Le 8b4f21ff4c Remove extra long transition timeout :-D 2017-08-30 23:27:48 +07:00
Chi Vinh Le 4072c39f05 Merge branch 'master' into paginate-flagged-users
Conflicts:
	client/coral-admin/src/routes/Community/components/FlaggedAccounts.js
	client/coral-admin/src/routes/Community/components/User.js
	client/coral-admin/src/routes/Community/containers/Community.js
	graph/loaders/users.js
2017-08-30 22:56:30 +07:00
Chi Vinh Le 9b9476d44f Add todos 2017-08-30 22:51:16 +07:00
Wyatt Johnson 2e72fec4d7 Merge branch 'master' into ioredis 2017-08-30 09:34:14 -06:00
Chi Vinh Le 1f489ff0e5 Always refetch when switching to FlaggedAccounts 2017-08-30 22:30:53 +07:00
Chi Vinh Le f582cc2534 Add transition effect 2017-08-30 22:25:03 +07:00
Kim Gardner a2fdc11451 Fix merge conflict 2017-08-30 16:23:17 +01:00
Wyatt Johnson a2536eb41b updated pubsub 2017-08-30 09:06:48 -06:00
Chi Vinh Le c66fb053e7 Implement mutation updators 2017-08-30 21:40:28 +07:00
Chi Vinh Le 797f0fd0e3 Docs in schema 2017-08-30 21:05:03 +07:00
Chi Vinh Le 02ec1f69ee More graphql fixes 2017-08-30 20:42:13 +07:00
Chi Vinh Le 37638cab86 Fix center styling 2017-08-30 20:41:49 +07:00
Chi Vinh Le 4ce6206516 Add deprecation and refactor notices to legacy styles 2017-08-30 19:56:24 +07:00
Chi Vinh Le 67b0624c90 Refactor styles 2017-08-30 19:48:54 +07:00
Chi Vinh Le 9348985191 Refactor into a ComponentClass 2017-08-30 19:04:30 +07:00
Chi Vinh Le 0df7df9dd6 Wrap ul before li 2017-08-30 19:03:55 +07:00
Chi Vinh Le ffab9ca8d5 Refactor users query 2017-08-30 18:48:20 +07:00
Kim Gardner 6b15c335b5 Merge branch 'master' into settings-graph-api 2017-08-30 12:36:09 +01:00
Kim Gardner c246caa520 Merge branch 'master' into asset-graph-api 2017-08-30 12:36:03 +01:00
Kim Gardner b21eae78b0 Merge pull request #900 from coralproject/cli-fixes
Fixed errors when launching not-defined commands
2017-08-30 11:50:34 +01:00
Wyatt Johnson 8f3bfd2bd4 Replaced node_redis with ioredis 2017-08-29 17:52:29 -06:00
Wyatt Johnson 27661a9294 fixed errors when launching not-defined commands 2017-08-29 14:15:05 -06:00
Wyatt Johnson 8ca32c5808 added missing fields 2017-08-29 13:54:14 -06:00
Wyatt Johnson 5a48705d49 Merge branch 'master' into settings-graph-api 2017-08-29 13:44:20 -06:00
Wyatt Johnson 173c257126 Added Graph API for Settings 2017-08-29 13:43:48 -06:00
Kiwi 9e65f1b00d Merge branch 'master' into asset-graph-api 2017-08-29 21:04:30 +02:00
Kim Gardner 2c3f5385ae Merge pull request #898 from coralproject/bump-version
Update version to 3.4.0
2017-08-29 19:31:42 +01:00
Wyatt Johnson 7bedfefecb Merge branch 'master' into bump-version 2017-08-29 12:10:56 -06:00
Wyatt Johnson 5ab78491b5 Merge pull request #890 from coralproject/lint-upgrade
Upgraded/pruned deps, applied linting fixes
2017-08-29 12:10:47 -06:00
Kim Gardner a83261397d Update version to 3.4.0 2017-08-29 19:06:46 +01:00
Wyatt Johnson c8d1871418 Merge branch 'master' into lint-upgrade 2017-08-29 11:56:59 -06:00
Kim Gardner bf7dfefcdf Merge branch 'master' into asset-graph-api 2017-08-29 18:52:17 +01:00
Kim Gardner 081cdfa145 Merge pull request #897 from coralproject/sort-enhancements
Sort enhancements
2017-08-29 18:50:34 +01:00
Kiwi fecfcf91ef Merge branch 'master' into sort-enhancements 2017-08-29 19:39:59 +02:00
Chi Vinh Le 90a0446afa Move Spinner down to replacing TabContent 2017-08-30 00:35:55 +07:00
Kim Gardner ec5c7f32b0 Merge pull request #895 from coralproject/my-comment-reactions
My comment reactions
2017-08-29 18:32:54 +01:00
Chi Vinh Le 21e4cf5865 Live update replies on all sort and always refetch 2017-08-30 00:27:14 +07:00
Kim Gardner 6894060648 Merge branch 'master' into my-comment-reactions 2017-08-29 18:24:54 +01:00
Kim Gardner 95d14fc5a6 Merge pull request #896 from coralproject/fix-popup-interval
Fix endless interval
2017-08-29 18:11:58 +01:00
Chi Vinh Le 46c031b35d Fix endless interval 2017-08-29 23:53:00 +07:00
Chi Vinh Le ddced5b8c9 Refactor styling 2017-08-29 23:43:58 +07:00
Wyatt Johnson c786805505 small bug fix 2017-08-29 10:28:30 -06:00
Wyatt Johnson 75125993b9 Added patch for missing action summary type 2017-08-29 10:21:31 -06:00