wassname/talk
1
0
Fork 0
mirror of https://github.com/wassname/talk.git synced 2026-07-04 02:29:15 +08:00
Code Issues Packages Projects Releases Wiki Activity
6,818 Commits 10 Branches 125 Tags
7e709ec41dd07e8f00bb0f7e2ee968d3dc6dee43
Commit Graph

259 Commits

Author SHA1 Message Date
Kim Gardner 1df48e27f1 Fix merge conflicts 2017-10-19 11:45:59 +01:00
Wyatt Johnson 1dea6267d7 fixes to the toObject, added test 2017-10-18 16:07:20 -06:00
Chi Vinh Le 039c1b82d1 Merge branch 'e2e-browserstack' of ssh://github.com/coralproject/talk into e2e-browserstack 2017-10-18 23:18:09 +07:00
Chi Vinh Le 4fbb0678e0 Stabilize browserstack testing 2017-10-18 23:17:14 +07:00
Belen Curcio 86e5e5e955 Adding wait for a button selector 2017-10-18 09:19:32 -03:00
Belen Curcio c3b2eb5a98 Using respect instead of like reaction 2017-10-18 09:17:05 -03:00
Belen Curcio 14a8fcd475 Removing test output 2017-10-18 08:51:38 -03:00
Chi Vinh Le 5197cab2b4 Add tags 2017-10-17 18:26:43 +07:00
Chi Vinh Le 8cf04c5c66 Use sections for install e2e 2017-10-17 16:58:50 +07:00
Chi Vinh Le 7ffc7a76f5 Unify names 2017-10-17 16:15:53 +07:00
Chi Vinh Le 343f009150 Refactor serve 2017-10-17 15:57:34 +07:00
Chi Vinh Le f38e718373 First isolated e2e 2017-10-16 22:27:49 +07:00
Belen Curcio 70d92978c0 Adding admin tests 2017-10-13 21:14:27 -03:00
Belen Curcio da8dee175d Adding admin tests 2017-10-13 21:07:58 -03:00
Belen Curcio 316971302b Using testData from Install 2017-10-13 21:07:39 -03:00
Belen Curcio 703fabf586 Adding globals 2017-10-13 21:06:56 -03:00
Belen Curcio 54971f37ad Adding Install tests 2017-10-13 10:54:26 -03:00
Belén Curcio d8bce3f4ce Merge branch 'master' into e2e-browserstack 2017-10-13 08:07:21 -03:00
Belen Curcio 233bc68128 Merge branch 'master' of github.com:coralproject/talk into e2e-browserstack 2017-10-13 08:02:58 -03:00
Wyatt Johnson 5e74a044f3 Merge branch 'master' into cannot-ignore-staff 2017-10-12 15:38:18 -06:00
Chi Vinh Le 24d73b2770 Use page objects + one more test 2017-10-12 21:56:56 +07:00
Wyatt Johnson 86f48cea96 Modified user search to include whole word search 2017-10-11 16:41:09 -06:00
Chi Vinh Le e4399b734e Use TALK_ROOT_URL, global timeout, other improvements 2017-10-11 21:02:46 +07:00
Chi Vinh Le 3abbe3119d E2e with nightwatch and browserstack 2017-10-11 19:50:13 +07:00
Kim Gardner dcfdec4df1 Merge branch 'master' into cannot-ignore-staff 2017-10-11 09:49:06 +01:00
Chi Vinh Le 3d3e0491a4 Remove updateWordlist and add test 2017-10-09 21:13:47 +07:00
Daniel Janeiro 7eaad1541b Implement cannot ignore staff in users service 
`UsersService.ignoreUsers` now checks if any user provided is a staff
member. In case it is it throws a ErrCannotIgnoreStaff error.
 2017-10-07 23:02:25 +01:00
Chi Vinh Le 14ce9b1e77 relax language 2017-10-03 21:19:19 +07:00
Chi Vinh Le c1f7ef4f32 Introduce Jest Unit Testing framework 2017-10-03 21:08:02 +07:00
Chi Vinh Le d396f43fe3 Merge branch 'master' into use-talk-linting-preset 
Conflicts:
	package.json
 2017-09-29 23:55:33 +07:00
Chi Vinh Le 8c05e3df87 Use eslint-config-talk preset 2017-09-26 19:35:24 +07:00
Wyatt Johnson 825e1b5e5c Fixes to password reset flow 2017-09-25 14:50:33 -06:00
Wyatt Johnson f97094177a revamped configuration for moderation phases 2017-09-15 14:23:18 -06:00
Chi Vinh Le dc7013187d Merge branch 'master' into story/150636425 2017-09-15 19:11:31 +07:00
Wyatt Johnson b3eb3361bb Merge branch 'master' into new-regexp-highlighter 2017-09-14 08:47:40 -06:00
Chi Vinh Le c41ab58109 Allow Moderator to have read access on assets and settings 2017-09-14 21:11:40 +07:00
Chi Vinh Le ad361413c7 Reimplement wordlist on server using same regexp solution 2017-09-14 17:36:04 +07:00
Wyatt Johnson 49f09b87a0 Added new SYSTEM_WITHHELD comment status 2017-09-11 11:09:21 -06:00
Wyatt Johnson d20bd20005 linting 2017-09-08 15:46:04 -06:00
Wyatt Johnson ce3e29813b implemented status switch when mismatched 2017-09-08 15:41:43 -06:00
Chi Vinh Le f1c5d479ad Merge branch 'master' into feature/talk-plugin-toxic-comments 
Conflicts:
	graph/resolvers/root_mutation.js
	graph/typeDefs.graphql
 2017-09-07 16:59:46 +07:00
Wyatt Johnson e96e9c0d5c Fixed old story search query 2017-09-06 09:18:22 -06:00
Chi Vinh Le 6f82fd76f5 First draft of toxic-comments 2017-09-06 22:11:48 +07:00
Wyatt Johnson 997a336483 Merge branch 'master' into asset-graph-api 2017-09-05 08:56:49 -06:00
Kim Gardner 53871cb2c6 Merge branch 'master' into settings-graph-api 2017-09-04 11:33:59 +01:00
Wyatt Johnson 4dbcc65126 Merge branch 'master' into asset-graph-api 2017-08-31 11:57:50 -06:00
Wyatt Johnson f0dcef7b37 finished connection, improved graph 2017-08-30 14:23:47 -06:00
Wyatt Johnson 8f3bfd2bd4 Replaced node_redis with ioredis 2017-08-29 17:52:29 -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