Commit Graph
15961 Commits
Author SHA1 Message Date
wangyidong e37db0942f Merge branch 'master' of github.com:easysoft/zentaopms 2019-07-30 11:11:45 +08:00
wangyidong f2b1fd85cc * code for task #6154. 2019-07-30 11:11:20 +08:00
Yagami c27bfc290c Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-07-30 11:10:28 +08:00
Yagami 0976a004a8 * Add lang file for workflow. 2019-07-30 11:10:14 +08:00
wangyidong 63a3839104 * finish task #6150. 2019-07-30 11:08:11 +08:00
wangyidong b3e0c2acdd Merge branch 'master' of github.com:easysoft/zentaopms 2019-07-30 10:59:01 +08:00
wangyidong 82e99eaa8d * finish task #6142. 2019-07-30 10:58:35 +08:00
Yagami 2a452c2750 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-07-30 10:57:32 +08:00
Yagami 7c8428ba93 * Add project lang file for workflow. 2019-07-30 10:57:06 +08:00
wangyidong 0174ccc8cd Merge branch 'master' of github.com:easysoft/zentaopms 2019-07-30 10:51:11 +08:00
wangyidong 1364cd2f91 * finish task #6140. 2019-07-30 10:50:41 +08:00
Yagami 0f3e4c54ab * Add lang to story. 2019-07-30 10:40:43 +08:00
Yagami d8f65cf55f * Add lang file to productplan. 2019-07-30 10:26:19 +08:00
Yagami 0945ca833c Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-07-30 10:20:16 +08:00
Yagami 4a544fb1c5 * Add lang file to product. 2019-07-30 10:14:23 +08:00
liugang 5e32ee1081 * Add subStatus in lang files.
* Change sub status when status is changed and sub status is not set, and record the changes.
2019-07-30 10:10:10 +08:00
liugang ed8646a54a * Change zt_testcase to zt_case. 2019-07-30 09:06:18 +08:00
liugang 54a3aaf8ed Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-07-30 09:03:36 +08:00
Yagami c06773e491 * Finish task #6156. 2019-07-30 09:03:09 +08:00
liugang e6d6312405 * Add subStatus to database. 2019-07-30 09:03:01 +08:00
Yagami f0671e2ead * Finish task #6165. 2019-07-30 08:39:39 +08:00
Yagami 6a997c7fe1 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-07-29 16:54:04 +08:00
Yagami 8d26d61fb1 * Finish task #6162. 2019-07-29 16:53:48 +08:00
wangyidong 5bb74f6ebc Merge branch 'master' of github.com:easysoft/zentaopms 2019-07-29 16:48:36 +08:00
wangyidong 190a4b468d * finish task #6158. 2019-07-29 16:47:47 +08:00
Yagami dca5030a98 * Finish task #6153. 2019-07-29 16:39:55 +08:00
Yagami 5c0a10d51d * Finish task #6148. 2019-07-29 16:38:21 +08:00
Yagami a7afbc7188 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-07-29 16:34:50 +08:00
Yagami bb59fa9349 * Finish task #6148. 2019-07-29 16:34:28 +08:00
wangyidong 4fca901960 Merge branch 'master' of github.com:easysoft/zentaopms 2019-07-29 16:31:40 +08:00
wangyidong 6b3c34dba2 * finish task #6160. 2019-07-29 16:30:55 +08:00
Yagami b6c4a32007 * Finish task #6146. 2019-07-29 16:30:22 +08:00
Yagami 4e3df671e3 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-07-29 16:05:02 +08:00
Yagami ab6d63e87c * Finish task #5715. 2019-07-29 16:04:44 +08:00
jinianlan b3b77d8b8d Merge branch 'master' of github.com:easysoft/zentaopms 2019-07-29 15:57:51 +08:00
jinianlan c90aac3512 * finish task #6166,#6149,6139 2019-07-29 15:54:08 +08:00
liugang 782de27ac6 * Optimize codes and add comments. 2019-07-29 15:53:31 +08:00
Yagami a8d37d279f * Finish task #6141. 2019-07-29 15:49:15 +08:00
wangyidong 282b43d426 * finish task #6167. 2019-07-29 14:53:14 +08:00
wangyidong ca50ee698c * finish task #6168. 2019-07-29 14:36:00 +08:00
wangyidong d187bc8515 * remove debug code. 2019-07-29 09:09:22 +08:00
wangyidong e701f45620 * adjust for setControlFile. 2019-07-29 08:46:55 +08:00
liugang 9c81da7069 * Change width. 2019-07-26 19:04:38 +08:00
wangyidong 6c66211714 Merge branch 'master' of github.com:easysoft/zentaopms 2019-07-26 17:49:18 +08:00
wangyidong 5ace83db9a * adjust for sendmail. 2019-07-26 17:48:52 +08:00
chenfei 8e0f54cf6e * Finish task: https://backyard.cnezsoft.com/pms/task-view-8372.html 2019-07-26 16:04:09 +08:00
wangyidong e258415f5a Merge branch 'master' of github.com:easysoft/zentaopms 2019-07-26 15:49:20 +08:00
wangyidong 9b2174e001 * adjust for code style. 2019-07-26 15:48:56 +08:00
wangyidong 1b87f3c9c1 * fix bug for parse float consumed when finish. 2019-07-26 15:47:46 +08:00
chenfei 935fc96403 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-07-26 15:45:30 +08:00