Commit Graph

419 Commits

Author SHA1 Message Date
holan20180123
7b5ea8ebb8 * Finish task #9002. 2021-01-15 10:46:33 +08:00
leiyong
970f3e11a5 * Adjust the batchedit method icons. 2021-01-01 14:37:16 +08:00
leiyong
46c6c94d67 * Fix bug.. 2020-12-18 09:51:05 +08:00
leiyong
b8873da77f * Finish task#8671,task#8670. 2020-12-17 16:04:14 +08:00
holan20180123
7df9406760 * Finish task #8666. 2020-12-17 14:03:06 +08:00
tianshujie98
b6fd197901 * Finish task #8669. 2020-12-16 15:35:46 +08:00
wangyidong
c771e1947c Merge branch '12.x' 2020-12-11 20:42:10 +08:00
tianshujie98
f734f15e7a * Adjust code style. 2020-12-11 16:52:33 +08:00
tianshujie98
dabb2d003d * Adjust code style. 2020-12-11 15:45:03 +08:00
wangyidong
b5ad4665b4 Merge branch '12.x' of github.com:easysoft/zentaopms into 12.x 2020-12-08 09:26:47 +08:00
wangyidong
8de5f93c2b * fix bug #3693. 2020-12-08 09:21:32 +08:00
tianshujie98
f0a4efa0ad * Fix bug #3627. 2020-12-07 11:38:38 +08:00
tianshujie98
475d9a5c27 * Fix bug #3627. 2020-12-07 09:24:37 +08:00
tianshujie98
5986a102e9 * Fix bug. Restart assigned to problem. 2020-12-02 14:44:41 +08:00
tianshujie98
af5b5b88ab * Fix bug #3669. 2020-12-02 14:35:40 +08:00
tianshujie98
27e9164878 * Fix bug. Restart assigned to problem. 2020-12-02 14:10:00 +08:00
tianshujie98
48fb4f32e9 * Fix bug #3669. 2020-12-02 09:50:36 +08:00
tianshujie98
9d66e7c103 * Add comment. 2020-11-30 09:23:48 +08:00
tianshujie98
161c9d4b9a * Adjust code style. 2020-11-25 17:27:18 +08:00
tianshujie98
5a8d12aa74 * Adjust code style. 2020-11-25 17:16:40 +08:00
tianshujie98
9c0d932ebf * Adjust code style. 2020-11-25 16:41:18 +08:00
tianshujie98
4049054ce4 * Finsh task #8495. 2020-11-25 16:13:51 +08:00
leiyong
5ef321f149 * Adjust code logic. 2020-11-25 10:59:41 +08:00
z
b42d47e257 Merge branch '12.x' 2020-11-23 20:42:59 +08:00
holan20180123
221a3ee96d * Method Renaming 'Project' to 'Execution'. 2020-11-20 10:59:49 +08:00
holan20180123
3f752243f6 * Method renaming 'getPairs' to 'getExecutionPairs'. 2020-11-19 16:14:04 +08:00
holan20180123
77af51dacd * Method renaming 'getParis' to 'getExecutionPairs'. 2020-11-19 15:53:33 +08:00
holan20180123
b48d870e13 * Modify method 'getPairs' to 'getExecutionPairs'. 2020-11-19 15:07:44 +08:00
holan20180123
0dad2445f1 * Rename project to execution. 2020-11-19 15:03:50 +08:00
hufangzhou
526d2c1e75 * Finish task#8416. 2020-11-17 13:47:16 +08:00
hufangzhou
a13f8cd4c0 * Adjust the logic of the assigned to. 2020-11-03 17:26:51 +08:00
hufangzhou
a6e6f7a8a2 * Finish task#8201: Add the assignedTo field for the start task page. 2020-11-03 16:49:03 +08:00
z
5644b81408 Merge branch '12.x' 2020-10-30 16:58:47 +08:00
z
bd59b4a920 * finish task #12974. 2020-10-29 13:24:46 +08:00
Yagami
4209766be3 * Rename var name. 2020-09-30 17:18:24 +08:00
Yagami
ffaf91d467 * Rename program to PRJ. 2020-09-22 15:10:11 +08:00
tianshujie98
32444c9564 * Finish task #7990. 2020-09-18 13:11:14 +08:00
tianshujie98
2f12591e13 * Finish task #7990. 2020-09-18 11:38:03 +08:00
tianshujie98
4e67efa330 * Add notes. 2020-09-17 08:23:11 +08:00
tianshujie98
fec42aa3e5 * Finish task #7944. 2020-09-17 08:21:04 +08:00
tianshujie98
e8875195b2 * Finish task #7944. 2020-09-17 08:16:39 +08:00
Yagami
66f4f5403a * Fix sql and rename program to PRJ. 2020-09-16 11:28:55 +08:00
tianshujie98
9d263108e1 * Fix bug #3460. 2020-09-09 09:55:21 +08:00
z
a9df6f3b9c * merge after 12.4.1 changes. 2020-08-31 15:31:55 +08:00
holan20180123
521cea2844 Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-08-31 15:04:28 +08:00
holan20180123
7a661001da * Finish task #7758. 2020-08-31 14:57:44 +08:00
Yagami
116a7e43b3 * Finish task #7721. 2020-08-31 13:34:32 +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
Yagami
4e0a3d0da5 * Fix block details. 2020-08-25 14:59:24 +08:00