Commit Graph
2143 Commits
Author SHA1 Message Date
tianshujie98 592a6b6a5c * Finish task #8197. 2020-11-05 13:23:17 +08:00
z 5644b81408 Merge branch '12.x' 2020-10-30 16:58:47 +08:00
leiyong 1ab465d4d7 * Modify upgrade whitelist. 2020-10-29 11:37:09 +08:00
leiyong 0909592ea1 * Adjust whitelist setting logic. 2020-10-28 09:14:38 +08:00
leiyong c0f44f6465 * Adding a white list. 2020-10-25 17:30:41 +08:00
leiyong baddd03444 * Adjust the all method of the project module. 2020-10-23 11:26:07 +08:00
leiyong 934a3278f5 * Adjust project module code. 2020-10-22 16:49:40 +08:00
leiyong 55e1126f0b * Adjusting programplan and project and panel module code. 2020-10-16 14:28:52 +08:00
hufangzhou 8dbf4ff9f5 * Finish task#8156: Optimize the structure of the code. 2020-10-12 16:35:31 +08:00
hufangzhou 0001012632 * Finish task#8156: Optimize the structure of the code. 2020-10-12 16:10:28 +08:00
hufangzhou 1ebc3a9e3f * Finish task#8073: Assign the value to the manage products. 2020-10-10 08:33:20 +08:00
hufangzhou a1d6646276 * Finish bug#3491. 2020-09-28 13:07:46 +08:00
hufangzhou d47a6cfae8 * Finish task#7941. 2020-09-25 09:27:29 +08:00
hufangzhou c321a1181c * Adjust the display of the burn chart. 2020-09-22 10:09:49 +08:00
hufangzhou e94b917f66 Merge branch '12.x' of https://github.com/easysoft/zentaopms into 12.x 2020-09-22 09:59:05 +08:00
hufangzhou 8f522653f6 * Add the unit of the horizontal axis of the burn chart. 2020-09-22 09:58:55 +08:00
qiyu-xie bd93c680fa * Change lowercase to uppercase. 2020-09-22 08:52:24 +08:00
z d91c3b1361 Merge branch '12.x' of github.com:easysoft/zentaopms into 12.x 2020-09-21 16:59:14 +08:00
z bcb0e7732c * adjust for low php version. 2020-09-21 16:51:16 +08:00
hufangzhou 81d2d87ca5 * Finish task#7937. 2020-09-21 09:37:08 +08:00
hufangzhou 7462c9b885 * Finish task#7937. 2020-09-21 09:21:25 +08:00
hufangzhou c189483958 * Finish task#7941. 2020-09-18 15:15:15 +08:00
Yagami 075b9e6247 * Fix menuorder. 2020-09-07 14:18:32 +08:00
z 40dbb5b53a * code for task #12372. 2020-09-03 16:32:39 +08:00
leiyong 47642ededd * Adjust URAndSR Judgment condition. 2020-09-02 23:26:46 +08:00
z a9df6f3b9c * merge after 12.4.1 changes. 2020-08-31 15:31:55 +08:00
holan20180123 1062033526 * Finish Task #7711. 2020-08-27 13:42:16 +08:00
Yagami b72a7dee43 Merge branch 'master' into 20.x 2020-08-26 16:10:36 +08:00
z 1a9c007fec * finish task #7648. 2020-08-24 11:33:37 +08:00
Yagami cc7db91b5e * Add program blocks. 2020-08-19 17:34:22 +08:00
Yagami a86cb31895 * Add holiday and fix project and product menu. 2020-08-19 10:58:29 +08:00
tianshujie98 595e3e35c4 * Fix bug #2573. 2020-08-13 09:38:57 +08:00
qiyu-xie 3af0fb48dc Fix bug #2543 2020-08-11 14:38:07 +08:00
z ad6fdd08dc * fix bug and adjust code. 2020-08-10 11:12:04 +08:00
tianshujie98 fdf70435de Merge branch 'master' of github.com:easysoft/zentaopms 2020-08-07 17:02:37 +08:00
tianshujie98 548b5655b0 Merge branch 'master' of github.com:easysoft/zentaopms 2020-08-05 17:22:22 +08:00
tianshujie98 a99aab00ea *Finish task #7587. 2020-08-05 17:04:47 +08:00
leiyong e639fd4379 * Finish task#7481. 2020-07-27 02:29:36 -07:00
Catouse 251e11f24d * task #7373, bug #3191, fix table statistic information not update after dialog closed. 2020-07-23 17:47:41 +08:00
Catouse 9f7a7c3a10 * task #7373, bug #3191, fix table statistic information not update after dialog closed. 2020-07-23 17:10:46 +08:00
chenfei 893a672c5a * Finish task #7473. 2020-07-22 16:28:09 +08:00
chenfei f1a6575325 * Finish task #7435. 2020-07-14 10:33:23 +08:00
holan20180123 802d64a3cf * Fix bug #3206. 2020-07-09 11:10:46 +08:00
chenfei 2034b6ff8f * Fix bug #2988. 2020-07-08 14:40:24 +08:00
z f126903c63 Merge branch 'master' of github.com:easysoft/zentaopms 2020-07-06 16:03:19 +08:00
chenfei 838723a6cf * Fix bug #3219. 2020-07-06 15:12:51 +08:00
z f2c36fb4ae * finish task #7308. 2020-07-06 15:04:45 +08:00
sgm0422 ca21685f4b * Fix project set menu. 2020-06-15 14:35:21 +08:00
wangyidong b85560356e * fix for error. 2020-05-15 08:21:18 +08:00
wangyidong f889168174 * adjust code for toggle fold or unfold. 2020-05-13 10:49:43 +08:00