ArrisLee c4e2ca1fb9 resolve conflicts

2021-06-11 14:14:31 +12:00

..

accessService.js

feat(extensions): remove rbac extension (#4157)

2020-08-11 17:41:37 +12: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(docker): show docker pull rate limits (#4666)

2021-03-24 19:27:32 +01:00

endpointService.js

feat(area-endpoints/creation): allow custom Docker socket (#4772) and handle public IP, group and tags for docket sockets (#4798)

2021-03-05 21:44:17 +01: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

fix(registry): #4371 cannot push to quay.io registry (#4868)

2021-03-13 12:47:35 +13: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

stackService.js

resolve conflicts

2021-06-11 14:14:31 +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(custom-templates): introduce custom templates (#3906)

2020-07-07 11:18:39 +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