Commit Graph

Select branches

Hide Pull Requests

Manager_Backend

Web_Manager

Web_Manager_Develope

glusterfs-api

master

web_backend_based

web_backend_develope

web_chenlw_utf8

Mono Color

• fead9d9371 Merge branch 'web_backend_develope' of https://git.trustie.net/fhx569287825/aggregation-platform into web_backend_develope web_backend_develope chenlw 2016-09-20 20:45:20 +0800
• 6c3d873e46 完善数据迁移进度页面 Web_Manager_Develope wu ming 2016-09-20 20:33:01 +0800
• 4d8078c6c1 调试修改代码-联调 chenlw 2016-09-20 20:32:46 +0800
• 8b01a83b0d 合并---9.20 wu ming 2016-09-20 19:01:29 +0800
• 25d67ad44e 功能调整和完善--9.20 wu ming 2016-09-20 19:00:09 +0800
• faadafadfd --完善功能 wu ming 2016-09-20 18:52:11 +0800
• a7d7f55c54 daily commit glusterfs-api lily 2016-09-20 15:43:57 +0800
• e42e9b9554 update .gitignore wu ming 2016-09-20 15:03:30 +0800
• a82a9b0397 update .gitignore wu ming 2016-09-20 15:03:20 +0800
• 0412d82278 合并--9.20 wu ming 2016-09-20 14:50:08 +0800
• 83170155be --合并 wu ming 2016-09-20 14:47:36 +0800
• b56e1a8deb 恢复test chenlw 2016-09-20 14:46:38 +0800
• a1310b127d 会略 chenlw 2016-09-20 14:19:04 +0800
• 172b1b512b Merge branch 'web_backend_develope' of https://git.trustie.net/fhx569287825/aggregation-platform chenlw 2016-09-20 14:13:29 +0800
• d35115800d update .gitignore wu ming 2016-09-20 14:13:39 +0800
• e1e273fb1c update .gitignore wu ming 2016-09-20 14:12:08 +0800
• 19e9b502ec 接收请求方式修改 chenlw 2016-09-20 14:01:52 +0800
• b252d63312 联调之前测试后修改请求接收方式 chenlw 2016-09-20 13:54:51 +0800
• 57a2cd17af 修改oracle连接策略 wu ming 2016-09-20 11:30:32 +0800
• d4db086706 Merge branch 'web_backend_develope' of https://git.trustie.net/fhx569287825/aggregation-platform into develope wu ming 2016-09-20 09:10:15 +0800
• d3e79bd886 合并---- wu ming 2016-09-20 09:09:33 +0800
• 09064c9d9e 多字段模糊查询数据， chenlw 2016-09-19 18:49:33 +0800
• 5ba88b2d41 解决冲突---- wu ming 2016-09-19 13:58:47 +0800
• cf2cfd54d7 添加集群弹框样式调整 Linda 2016-09-19 13:45:10 +0800
• e317bfbacc nothing wu ming 2016-09-19 13:30:19 +0800
• e76717783e 合并-9.19 wu ming 2016-09-19 11:21:41 +0800
• d059c714ca 合并-9.19 wu ming 2016-09-19 11:21:06 +0800
• c832fb16f3 完善GFS配置页面 wu ming 2016-09-19 11:16:28 +0800
• 218a5c6bea GFS配置页面 Linda 2016-09-19 10:40:50 +0800
• f4d9113d4c 修改字段 chenlw 2016-09-18 18:53:21 +0800
• 267f87a09e 增加检索功能 wu ming 2016-09-18 18:51:04 +0800
• 51c06b3a8a Merge branch 'web_backend_develope' of https://git.trustie.net/fhx569287825/aggregation-platform chenlw 2016-09-18 15:56:46 +0800
• b19225edbe 地区和系统查询 chenlw 2016-09-18 15:42:28 +0800
• 50163a76ac 合并 Linda 2016-09-18 14:51:59 +0800
• e415846f46 新建集群弹框内样式及图片 Linda 2016-09-18 14:43:54 +0800
• d99c25a92d 初始版本 chenlw 2016-09-14 18:06:27 +0800
• 32ac1beeda Merge branch 'Web_Manager_Develope' of https://git.trustie.net/fhx569287825/aggregation-platform into Web_Manager_Develope wu ming 2016-09-14 16:37:55 +0800
• d81753abf4 nothing-9-14 wu ming 2016-09-14 16:36:57 +0800
• 11d9143db2 修改连接oracle服务 wu ming 2016-09-14 16:31:58 +0800
• db144df2df merge update lily 2016-09-14 15:52:49 +0800
• 7271066a08 fix mountPoint lily 2016-09-14 15:50:02 +0800
• d2f5305d2b 合并-9.14 wu ming 2016-09-14 14:11:16 +0800
• acd377cc4d 修复启动oracle，测试连接oracle失败的Bug wu ming 2016-09-14 13:56:45 +0800
• 608e658d3a 修复启动oracle服务，测试连接oracle的Bub wu ming 2016-09-14 13:54:57 +0800
• ef099fd1ae 迁移数据 chenlw 2016-09-14 10:36:07 +0800
• 817b99dcb0 集成 chenlw 2016-09-14 09:33:53 +0800
• cb3af77285 集成 chenlw 2016-09-14 09:32:55 +0800
• 4daefb6d79 some fixed Manager_Backend lily 2016-09-13 22:57:06 +0800
• f2399dc67f 任务中进度条显示 Linda 2016-09-13 15:42:09 +0800
• f1ec0cc895 merge-20160913 wu ming 2016-09-13 15:25:28 +0800
• b28af5fa13 add .settings lily 2016-09-13 14:54:59 +0800
• f308d14166 merge web_backend_develope lily 2016-09-13 14:51:56 +0800
• c6cf79cb61 数据管理配置页面前端编写 Linda 2016-09-13 14:21:56 +0800
• 838bbe4570 merge--ad Linda 2016-09-13 10:55:30 +0800
• 00a1fee4fc merge Linda 2016-09-13 10:54:54 +0800
• 48ae986d5c reset add md5checkout lily 2016-09-13 10:38:09 +0800
• 3ac5b5516e 任务页面 wu ming 2016-09-13 10:22:02 +0800
• 6ce9f75ee7 add md5 and getfoldersize lily 2016-09-13 10:08:15 +0800
• 85a9d2dfae 添加任务页面 wu ming 2016-09-13 08:50:18 +0800
• d048c64a82 nothing Linda 2016-09-13 08:34:27 +0800
• 0df0f24a8d for merge wu ming 2016-09-13 08:27:36 +0800
• ceaef2d1b0 合并 wu ming 2016-09-12 19:22:35 +0800
• 355b6e47a4 合并，解决冲突 chenlw 2016-09-12 19:18:57 +0800
• ab64ab35d2 集成 chenlw 2016-09-12 19:02:03 +0800
• 648fdc307d nothing wu ming 2016-09-12 17:01:04 +0800
• 981debdcb7 合并-9月12号 wu ming 2016-09-12 16:49:53 +0800
• 86256d2a0d 完善数据管理功能 wu ming 2016-09-12 16:30:17 +0800
• fa0c482bcd 当前位置样式修改 服务管理弹框界面修改 配置界面优化 Linda 2016-09-12 13:34:19 +0800
• d3498ac95e add bricks size lily 2016-09-12 10:21:31 +0800
• b04b63c6d9 nothing Linda 2016-09-12 09:15:29 +0800
• e2e392e319 数据逻辑处理，oracle抽取处理，迁移数据 chenlw 2016-09-11 18:05:37 +0800
• 9aa8e675ae Merge branch 'web_backend_develope' of https://git.trustie.net/fhx569287825/aggregation-platform chenlw 2016-09-11 17:46:20 +0800
• 566cd7c3ad 完善服务集群管理页面 wu ming 2016-09-11 17:37:24 +0800
• 150437e97c fix get Tree data lily 2016-09-11 14:44:04 +0800
• a1fa923eed 修改DataModelController wu ming 2016-09-11 08:55:30 +0800
• bcf440c67a Merge branch 'Web_Manager_Develope' of https://git.trustie.net/fhx569287825/aggregation-platform into Web_Manager_Develope wu ming 2016-09-10 21:09:31 +0800
• ce4b567081 添加gfs配置页面 wu ming 2016-09-10 21:06:48 +0800
• 3f81d31aa1 集成 chenlw 2016-09-10 12:21:02 +0800
• edceebeb58 修改xml错误 wu ming 2016-09-10 12:11:16 +0800
• b91af86ede 增加查询汇总库信息数据库操作 wu ming 2016-09-10 11:23:42 +0800
• c5d54bab9e update .gitignore wu ming 2016-09-09 20:37:44 +0800
• 261bf0505e aa wu ming 2016-09-09 20:37:10 +0800
• d19006825d java后台基础版，添加忽然文件 wu ming 2016-09-09 16:56:32 +0800
• 85a4849064 配置界面修改 Linda 2016-09-09 16:55:37 +0800
• 939f2a0de3 基础版 web_backend_based wu ming 2016-09-09 16:45:37 +0800
• c79a979d86 合并 wu ming 2016-09-09 16:10:19 +0800
• 757066182c Merge branch 'Web_Manager_Develope' of https://git.trustie.net/fhx569287825/aggregation-platform into Web_Manager_Develope Linda 2016-09-09 16:08:34 +0800
• 583ac9e74e bbb wu ming 2016-09-09 16:06:02 +0800
• 9af6a1b5b5 服务集群界面修改 Linda 2016-09-09 15:19:56 +0800
• 7698e63eb0 增加服务集群配置功能 wu ming 2016-09-09 15:17:33 +0800
• 18e2092d22 aaa wu ming 2016-09-09 15:14:22 +0800
• c4b345c6a2 fix confict lily 2016-09-09 11:30:12 +0800
• a9b02c497b add getVolumeBricks lily 2016-09-09 11:22:36 +0800
• 26f098b74e Merge branch 'Manager_Backend' of https://git.trustie.net/fhx569287825/aggregation-platform into Manager_Backend chenlw 2016-09-09 09:47:37 +0800
• 5b7257719b 修改masterIP wu ming 2016-09-09 09:18:39 +0800
• a2e57ef9ba Merge branch 'Web_Manager_Develope' of https://git.trustie.net/fhx569287825/aggregation-platform into Web_Manager_Develope wu ming 2016-09-09 08:33:01 +0800
• 99d7cf5ea7 修改配置表单，单未使用 wu ming 2016-09-09 08:32:46 +0800
• 6141ec9723 Merge branch 'Web_Manager_Develope' of https://git.trustie.net/fhx569287825/aggregation-platform into Web_Manager_Develope Linda 2016-09-09 08:21:16 +0800
• d52f123cba 树形文件夹图片 Linda 2016-09-09 08:20:39 +0800
• b32e3c6e07 集成李立的代码 web_chenlw_utf8 Chariesliven 2016-09-08 23:04:23 +0800