Commit Graph

78 Commits

Author SHA1 Message Date
Kiwi d82932306d Merge branch 'master' into lint-upgrade 2017-08-29 12:47:47 +02:00
Wyatt Johnson 38f98c7c43 Added duplicated comments tests 2017-08-28 16:41:58 -06:00
Wyatt Johnson eb586f217b Upgraded/pruned deps, applied linting fixes 2017-08-28 14:06:54 -06:00
Wyatt Johnson 8a5db167ff changed sort -> sortOrder 2017-08-25 09:59:37 -06:00
Chi Vinh Le 48595a1bbf Merge branch 'master' into user-sort
Conflicts:
	client/coral-admin/src/reducers/moderation.js
	client/coral-embed-stream/src/actions/stream.js
	client/coral-embed-stream/src/components/Stream.js
	client/coral-framework/components/Slot.js
	plugin-api/beta/client/utils/index.js
	test/server/routes/api/account/index.js
2017-08-25 21:55:00 +07:00
Wyatt Johnson 13796fb268 added more test cases 2017-08-24 11:18:17 -06:00
Kim Gardner c733b7760d Merge branch 'master' into banned-words 2017-08-24 17:22:49 +01:00
Chi Vinh Le ddb555e07f Add new sorting variables 2017-08-24 21:30:16 +07:00
Wyatt Johnson 6d8185c33e modified middleware to change AND -> OR, added mod to com pages 2017-08-23 11:52:02 -06:00
Wyatt Johnson a68513227a adjusted tokenizer to use regex based tokenizer instead 2017-08-23 09:54:00 -06:00
Wyatt Johnson 01ed9880f4 comment count optim, prep for sortBy 2017-08-21 15:26:04 -06:00
Wyatt Johnson 7125250cd6 updated tests 2017-08-20 12:54:46 -06:00
Wyatt Johnson 5036a2665a fixes to tests and impl edit hooks 2017-08-20 12:25:22 -06:00
Wyatt Johnson b2e871f4a6 added event for edit to manage reply count 2017-08-19 10:49:50 -06:00
Wyatt Johnson d38dbc87b6 simplified test layout 2017-08-19 10:22:26 -06:00
Chi Vinh Le 6956b4cd31 Remove Tag should keep remaining tags 2017-08-10 18:39:02 +07:00
Chi Vinh Le b972f4305e Correctly determine the status of the asset 2017-08-02 00:04:11 +07:00
Wyatt Johnson a91624bf4b Expanded JWT Capabilities 2017-07-26 15:24:16 +10:00
Wyatt Johnson 745c579b82 Adjust redis to not start during webpack build
- Added new WEBPACK env var which is enabled during yarn build scripts
- Defered redis starting until listen is called
- Moved pubsub to a factory pattern init
- Async/Await'ed the routes
- Moved pubsub handle for routes into middleware
- Adjusted redis cache and job processors to have lazy connection
starting
- Disabled mongo from auto-connecting on require
- Adjusted package redis clients to act as factory singletons instead
2017-07-17 13:34:04 -06:00
Wyatt Johnson 23573501bd Configured redis to flush before each test and changed default test
redis database
2017-07-07 08:57:56 -06:00
Kiwi 55e62b2b22 Merge branch 'master' into edit-name-fix 2017-06-28 16:20:01 +07:00
Chi Vinh Le 270491dc0f Allow editing to the same username in the "create username" flow 2017-06-28 16:08:46 +07:00
Chi Vinh Le c90c177b7c Live update on stream when banned user, suspended user or rejected username 2017-06-27 20:06:27 +07:00
Belén Curcio a31810ddf4 Merge branch 'master' into bug-sweep 2017-06-21 14:43:32 -03:00
Chi Vinh Le f709057933 Require username to be different when editing it 2017-06-21 21:18:28 +07:00
Chi Vinh Le b0079c191b Remove non existant 'truthy' tests 2017-06-21 19:31:55 +07:00
Kim Gardner ba81399707 Merge branch 'master' into pat 2017-06-19 18:03:23 +01:00
Wyatt Johnson 393ad8530a added tests, fixed some services 2017-06-19 08:55:08 -06:00
Belen Curcio 61591a9716 Removing extra log 2017-06-16 16:24:00 -03:00
Belen Curcio 991bdc6089 Updated BE 2017-06-16 16:18:02 -03:00
Wyatt Johnson f929059daf added asset merging + url updates 2017-06-09 13:23:16 -06:00
Belen Curcio 1f261f5216 Fully working 2017-06-08 12:35:42 -03:00
Belen Curcio 63a35cbceb Merge issues 2017-06-07 16:38:36 -03:00
Chi Vinh Le 30d4562383 Refactor pagination 2017-06-01 01:18:41 +07:00
riley ec03c6b48c merge master 2017-05-22 13:10:43 -06:00
Wyatt Johnson 8f219c47a7 Tag server impl 2017-05-19 12:23:53 -06:00
Wyatt Johnson 7a256bdd2b Merge branch 'master' into 142993479-tags 2017-05-17 10:01:58 -06:00
riley 03ce044c53 merge master 2017-05-16 16:33:41 -06:00
Wyatt Johnson ed27209de9 More edit changes 2017-05-12 10:09:25 -06:00
riley e32ab99edf remove hasRoles 2017-05-12 09:57:07 -06:00
Wyatt Johnson f4dfb21e15 reverted pagination work 2017-05-12 09:14:25 -06:00
Wyatt Johnson e2f6d5989a Merge branch 'master' into 142993479-tags 2017-05-12 07:49:02 -06:00
Wyatt Johnson ae5da93730 linting fixes 2017-05-11 17:44:51 -06:00
Wyatt Johnson d497ad3369 initial pagination rewrite, cleanups to comment edit 2017-05-11 17:27:02 -06:00
Wyatt Johnson 0d957bcfb9 Code cleanup related to old tag services 2017-05-11 14:56:36 -06:00
Wyatt Johnson aeaf809a0f Made queries more generic related to tags 2017-05-11 14:42:06 -06:00
Wyatt Johnson 2e1bc8d75a Adjusted query/tag flow 2017-05-09 15:01:01 -06:00
gaba 96cd5197e3 Test was failing as I was not returning an error. 2017-05-08 16:05:40 -07:00
gaba 743a96cd21 Removes debug statements. 2017-05-08 13:12:24 -07:00
gaba c4c0ee79cd Fix tests. 2017-05-08 13:12:24 -07:00