summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2016-10-25Merge "when the service is down . the web page should render . and display ↵jin xin1-0/+8
an empty table." into sun
2016-10-25Merge "Change the realization of package table, fix the bug GSO-40" into sunjin xin3-107/+78
2016-10-25Merge "Issue#GSO-30 Show empty string while no default value defination in ↵jin xin1-1/+1
response body." into sun
2016-10-25Issue#GSO-44 Modify to get servceId from response for creating service.Luji71-1/+1
Change-Id: I97a513b67e0c553e84eb88ceecabf7d9573e4339 Signed-off-by: Luji7 <lu.ji3@zte.com.cn> (cherry picked from commit cade354c0d377bbb03eaea62edccb0a7d34488c3)
2016-10-25Change the realization of package table, fix the bug GSO-40nancylizi3-107/+78
Change-Id: Ie05b630cd3cd091c5604641a75ad1956a77c3467 Issue-id:GSO-40 Signed-off-by: nancylizi <li.zi30@zte.com.cn>
2016-10-25when the service is down . the web page should render . and display an empty ↵zhouruiyu1-0/+8
table. https://jira.open-o.org/browse/OCS-125 Change-Id: I96133c618ebe5e38fa38dda5d5b16b30f303c866 Signed-off-by: zhouruiyu <zhouruiyu@huawei.com>
2016-10-24Merge "Issue ID: GSO-43" into sunjin xin1-0/+9
2016-10-24Issue ID: GSO-43j003022801-0/+9
Change-Id: I5abea29a9ec06d28d8aabb927cb29e95eaf6ea49 Signed-off-by: j00302280 <j00101220@huawei.com>
2016-10-24Issue#GSO-30 Show empty string while no default value defination in response ↵Luji71-1/+1
body. Change-Id: If02b8ffbdddbd63d5eccae0f31ac2aa655318a68 Signed-off-by: Luji7 <lu.ji3@zte.com.cn> (cherry picked from commit a48605e7984d9488f1bfa4b333bc4fd011914902)
2016-10-24GSO-34 Fix unmarshal json error.Luji74-5/+4
Change-Id: Ife9941fbb9f765673edd22613d41603a7d11060a Signed-off-by: Luji7 <lu.ji3@zte.com.cn> (cherry picked from commit aa290444e456ebfc7b8cf48ea344e17c17105a0a)
2016-10-24Merge "GSO-26 Modify the response structure for deleting service to be ↵jin xin3-14/+17
consistent with the api." into sun
2016-10-21Merge "Issue ID: GSO-38" into sunjin xin548-4219/+63586
2016-10-21Issue ID: GSO-38j00302280548-4219/+63586
Change-Id: Ie7527ff941cb8e6a00d854f6ab64357a87d51a76 Signed-off-by: j00302280 <j00101220@huawei.com>
2016-10-21Issue ID: GSO-37j003022801-4/+63
Change-Id: I376471bf15f5c090d8e574e13524d736011a7a3e Signed-off-by: j00302280 <j00101220@huawei.com>
2016-10-21Merge "MODIFIED CONFG FILES NFVO-32" into sunjin xin2-2/+2
2016-10-21GSO-26 Modify the response structure for deleting service to be consistent ↵Luji73-14/+17
with the api. Change-Id: Ic6a4fa300e914be8bb6016e5022d548940fed29e Signed-off-by: Luji7 <lu.ji3@zte.com.cn> (cherry picked from commit 5b70f275529dc33fb3cd01d046b5fd21cd4b66da)
2016-10-21Merge "Add the alert about delete package." into sunjin xin1-3/+8
2016-10-21Merge changes Id6024a0a,If5b05fbe into sunjin xin6-96/+99
* changes: Fix onboard and delete package url, onboard SSAR package calls catalog API. Fix the bug "A message showed in a wrong time when upload package." and modify the css of select vim dialog.
2016-10-21Merge "Remove the unused i18n fields. Issue-id:GSO-10" into sunjin xin3-429/+1
2016-10-21Add the alert about delete package.nancylizi1-3/+8
Change-Id: I24cd8aa136d78c62422d0c973bf4490759c102c7 Issue-id: GSO-32 Signed-off-by: nancylizi <li.zi30@zte.com.cn>
2016-10-21Fix onboard and delete package url, onboard SSAR package calls catalog API.nancylizi5-93/+83
Change-Id: Id6024a0a39b716931d0c8ad91d87920625289592 Issue-id:GSO-28 GSO-29 Signed-off-by: nancylizi <li.zi30@zte.com.cn>
2016-10-21Remove the unused i18n fields.nancylizi3-429/+1
Issue-id:GSO-10 Change-Id: I1aefd646546bf074c0ca976831295a69ba4c97b2 Signed-off-by: nancylizi <li.zi30@zte.com.cn>
2016-10-21Fix the bug "A message showed in a wrong time when upload package." and ↵nancylizi4-3/+16
modify the css of select vim dialog. Change-Id: If5b05fbef0eedf496e50c37245826af422885693 Issue-id:GSO-18 Signed-off-by: nancylizi <li.zi30@zte.com.cn>
2016-10-21MODIFIED CONFG FILESQuan-Zhong2-2/+2
NFVO-32 Change-Id: I4bc420b8ed10b481bb4f5a319b76e0f00e95eca0 Signed-off-by: Quan-Zhong <quanzhong@huawei.com>
2016-10-19GSO-26 Fix the wrong url sent to service gateway. Modify the codes for ↵Luji73-15/+9
deleting service to be consistent with the api. Change-Id: If9242f8c956d5e93f49c4359a959343ed34cfefb Signed-off-by: Luji7 <lu.ji3@zte.com.cn> (cherry picked from commit cddbebf090d52a234e536bef5f7e6dbd6ddcc9e0)
2016-10-19Merge "meger nfvo's resource.html to sdno's NFVO-22" into sunjin xin9-16/+78
2016-10-18Merge "integration with CMCC portal." into sunjin xin9-33/+33
2016-10-17meger nfvo's resource.html to sdno'sQuan-Zhong9-16/+78
NFVO-22 Change-Id: Ide60f3562985d3e55ef421d68d2865526d8df5d8 Signed-off-by: Quan-Zhong <quanzhong@huawei.com>
2016-10-15Issue ID:GSO-21j003022801-1/+1
Change-Id: Ie36e036016418186e8170d2016e04abde54007ce Signed-off-by: j00302280 <j00101220@huawei.com>
2016-10-15Issue ID:GSO-21j003022803-1/+9
Change-Id: Iae71bb72a829e0212f45fec9eb532e26f1a02a7f Signed-off-by: j00302280 <j00101220@huawei.com>
2016-10-15integration with CMCC portal.zhouruiyu9-33/+33
1. change the import js and css path into the right one ; OCS-113" target="_blank">https://jira.open-o.org/browse/OCS-113 Change-Id: Iac4b94f556e38cf15bfd6582efb7125111c9af47 Signed-off-by: zhouruiyu <zhouruiyu@huawei.com>
2016-10-13Rollback the GSO-13j003022806-12/+12
Change-Id: I3426576b63f8523ea1d775fccc8ad0382d0f4a5d Signed-off-by: j00302280 <j00101220@huawei.com>
2016-10-12For the bug GSO-13j003022806-12/+12
Change-Id: I64329253e6f9f677d421fe47b7575d0c6911f194 Signed-off-by: j00302280 <j00101220@huawei.com>
2016-10-11modify frame page“shentao”46-29926/+351
Change-Id: I0c4bfab53365c7b70c23c8ff4a2bafef6a33e2ac Signed-off-by: “shentao” <shentao@chinamobile.com>
2016-10-11Merge "SDNO-577"Seshu Kumar M8-45/+426
2016-10-11Merge "UI Portal changes GSO-12"Seshu Kumar M7-125/+135
2016-10-11SDNO-577Seshu-Kumar-M8-45/+426
Change-Id: I2b11d6465efe74fc7b744e44f238670c7995c8b1 Signed-off-by: Seshu-Kumar-M <seshu.kumar.m@huawei.com>
2016-10-11UI Portal changes GSO-12Seshu-Kumar-M7-125/+135
Change-Id: Ib72a9c6576acd5786fa01ac049b629fe5ee489ee Signed-off-by: Seshu-Kumar-M <seshu.kumar.m@huawei.com>
2016-10-11For the bug GSO-11j003022802-4/+4
Change-Id: Ic169b9084023ef11eea7ca352ef2083f195faa83 Signed-off-by: j00302280 <j00101220@huawei.com>
2016-10-10Merge "Resolve the Bug GSO-9 for add new files"jin xin2-0/+65
2016-10-10Resolve the Bug GSO-9 for add new filesj003022802-0/+65
Change-Id: Id076b732cd4ed68ff47805e90031021193e7162b Signed-off-by: j00302280 <j00101220@huawei.com>
2016-10-10Merge "Resolve the Bug GSO-9"jin xin3-2/+9
2016-10-10Resolve the Bug GSO-9j003022803-2/+9
Change-Id: I1cbbc996ce1a43159073d02c8ebb733cfc7d8d54 Signed-off-by: j00302280 <j00101220@huawei.com>
2016-10-10Merge "Resolve the Bug GSO-8"jin xin2-4/+3
2016-10-10Resolve the Bug GSO-8j003022802-4/+3
Change-Id: I65bed2e965d03230782920d0a16542e40a37cdc2 Signed-off-by: j00302280 <j00101220@huawei.com>
2016-10-10Merge "modify main_page"Tao Shen14-850/+297
2016-10-10Merge "Add jquery.dataTables files of version 1.9.4 Issue-id:TOSCA-101"Luji2-0/+12256
2016-10-10Add jquery.dataTables files of version 1.9.4nancylizi2-0/+12256
Issue-id:TOSCA-101 Change-Id: Ib2e2bbf85308fb75d0e8cebe7469f643ad97e789 Signed-off-by: nancylizi <li.zi30@zte.com.cn>
2016-10-08modify main_page“shentao”14-850/+297
Change-Id: I7e80ff78534db0d5c1fcfc69b690858d76a7a924 Signed-off-by: “shentao” <shentao@chinamobile.com>
2016-10-08Merge "For the Jira bug GSO-6"jin xin1-16/+0