 Wyatt Johnson
|
ec285dc87a
|
Merge branch 'master' into docs
|
2018-02-22 15:40:06 -07:00 |
|
|
Wyatt Johnson
|
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 Johnson
|
8c9bf5d4c8
|
Merge branch 'master' into workspaces
|
2018-02-22 14:10:33 -07:00 |
|
|
Wyatt Johnson
|
fa96531eab
|
Merge pull request #1373 from kitwestneat/plugin-google-auth
add Google auth plugin
|
2018-02-22 14:05:43 -07:00 |
|
|
Wyatt Johnson
|
2aa043d39a
|
Merge branch 'master' into plugin-google-auth
|
2018-02-22 10:09:35 -07:00 |
|
|
Kim Gardner
|
03fe54c68e
|
Merge branch 'master' into workspaces
|
2018-02-22 12:06:00 -05:00 |
|
|
Kim Gardner
|
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
|
4d943629d9
|
Rm accident added file
|
2018-02-22 10:47:13 +01:00 |
|
|
Chi Vinh Le
|
7dd63dc812
|
Fix CI
|
2018-02-22 10:38:18 +01:00 |
|
|
Wyatt Johnson
|
60af5135ca
|
Merge branch 'master' into plugin-google-auth
|
2018-02-21 09:50:30 -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 |
|
|
Wyatt Johnson
|
7e2e29c947
|
updated config
|
2018-02-20 17:57:40 -07:00 |
|
|
Wyatt Johnson
|
7404962741
|
embedded graph docs into static docs
|
2018-02-20 15:59:44 -07:00 |
|
|
Kim Gardner
|
8080994975
|
Merge branch 'master' into refactor-profile
|
2018-02-20 15:14:12 -05:00 |
|
|
Kim Gardner
|
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 Johnson
|
2bb56290c4
|
fixed bug in template
|
2018-02-20 12:40:24 -07:00 |
|
|
Kiwi
|
6a5c643ef2
|
Merge branch 'master' into refactor-profile
|
2018-02-20 19:57:59 +01:00 |
|
|
Wyatt Johnson
|
22ee7b1d34
|
fixed docs
|
2018-02-20 11:34:26 -07:00 |
|
|
Kim Gardner
|
234c705f35
|
Merge branch 'master' into account-h-until
|
2018-02-20 12:47:16 -05:00 |
|
|
Wyatt Johnson
|
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 |
|
|
Kiwi
|
a7e9936671
|
Merge branch 'master' into refactor-profile
|
2018-02-20 18:24:18 +01:00 |
|
|
Belén Curcio
|
9617948493
|
Merge branch 'master' into account-h-until
|
2018-02-20 14:03:22 -03:00 |
|
|
Wyatt Johnson
|
7129896bd6
|
Merge branch 'master' into bump-version-4-2-2
|
2018-02-20 09:57:12 -07:00 |
|
|
Wyatt Johnson
|
e2e718494c
|
Merge pull request #1387 from coralproject/action-fixes
Action Count Fixes
|
2018-02-20 09:57:05 -07:00 |
|
|
Kim Gardner
|
f918bbea20
|
Update version to 4.2.2
|
2018-02-20 11:45:36 -05:00 |
|
|
Wyatt Johnson
|
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 Gardner
|
34922a6d42
|
Merge branch 'master' into account-h-until
|
2018-02-20 10:56:40 -05:00 |
|
|
Kim Gardner
|
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 Gardner
|
c4cdc672b7
|
Merge branch 'master' into user-tooltip-style
|
2018-02-20 10:44:15 -05:00 |
|
|
Kim Gardner
|
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 Gardner
|
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 Gardner
|
4b134cbfc2
|
Merge branch 'master' into facebook-translations
|
2018-02-20 10:34:22 -05:00 |
|
|
Kim Gardner
|
c446098a1e
|
Merge branch 'master' into user-tooltip-style
|
2018-02-20 10:24:00 -05:00 |
|
|
Kim Gardner
|
a9e8f390b8
|
Merge branch 'master' into plugin-google-auth
|
2018-02-20 10:23:05 -05:00 |
|
|
Kim Gardner
|
b26e938ac5
|
Merge pull request #1381 from leeeandroo/package-version421
set a right last release 4.2.1 to package.json
|
2018-02-20 10:22:09 -05:00 |
|
|
Chi Vinh Le
|
0ca8b978a1
|
Implement profile settings
|
2018-02-20 13:21:02 +01:00 |
|
|
okbel
|
846df0a5e0
|
trim dates, style tooltip
|
2018-02-19 12:27:55 -03:00 |
|
|
okbel
|
e7934d9468
|
trim dates, style tooltip
|
2018-02-19 12:23:36 -03:00 |
|
|
okbel
|
12497a1331
|
Adding duration asHours and asDays
|
2018-02-19 12:07:57 -03:00 |
|
|
Chi Vinh Le
|
45dde4636d
|
Merge branch 'master' into refactor-profile
|
2018-02-19 16:06:42 +01:00 |
|
|
Chi Vinh Le
|
8c2070e345
|
Refactor Profile
|
2018-02-19 16:04:43 +01:00 |
|
|
Leandro
|
606d5734f9
|
set a right last release 4.2.1 to package.json
|
2018-02-19 11:18:56 +01:00 |
|
|
Leandro
|
87ff631eed
|
fix translations keys and add germna translations to facebook plugin
|
2018-02-19 09:50:07 +01:00 |
|
|
Kim Gardner
|
43d4db085b
|
Merge branch 'master' into plugin-google-auth
|
2018-02-16 19:22:02 -05:00 |
|
|
Kim Gardner
|
950efba3fe
|
Merge pull request #1378 from coralproject/suspension-fix
Suspension Button Fix
v4.2.1
|
2018-02-16 18:27:48 -05:00 |
|