Commit Graph

1937 Commits

Author SHA1 Message Date
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
holan20180123
ff67859fd0 * Fix bug #3708. 2020-12-14 16:24:35 +08:00
holan20180123
f4dc0e656c * Fix bug #3708. 2020-12-14 16:10:47 +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
95470ded6e * code bug #3688. 2020-12-11 09:54:23 +08:00
wangyidong
ecae390f75 * adjust style. 2020-12-10 17:06:31 +08:00
wangyidong
fa246c1173 * finish task #3688. 2020-12-08 14:52:26 +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
holan20180123
9cdcd2a428 * Fix bug #3636. 2020-12-07 13:10:59 +08:00
holan20180123
bab45be34c * Fix bug #3636. 2020-12-07 13:06:35 +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
wangyidong
5d394844d6 * fix bug #3688. 2020-12-03 16:24:17 +08:00
leiyong
9d2cde28ae * Adjust issue module code. 2020-12-02 16:47:21 +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
1d431a1155 * Fix bug #3687. 2020-12-02 14:25:57 +08:00
tianshujie98
27e9164878 * Fix bug. Restart assigned to problem. 2020-12-02 14:10:00 +08:00
tianshujie98
d27ce0f463 * Fix bug #3687. 2020-12-02 10:32:44 +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
Yagami
90446d239a * Merge code and finish task #8475. 2020-11-25 10:36:44 +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
tianshujie98
9b176b2e0e * Finish task #8413. 2020-11-19 13:35:05 +08:00
holan20180123
cb8dc1bc3b * Finish task #8389. 2020-11-17 16:11:06 +08:00
holan20180123
4943ce7bbe * Finish task #8387. 2020-11-17 15:25:16 +08:00
z
2c7eee240b Merge branch '12.x' of github.com:easysoft/zentaopms into 12.x 2020-11-17 14:13:16 +08:00
z
4ec88c316d * adjust for realStarted. 2020-11-17 14:07:39 +08:00
hufangzhou
526d2c1e75 * Finish task#8416. 2020-11-17 13:47:16 +08:00
tianshujie98
d974dbf169 * Finish task #8413. 2020-11-17 13:33:20 +08:00
holan20180123
fb9c44d0a1 * Finish task #8194. 2020-11-13 11:28:25 +08:00
holan20180123
a7533f722d * Finish task #8194. 2020-11-12 10:09:16 +08:00
z
9eeae95349 Merge branch '12.x' of github.com:easysoft/zentaopms into 12.x 2020-11-11 15:40:47 +08:00
z
305ceda937 * finish task #3665. 2020-11-11 14:43:05 +08:00
holan20180123
15e8463347 * Finish task #8194. 2020-11-11 11:18:08 +08:00
Catouse
0a9544136e * task #8227, bug #3575, enable submit button on check hours. 2020-11-10 16:58:32 +08:00