wassname/talk
1
0
Fork 0
mirror of https://github.com/wassname/talk.git synced 2026-07-18 12:40:13 +08:00
Code Issues Packages Projects Releases Wiki Activity
6,834 Commits 10 Branches 125 Tags
1803c740fcce99a6bca45cad46ee274d2a7324be
Commit Graph
6834 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
KiwiandGitHub 1803c740fc Merge branch 'master' into bulk-approve-reject-actions 2017-10-23 19:29:24 +02:00
Kim GardnerandGitHub 4ae9928224 Merge pull request #1121 from coralproject/config-fix 
Config Fix
 2017-10-23 16:58:36 +01:00
Wyatt Johnson dae8dc0509 patched config bug 2017-10-23 09:51:34 -06:00
Kim GardnerandGitHub 017d560421 Merge branch 'master' into bulk-approve-reject-actions 2017-10-23 15:52:20 +01:00
Facu 9c38bab83b notify error messages 2017-10-20 17:01:52 -03:00
Kim GardnerandGitHub 88390f13c7 Merge pull request #1119 from coralproject/turn-off-flagged-edited-notification 
Turn off notifications for comments flagged and edited
 2017-10-20 17:02:04 +01:00
Chi Vinh Le 7e709ec41d Merge branch 'turn-off-flagged-edited-notification' of ssh://github.com/coralproject/talk into turn-off-flagged-edited-notification 2017-10-20 17:56:07 +02:00
Chi Vinh Le 1bfecdd77c Don't show notification when featuring comment 2017-10-20 17:55:37 +02:00
KiwiandGitHub c054992741 Merge branch 'master' into turn-off-flagged-edited-notification 2017-10-20 17:33:09 +02:00
Kim GardnerandGitHub 12b83d3904 Merge pull request #1120 from coralproject/disable-ie-e2e 
Temporarily disable IE in browserstack ci
 2017-10-20 16:30:27 +01:00
Chi Vinh Le 5695599f74 Temporarily disable IE in browserstack ci 2017-10-20 17:23:31 +02:00
Chi Vinh Le bef3e3e33c Turn off notifications for flagged and edited 2017-10-20 17:19:44 +02:00
KiwiandGitHub 8dbd1789e0 Merge pull request #1118 from coralproject/improve-e2e 
Disable network logging
 2017-10-20 15:01:03 +02:00
Chi Vinh Le ee548d7180 Disable network logging 2017-10-20 14:45:12 +02:00
FacuandGitHub 011d8830fb Merge branch 'master' into bulk-approve-reject-actions 2017-10-19 14:12:08 -03:00
Kim GardnerandGitHub 5713e2e2f6 Merge pull request #1116 from coralproject/no-comments 
No Comments Text
 2017-10-19 16:16:21 +01:00
Belen Curcio f23a5132d6 Missing proptypes 2017-10-19 11:35:40 -03:00
Belen Curcio 101b6cbe59 Missing proptypes 2017-10-19 11:26:22 -03:00
Belen Curcio 7494752019 Translations, Proptypes, NoComments Component 2017-10-19 11:20:09 -03:00
Belen Curcio 11999d751a No inline styling 2017-10-19 11:01:27 -03:00
Belen Curcio 2a85b9fdd2 Adding missing proptypes 2017-10-19 10:58:24 -03:00
Belen Curcio fdddd5f8af Adding missing proptypes 2017-10-19 10:44:17 -03:00
Kim GardnerandGitHub 2a8dc3b506 Merge pull request #1090 from coralproject/e2e-browserstack 
E2e browserstack
 2017-10-19 11:58:53 +01:00
Kim GardnerandGitHub bceebca39f Merge branch 'master' into bulk-approve-reject-actions 2017-10-19 11:48:58 +01:00
Kim Gardner 1df48e27f1 Fix merge conflicts 2017-10-19 11:45:59 +01:00
Kim GardnerandGitHub 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 GardnerandGitHub 3a18cd88ad Merge branch 'master' into bulk-approve-reject-actions 2017-10-18 22:42:31 +01:00
Kim GardnerandGitHub 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 JohnsonandGitHub 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 GardnerandGitHub 71cf565018 Merge branch 'master' into bulk-approve-reject-actions 2017-10-18 19:57:28 +01:00
Kim GardnerandGitHub 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
Belén CurcioandGitHub 0265b9bc56 Merge branch 'master' into bulk-approve-reject-actions 2017-10-18 14:05:19 -03:00
KiwiandGitHub f06e171def Merge branch 'master' into e2e-browserstack 2017-10-18 18:45:22 +02:00
KiwiandGitHub 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
KiwiandGitHub 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