Commit Graph
8850 Commits
Author SHA1 Message Date
wumo ef8e72fc0e * Set the value of deleted product line to 0. 2018-03-23 04:10:50 +08:00
wumo 061b323440 Merge branch 'zentaopms_9.8' of github.com:easysoft/zentaopms into zentaopms_9.8 2018-03-23 00:51:26 +08:00
wangyidong 0954a39e0a Merge branch 'zentaopms_9.8' of github.com:easysoft/zentaopms into zentaopms_9.8 2018-03-23 10:59:31 +08:00
wangyidong ec374fd2d7 * code for task #3685. 2018-03-23 10:59:11 +08:00
daitingting 8cfa2878d0 Merge branch 'zentaopms_9.8' of https://github.com/easysoft/zentaopms into zentaopms_9.8 2018-03-23 10:49:13 +08:00
daitingting 51d60bac36 * Adjust fixTaskAssignedTo function when update from 9.8.1. 2018-03-23 10:48:38 +08:00
wangyidong b996e427f0 Merge branch 'zentaopms_9.8' of github.com:easysoft/zentaopms into zentaopms_9.8 2018-03-23 10:09:11 +08:00
wangyidong 96aef84f2c * adjust for update parent task status. 2018-03-23 10:08:44 +08:00
wumo 1779bdeedc * Change the object of assigned to. 2018-03-23 00:48:54 +08:00
wumo 5633a1ad1a Merge branch 'zentaopms_9.8' of github.com:easysoft/zentaopms into zentaopms_9.8 2018-03-23 00:20:01 +08:00
wumo c59b3290fc * Add product line when batch edit products. 2018-03-23 00:18:42 +08:00
wumo e9d1a804c4 * Add parent title when batch create children task. 2018-03-22 23:18:28 +08:00
wumo 1ea17ed25d * Fix the bug of typeList of todo. 2018-03-22 23:08:55 +08:00
wumo 4a611fd671 Merge branch 'zentaopms_9.8' of github.com:easysoft/zentaopms into zentaopms_9.8 2018-03-22 16:53:52 +08:00
wumo 402861a88e * Filter the invalid key in custom module.
* Change function called to picture when edit product.
2018-03-22 16:49:51 +08:00
wangyidong 3212c1d41e Merge branch 'zentaopms_9.8' of github.com:easysoft/zentaopms into zentaopms_9.8 2018-03-22 16:28:45 +08:00
daitingting 5786761b69 * Adjust codes. 2018-03-22 16:22:32 +08:00
daitingting 19bb7f1f1e * Adjust params for page function. 2018-03-22 15:45:49 +08:00
daitingting a474597c66 Merge branch 'zentaopms_9.8' of https://github.com/easysoft/zentaopms into zentaopms_9.8 2018-03-22 15:43:25 +08:00
daitingting 867849c254 * Optimize future function for productplan. 2018-03-22 15:42:57 +08:00
wangyidong 3027a4fd3b * adjust for team padding in modal. 2018-03-22 15:28:50 +08:00
wangyidong 4d475eef59 * fix error for deleted branch in link story. 2018-03-22 15:11:52 +08:00
wangyidong bb0cb8efdd Merge branch 'zentaopms_9.8' of github.com:easysoft/zentaopms into zentaopms_9.8 2018-03-22 15:01:34 +08:00
wangyidong ad1a24089d * code for plan getpairs with unexpired. 2018-03-22 15:00:55 +08:00
daitingting f3098cc12f Merge branch 'zentaopms_9.8' of https://github.com/easysoft/zentaopms into zentaopms_9.8 2018-03-22 14:31:05 +08:00
daitingting a0204a58e9 * Display pri value for short type. 2018-03-22 14:30:28 +08:00
wangyidong fb223a3bd7 * adjust for check has custom pri. 2018-03-22 14:29:27 +08:00
wangyidong 38219cede9 * fix for width. 2018-03-22 14:17:09 +08:00
wumo b2cd6c62f3 Merge branch 'zentaopms_9.8' of github.com:easysoft/zentaopms into zentaopms_9.8 2018-03-21 16:02:42 +08:00
wumo 7ebfcde7f2 * Fix the bug of comment and setting key. 2018-03-21 16:01:12 +08:00
wangyidong c1dd0e25ec Merge branch 'zentaopms_9.8' of github.com:easysoft/zentaopms into zentaopms_9.8 2018-03-21 15:02:14 +08:00
wangyidong 6dd688f3b7 * adjust for batch create. 2018-03-21 15:01:57 +08:00
wumo 4c9cf4d1f3 * Fix the bug of comment. 2018-03-21 14:57:24 +08:00
wumo 1c9d3674b0 Merge branch 'zentaopms_9.8' of github.com:easysoft/zentaopms into zentaopms_9.8 2018-03-21 14:22:29 +08:00
wumo 980c043a25 * Adjust codes. 2018-03-21 14:17:09 +08:00
daitingting 0fddc8a6b0 * Adjust codes. 2018-03-21 14:10:36 +08:00
daitingting a0aa9f6d6e Merge branch 'zentaopms_9.8' of https://github.com/easysoft/zentaopms into zentaopms_9.8 2018-03-21 13:45:31 +08:00
daitingting 3dd4a4e97b * Adjust fixClosedInfo of project. 2018-03-21 13:45:07 +08:00
wumo 0fb63f3814 Merge branch 'zentaopms_9.8' of github.com:easysoft/zentaopms into zentaopms_9.8 2018-03-21 13:33:43 +08:00
wumo 99dbec6061 * Adjust codes. 2018-03-21 13:33:04 +08:00
wangyidong 7e77a6d999 * fix bug. 2018-03-21 13:23:22 +08:00
daitingting ee62c22030 * Adjust version. 2018-03-21 11:23:18 +08:00
daitingting fc4c03fce2 * Adjust default full blocks. 2018-03-21 11:20:18 +08:00
wangyidong 714c580396 Merge branch 'zentaopms_9.8' of github.com:easysoft/zentaopms into zentaopms_9.8 2018-03-21 09:49:39 +08:00
wangyidong 9e6348b10e * code for child task. 2018-03-21 09:49:00 +08:00
daitingting b40e2bb9ea * Add tw language. 2018-03-21 09:30:47 +08:00
daitingting cd3971346f * Display future for future plan. 2018-03-21 09:23:58 +08:00
wumo 872821d830 Merge branch 'zentaopms_9.8' of github.com:easysoft/zentaopms into zentaopms_9.8 2018-03-21 09:14:10 +08:00
wangyidong 040137e110 Merge branch 'zentaopms_9.8' of github.com:easysoft/zentaopms into zentaopms_9.8 2018-03-21 08:56:58 +08:00
wangyidong 7ad7e91147 * finish task #3747. 2018-03-21 08:56:26 +08:00