ArrisLee c422bc2530 resolve conflicts

2021-09-07 12:02:25 +12:00

..

accessService.js

chore(deps): upgrade eslint and use eslint-plugin (#4989)

2021-08-24 07:34:18 +03:00

backupService.js

UI

2021-04-07 13:21:58 +12:00

customTemplate.js

fix(customtemplate): create from file (#4769)

2021-02-17 16:56:44 +01:00

dockerhubService.js

feat(app): rework private registries and support private registries in kubernetes EE-30 (#5131)

2021-07-14 21:15:21 +12:00

endpointService.js

fix(k8s): add tag ids to request payload for creating local k8s endpoint. EE-1454 (#5577)

2021-09-06 13:46:14 +12:00

groupService.js

chore(project): add prettier for code format (#3645)

2020-04-11 09:54:53 +12:00

legacyExtensionService.js

chore(project): add prettier for code format (#3645)

2020-04-11 09:54:53 +12:00

motdService.js

chore(project): add prettier for code format (#3645)

2020-04-11 09:54:53 +12:00

registryService.js

feat(app): rework private registries and support private registries in kubernetes EE-30 (#5131)

2021-07-14 21:15:21 +12:00

resourceControlService.js

chore(project): add prettier for code format (#3645)

2020-04-11 09:54:53 +12:00

settingsService.js

chore(project): add prettier for code format (#3645)

2020-04-11 09:54:53 +12:00

sslService.js

feat(server): use https by default (#5315) [EE-332]

2021-08-10 07:59:47 +03:00

stackService.js

feat(stack): front end backport changes to CE EE-1199 (#5455)

2021-08-25 14:04:12 +12:00

statusService.js

chore(project): add prettier for code format (#3645)

2020-04-11 09:54:53 +12:00

supportService.js

chore(project): add prettier for code format (#3645)

2020-04-11 09:54:53 +12:00

tagService.js

feat(kubernetes): introduce kubernetes support (#3987)

2020-07-06 11:21:03 +12:00

teamMembershipService.js

chore(project): add prettier for code format (#3645)

2020-04-11 09:54:53 +12:00

teamService.js

chore(project): add prettier for code format (#3645)

2020-04-11 09:54:53 +12:00

templateService.js

feat(app): rework private registries and support private registries in kubernetes EE-30 (#5131)

2021-07-14 21:15:21 +12:00

userService.js

feat(users): add the ability to rename a user (#3884)

2020-06-09 14:42:40 +12:00

webhookService.js

chore(project): add prettier for code format (#3645)

2020-04-11 09:54:53 +12:00