Commit Graph
447 Commits
Author SHA1 Message Date
holan20180123 e9fcbe9c21 * Finish task #8507. 2020-11-24 14:11:09 +08:00
leiyong 94586714e6 * Finish task#8509. 2020-11-24 10:54:37 +08:00
holan20180123 41b1d9931a * Finish task #8450. 2020-11-24 08:56:14 +08:00
holan20180123 eabbb2fd3f * Finish task #8449. 2020-11-23 16:13:49 +08:00
leiyong 72a2b18c20 * Adjust the block module language file and model.php Logic. 2020-11-19 14:07:58 +08:00
Yagami f2c6dba226 * Rename project function name. 2020-11-19 14:02:50 +08:00
Yagami aae58fea38 * Adjust code details. 2020-11-19 10:41:37 +08:00
leiyong 03326e0d24 * Fix error. 2020-11-17 14:23:07 +08:00
leiyong e4dcf11d58 * Finish task#8340. 2020-11-12 09:48:18 +08:00
leiyong 579891b10e * Fix bug. 2020-11-06 11:48:29 +08:00
leiyong d325c15d42 * Adjust code. 2020-11-04 09:23:15 +08:00
z 5644b81408 Merge branch '12.x' 2020-10-30 16:58:47 +08:00
qiyu-xie fbdc9624fc * Fix bug#3549. 2020-10-10 09:11:48 +08:00
leiyong d066fef4e5 *Adjust code. 2020-09-29 08:31:27 +08:00
Catouse 6b649c8fbc * task #7928, fix UI of waterfallprogress block. 2020-09-24 14:00:00 +08:00
Yagami dd48623aaa * Delete unused file and add new file. 2020-09-22 15:10:11 +08:00
Yagami 8dbfbdd6db * Fix product menu. 2020-09-22 09:29:29 +08:00
Yagami 99fe956e4b * Merge code. 2020-09-18 16:48:19 +08:00
hufangzhou e41293a86f * Finish task#7938. 2020-09-17 10:37:57 +08:00
Yagami 334260162a * Rename program lang. 2020-09-16 14:54:23 +08:00
Yagami 66f4f5403a * Fix sql and rename program to PRJ. 2020-09-16 11:28:55 +08:00
Catouse d623ab7d50 * fix UI of waterfallprogress block with some extreme data. 2020-09-09 16:19:47 +08:00
tianshujie98 6edacf0578 * Solve the problem of manpower input block. 2020-09-08 15:21:32 +08:00
leiyong 0eb5658bb7 * Finish task#7815. 2020-09-07 10:57:45 +08:00
holan20180123 05d84a4e6d * Adjust singular to plural for contribute. 2020-09-04 13:55:10 +08:00
hufangzhou 0a46aa5512 * Fix problems found in code review. 2020-09-03 15:54:12 +08:00
hufangzhou f88cccac65 * Adjust block code. 2020-09-01 18:37:45 +08:00
holan20180123 20a09be88e * Finish task #7734. 2020-09-01 15:47:03 +08:00
holan20180123 1032d4a749 * Finish task #7747. 2020-09-01 13:40:39 +08:00
hufangzhou 29a975bbb0 * Modify the getScrumprojectParams method to getSprintParams method 2020-08-31 17:40:56 +08:00
hufangzhou 245f1992dc * Finish task#7715. 2020-08-31 17:36:36 +08:00
hufangzhou 5154d3bc0d * Finish task#7764. 2020-08-31 17:16:44 +08:00
Yagami 116a7e43b3 * Finish task #7721. 2020-08-31 13:34:32 +08:00
Yagami 05a4a31426 Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-08-31 13:05:49 +08:00
Yagami bc69f6fb81 * Finish task #7772. 2020-08-31 13:05:24 +08:00
leiyong e2adfa9152 * Finish task#7718. 2020-08-31 11:30:05 +08:00
leiyong 6b2147dbba * Operation record of repairing problems. 2020-08-31 08:34:32 +08:00
Yagami fe63c96aee Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-08-28 11:38:51 +08:00
Yagami 283acfe49f * Fix code style. 2020-08-28 11:37:40 +08:00
leiyong 23a7880bad * Adjust code. 2020-08-28 09:09:22 +08:00
leiyong 4da6d4bfff * Adjust code. 2020-08-28 08:33:27 +08:00
leiyong 3d44a40267 Merge branch 'master' of github.com:easysoft/zentaopms 2020-08-27 14:43:26 +08:00
leiyong 2d3947e441 * Fix bug. 2020-08-27 14:41:27 +08:00
holan20180123 22f5c0b363 Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-08-27 13:48:23 +08:00
holan20180123 1062033526 * Finish Task #7711. 2020-08-27 13:42:16 +08:00
Yagami 8197765c51 * Add cron sql. 2020-08-27 13:21:50 +08:00
leiyong f0276c001b * Finish task#7705. 2020-08-27 11:18:30 +08:00
Yagami b3e27f70b3 * Mv milestone to qc. 2020-08-27 11:17:22 +08:00
Catouse a5f004beab Merge branch '20.x'
# Conflicts:
#	module/program/view/create.html.php
2020-08-27 09:33:00 +08:00
Catouse 6040241c94 * hide products select control on count less than 2. 2020-08-27 09:02:38 +08:00