wassname/talk
1
0
Fork 0
mirror of https://github.com/wassname/talk.git synced 2026-07-08 21:35:38 +08:00
Code Issues Packages Projects Releases Wiki Activity
6,802 Commits 10 Branches 125 Tags
1df48e27f10c7544ee478d364a1a202f0d33db3d
Commit Graph

6802 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kim Gardner 1df48e27f1 Fix merge conflicts 2017-10-19 11:45:59 +01:00
Kim Gardner 5da8475806 Merge pull request #1115 from coralproject/settings-fix 
Setup fixes
 2017-10-18 23:21:57 +01:00
Wyatt Johnson 1dea6267d7 fixes to the toObject, added test 2017-10-18 16:07:20 -06:00
Kim Gardner a1ee09ad9b Merge pull request #1113 from coralproject/snyk 
Replacing Snyk with NSP
 2017-10-18 22:22:18 +01:00
Wyatt Johnson ae09d5c72e replaced snyk with nsp 2017-10-18 15:09:19 -06:00
Wyatt Johnson 2965877346 fix issues detected by snyk 2017-10-18 14:57:54 -06:00
Wyatt Johnson 0b9c058ad8 fixed package.json/yarn.lock 2017-10-18 14:53:51 -06:00
Wyatt Johnson 5657fde7dc Merge branch 'master' into e2e-browserstack 2017-10-18 13:25:59 -06:00
Wyatt Johnson a69dd02e52 adjusted the circle.yml 2017-10-18 13:16:21 -06:00
Kim Gardner b4865546d4 Merge pull request #1112 from coralproject/my-profile-tab-fix 
Load username from graph and not auth
 2017-10-18 19:31:07 +01:00
Wyatt Johnson b97b5e97f2 load username from graph and not auth 2017-10-18 12:23:16 -06:00
Kiwi f06e171def Merge branch 'master' into e2e-browserstack 2017-10-18 18:45:22 +02:00
Kiwi 9930bf5e7a Merge pull request #1111 from coralproject/snyk-fix-3586ed18 
[Snyk] Fix for 1 vulnerable dependency path
 2017-10-18 18:45:03 +02:00
snyk-bot 2227ec423f fix: package.json & .snyk to reduce vulnerabilities 
The following vulnerabilities are ignored:
- https://snyk.io/vuln/npm:tunnel-agent:20170305

Latest report for coralproject/talk:
https://snyk.io/test/github/coralproject/talk
 2017-10-18 16:36:12 +00:00
Chi Vinh Le 8fafa93cf5 Fix package.json 2017-10-18 23:35:54 +07:00
Chi Vinh Le 2991fe4ca5 Pingelig 2017-10-18 23:27:46 +07:00
Chi Vinh Le 1126ab48ad Add edge version to comment 2017-10-18 23:26:16 +07:00
Chi Vinh Le 91f6c5a088 Remove edge from ci testing 2017-10-18 23:24:46 +07:00
Chi Vinh Le c8325c91a4 Merge branch 'master' into e2e-browserstack 
Conflicts:
	package.json
 2017-10-18 23:23:47 +07: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
Kiwi fb82ef7faf Merge pull request #1110 from coralproject/snyk-fix-d774546f 
[Snyk] Fix for 4 vulnerable dependency paths
 2017-10-18 17:58:20 +02:00
snyk-bot b362da56ab fix: package.json & .snyk to reduce vulnerabilities 
The following vulnerabilities are ignored:
- https://snyk.io/vuln/npm:marked:20170907
- https://snyk.io/vuln/npm:shelljs:20140723

Latest report for coralproject/talk:
https://snyk.io/test/github/coralproject/talk
 2017-10-18 15:49:54 +00: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
Belén Curcio 627ae50fda Merge branch 'master' into e2e-browserstack 2017-10-18 09:02:00 -03:00
Belen Curcio 367c2df3da Modifying test conf 2017-10-18 08:53:25 -03:00
Belen Curcio 14a8fcd475 Removing test output 2017-10-18 08:51:38 -03:00
Kim Gardner 82d0d427ec Merge pull request #1101 from coralproject/bump-version-3-7-0 
Update version 3.7.0
 2017-10-18 11:12:47 +01:00
Belen Curcio 2c757e9d57 Missing classes 2017-10-17 15:18:53 -03:00
Belen Curcio 8633a0f457 Missing classes 2017-10-17 14:54:06 -03:00
Chi Vinh Le a7b33fdc3e Typos 2017-10-17 22:49:03 +07:00
Chi Vinh Le ce131dd067 Run all browsers before failing 2017-10-17 22:48:00 +07:00
Chi Vinh Le afb591d990 Quote path 2017-10-17 22:29:31 +07:00
Chi Vinh Le fac0f53ea8 Sort reports by browser 2017-10-17 22:24:45 +07:00
Chi Vinh Le 89feea70fd Only run browserstack on master 2017-10-17 22:22:54 +07:00
Chi Vinh Le 77dae9922c Integrate reports with circle ci 2017-10-17 21:59:50 +07:00
Chi Vinh Le 427c6e10a4 Integrate browserstack into ci 2017-10-17 21:38:50 +07:00
Chi Vinh Le 30fe43624f Use better env names 2017-10-17 20:53:50 +07:00
Chi Vinh Le 2723be2eb9 Integrate local e2e in CI 2017-10-17 20:10:38 +07:00
Chi Vinh Le 1542888080 yarn e2e-local is now e2e, add new yarn e2e-browserstack 2017-10-17 19:34:55 +07:00
Chi Vinh Le 3a58088420 Fix paths, add headless env 2017-10-17 19:29:46 +07:00
Chi Vinh Le db91e2a27a Env test for e2e-local 2017-10-17 18:54:53 +07: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 94f0205d9c Unused config 2017-10-16 22:31:40 +07:00
Chi Vinh Le f38e718373 First isolated e2e 2017-10-16 22:27:49 +07:00
Kim Gardner 840f3f7145 Merge branch 'master' into bump-version-3-7-0 2017-10-14 17:46:21 +01:00