wassname/talk
1
0
Fork 0
mirror of https://github.com/wassname/talk.git synced 2026-07-23 13:10:20 +08:00
Code Issues Packages Projects Releases Wiki Activity
8,421 Commits 10 Branches 125 Tags
31c643e4ebe4cb1c41585965a5dea9d1feade923
Commit Graph
8421 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Wyatt Johnson 31c643e4eb Merge branch 'master' into events 2018-02-22 16:02:07 -07:00
Wyatt JohnsonandGitHub 011a6e6465 Merge pull request #1390 from coralproject/workspaces 
Yarn Workspaces
 2018-02-22 15:09:32 -07:00
Wyatt Johnson 2485386b45 moved lock file 2018-02-22 14:29:56 -07:00
Wyatt Johnson 5bba2ea0ae updated plugin reconciler, replaced docker commands 2018-02-22 14:27:14 -07:00
Wyatt JohnsonandGitHub 8c9bf5d4c8 Merge branch 'master' into workspaces 2018-02-22 14:10:33 -07:00
Wyatt JohnsonandGitHub fa96531eab Merge pull request #1373 from kitwestneat/plugin-google-auth 
add Google auth plugin
 2018-02-22 14:05:43 -07:00
Wyatt JohnsonandGitHub 2aa043d39a Merge branch 'master' into plugin-google-auth 2018-02-22 10:09:35 -07:00
Kim GardnerandGitHub 03fe54c68e Merge branch 'master' into workspaces 2018-02-22 12:06:00 -05:00
Kim GardnerandGitHub 24b3980423 Merge pull request #1383 from coralproject/refactor-profile 
Profile Tab Pane and Profile Settings
 2018-02-22 10:12:54 -05:00
Chi Vinh Le 57b9b2f70e Refactor toggle 2018-02-22 12:10:46 +01:00
Chi Vinh Le 7c676e8926 Implement styling 2018-02-22 11:28:10 +01:00
Chi Vinh Le d268e2d3e4 Fix import path 2018-02-22 10:47:40 +01:00
Chi Vinh Le 15425f3e49 Merge branch 'refactor-profile' into events 2018-02-22 10:47:31 +01:00
Chi Vinh Le 4d943629d9 Rm accident added file 2018-02-22 10:47:13 +01:00
Chi Vinh Le 7ad0575e6d Merge branch 'refactor-profile' into events 2018-02-22 10:39:07 +01:00
Chi Vinh Le 60620951cf Merge branch 'events' of ssh://github.com/coralproject/talk into events 2018-02-22 10:39:02 +01:00
Chi Vinh Le 7dd63dc812 Fix CI 2018-02-22 10:38:18 +01:00
Chi Vinh Le b79a07275f Rename fragment 2018-02-22 10:24:44 +01:00
Wyatt Johnson 9098537838 removed console.log 2018-02-21 12:42:30 -07:00
Wyatt Johnson ab7cfffa50 improved mailer 2018-02-21 12:40:37 -07:00
Wyatt Johnson eb86fdbd11 mail cleanup 2018-02-21 11:43:19 -07:00
Chi Vinh Le 9ca237f49d Merge branch 'events' of ssh://github.com/coralproject/talk into events 2018-02-21 18:06:02 +01:00
Chi Vinh Le 6935330536 Implemented notification frontend functionality 2018-02-21 18:03:46 +01:00
Wyatt JohnsonandGitHub 60af5135ca Merge branch 'master' into plugin-google-auth 2018-02-21 09:50:30 -07:00
Wyatt Johnson cb266e651b spelling 2018-02-20 21:47:16 -07:00
Wyatt JohnsonandGitHub b6fa8b92a1 Merge branch 'master' into events 2018-02-20 21:46:41 -07:00
Wyatt Johnson 85f3598e99 added advisory excemption 2018-02-20 21:45:35 -07:00
Wyatt Johnson e5f6188bd2 replaced custom loading with yarn workspaces 2018-02-20 21:39:32 -07:00
Kim GardnerandGitHub 8080994975 Merge branch 'master' into refactor-profile 2018-02-20 15:14:12 -05:00
Kim GardnerandGitHub e8e8b007e3 Merge pull request #1382 from coralproject/account-h-until 
Adding suspension and ban support for duration in hours and days
 2018-02-20 15:13:48 -05:00
Wyatt JohnsonandGitHub 9426f280cc Update router.js 2018-02-20 12:27:47 -07:00
KiwiandGitHub 6a5c643ef2 Merge branch 'master' into refactor-profile 2018-02-20 19:57:59 +01:00
Kim GardnerandGitHub 234c705f35 Merge branch 'master' into account-h-until 2018-02-20 12:47:16 -05:00
Wyatt JohnsonandGitHub 74d38f16ed Merge pull request #1388 from coralproject/bump-version-4-2-2 
Update version to 4.2.2
v4.2.2 		2018-02-20 10:27:14 -07:00
KiwiandGitHub a7e9936671 Merge branch 'master' into refactor-profile 2018-02-20 18:24:18 +01:00
Belén CurcioandGitHub 9617948493 Merge branch 'master' into account-h-until 2018-02-20 14:03:22 -03:00
Wyatt JohnsonandGitHub 7129896bd6 Merge branch 'master' into bump-version-4-2-2 2018-02-20 09:57:12 -07:00
Wyatt JohnsonandGitHub e2e718494c Merge pull request #1387 from coralproject/action-fixes 
Action Count Fixes
 2018-02-20 09:57:05 -07:00
Chi Vinh Le 284009df55 WIP 2018-02-20 17:54:44 +01:00
Kim Gardner f918bbea20 Update version to 4.2.2 2018-02-20 11:45:36 -05:00
Wyatt JohnsonandGitHub 4467f6110f Merge branch 'master' into action-fixes 2018-02-20 09:44:00 -07:00
Wyatt Johnson a166404347 fix for action count null 2018-02-20 09:31:08 -07:00
Kim GardnerandGitHub 34922a6d42 Merge branch 'master' into account-h-until 2018-02-20 10:56:40 -05:00
Kim GardnerandGitHub 3d2f3ebc59 Merge pull request #1384 from coralproject/user-tooltip-style 
Making the User Info Tooltip more readable and friendly
 2018-02-20 10:56:04 -05:00
Kim GardnerandGitHub c4cdc672b7 Merge branch 'master' into user-tooltip-style 2018-02-20 10:44:15 -05:00
Kim GardnerandGitHub b84a488518 Merge pull request #1380 from leeeandroo/facebook-translations 
Fix translations keys and add german translations to facebook plugin
 2018-02-20 10:44:05 -05:00
Kim GardnerandGitHub 8b4b1728bc Merge branch 'master' into account-h-until 2018-02-20 10:38:14 -05:00
Kim Gardner 233c514251 Fix small typo 2018-02-20 10:37:36 -05:00
Kim GardnerandGitHub 4b134cbfc2 Merge branch 'master' into facebook-translations 2018-02-20 10:34:22 -05:00
Kim GardnerandGitHub c446098a1e Merge branch 'master' into user-tooltip-style 2018-02-20 10:24:00 -05:00