Commit Graph

1022 Commits

Author SHA1 Message Date
zhong yehong 003d6ccd05 Merge pull request #268 from zhongyehong/master
remove ip address from port mapping command
2017-07-24 15:36:59 +08:00
zhongyh16 7d5ec47dbb remove ip address from port mapping command 2017-07-24 15:33:24 +08:00
Yujian Zhu f987ad2d5b Merge pull request #267 from FirmlyReality/portmapping
Portmapping
2017-07-17 11:32:23 +08:00
zhuyj17 642374082d Remove ports mapping when scaleing in the cluster. 2017-07-17 11:30:21 +08:00
Firmlyzhu a0387fce44 remove proxy & fix some bugs on config.html 2017-07-16 12:24:58 +08:00
zhuyj17 3597ef7b08 Add recovery mode into ports mapping & stop cluster will delete ports mappings. 2017-07-14 13:01:36 +08:00
zhuyj17 05317336de Add Port Mapping 2017-07-10 23:48:06 +08:00
zhong yehong 072e74a658 Merge pull request #266 from zhongyehong/master
Update README.md
2017-07-05 12:48:27 +08:00
zhong yehong 53403b01ee Update README.md 2017-07-05 12:47:57 +08:00
马俊明 f8b4459db8 Merge pull request #265 from JimmyMa520/master
update docklet-arch.png
2017-07-03 14:49:24 +08:00
Junming Ma b20e86a2c6 update docklet-arch.png 2017-07-03 14:43:57 +08:00
Yujian Zhu b7d78044d1 Merge pull request #264 from FirmlyReality/devdocs
Devdocs
2017-06-30 11:41:28 +08:00
Yujian Zhu 41ce0cabf0 Update network-arch.md 2017-06-30 11:39:18 +08:00
Yujian Zhu d747937574 Add files via upload 2017-06-30 10:36:09 +08:00
Yujian Zhu 355e832971 Delete workspace_requests.png 2017-06-30 10:35:43 +08:00
Yujian Zhu efa6cfe25f update ovs_arch.png 2017-06-30 10:15:23 +08:00
Yujian Zhu 3d35b187a8 Delete ovs_arch.png 2017-06-30 10:13:55 +08:00
zhong yehong 1afa2b5fa7 Merge pull request #263 from zhongyehong/master
change the format of url, place the masterip on the second field
2017-06-26 18:49:37 +08:00
zhongyh16 1eab9e5b5d Merge remote-tracking branch 'upstream/master' 2017-06-26 18:48:35 +08:00
zhongyh16 58bda3c0f9 change the format of url, place the masterip on the second field 2017-06-26 18:46:01 +08:00
马俊明 28b82819b4 Merge pull request #262 from JimmyMa520/master
add a docklet-arch image in README.md
2017-06-21 21:06:04 +08:00
Junming Ma fd0874bef3 add a docklet-arch image in README.md 2017-06-21 21:01:12 +08:00
Yujian Zhu 1c5ee98794 Merge pull request #261 from FirmlyReality/devdocs
Devdocs
2017-06-19 00:32:54 +08:00
Yujian Zhu 5874edbf81 add dev doc on architecture of network 2017-06-19 00:29:36 +08:00
Yujian Zhu 43e9a35839 add images of processing users' requests 2017-06-19 00:25:35 +08:00
Yujian Zhu 4b6a1802ce del 2017-06-19 00:24:52 +08:00
Yujian Zhu dc11815bba del 2017-06-19 00:24:43 +08:00
Yujian Zhu 8aac3d6c54 add images on processing users' requests 2017-06-19 00:23:34 +08:00
Yujian Zhu 4a17c518dc add ovs_arch.png 2017-06-18 23:34:09 +08:00
zhong yehong 7395222bea Merge pull request #260 from zhongyehong/master
change the admin page to settings page
2017-06-16 16:11:11 +08:00
zhongyh16 8602b9b34d change some field in the settings page 2017-06-16 16:07:00 +08:00
zhongyh16 082f28ca69 remove APPROVAL_RBT from docklet.conf.template 2017-06-16 16:04:32 +08:00
zhongyh16 28f5a05cd7 change the admin page to settings page
move editable setting to settings page
change the settings request from master to user
add 2 editable settings:OPEN_REGISTRY and APPROVAL_RBT
remove some setting from docklet.conf.template
2017-06-16 16:01:46 +08:00
PedroLiu 652f8fa504 Merge pull request #259 from PedroLiu/master
several changes about e-mail address
2017-06-16 01:21:13 +08:00
Peidong Liu 2057f4535b now in /settings/, admin can input several email addreses instead of only one
delete mail settings in /admin/ (need to reconfig the docklet.conf)
2017-06-16 01:18:35 +08:00
Yujian Zhu 26b9c6cf81 Merge pull request #258 from FirmlyReality/devdocs
Add APPROVAL_RBT to docklet.conf
2017-06-14 16:10:22 +08:00
Firmlyzhu 09745ab8e1 Add APPROVAL_RBT to docklet.conf and user can turn on or off the robot by the field. 2017-06-14 15:45:51 +08:00
zhong yehong d7123625c6 Merge pull request #256 from zhongyehong/master
change help url
2017-06-07 13:34:15 +08:00
zhongyh16 551f2ffd16 change help url
change the order of master start
2017-06-07 13:32:13 +08:00
Cao, Donggang 1ffa2bb176 Merge pull request #255 from caodg/master
update readme
2017-06-06 20:41:03 +08:00
Donggang Cao 84e511acef update README 2017-06-06 20:39:45 +08:00
Donggang Cao 10b5b6e1c9 update README 2017-06-06 20:34:01 +08:00
zhong yehong e998ca6205 Merge pull request #254 from zhongyehong/master
add OPEN_REGISTRY to control whether allow user to register a new
2017-06-05 15:32:37 +08:00
zhongyh16 3cf3d482c9 add OPEN_REGISTRY to control whether allow user to register a new
account.
2017-06-05 15:30:27 +08:00
zhong yehong bcf65075f2 Merge pull request #253 from zhongyehong/master
update README.md
2017-06-05 13:45:00 +08:00
zhongyh16 54261247e6 change the default root password, it will be generate in
FSPREFIX/local/generated_password.txt
2017-06-05 13:36:43 +08:00
zhongyh16 69d3b1443f Merge remote-tracking branch 'upstream/master' 2017-06-05 13:12:04 +08:00
zhongyh16 0b5e5a07e4 update README.md 2017-06-05 13:11:48 +08:00
Yujian Zhu d5c340cf63 Merge pull request #252 from FirmlyReality/master
update README.md
2017-06-02 16:54:17 +08:00
Firmlyzhu e1d134f4c2 update README.md 2017-06-02 16:53:26 +08:00