朱金勇
|
cb9a0b6af9
|
Merge branch 'sprint202_leiyong_fix_bug' into 'master'
* Finish task#56933.
See merge request easycorp/zentaopms!3916
|
2022-06-14 09:44:45 +00:00 |
|
leiyong
|
b6f5c18dc9
|
* Finish task#56933.
|
2022-06-14 07:56:43 +00:00 |
|
xieqiyu
|
a384279f28
|
* Finish task#56911.
|
2022-06-14 13:45:45 +08:00 |
|
xieqiyu
|
030d826624
|
* Finish task#56912.
|
2022-06-14 13:34:49 +08:00 |
|
xieqiyu
|
d343298490
|
* Finish task#56913.
|
2022-06-14 13:28:42 +08:00 |
|
孙广明
|
da2b704d31
|
* Finish task #57157.
|
2022-06-14 10:46:29 +08:00 |
|
zhouxin
|
68b8268391
|
* Finish task #55258.
|
2022-06-13 01:25:38 +00:00 |
|
wangyidong
|
9b699300ff
|
* code for bug #23516.
|
2022-06-09 16:50:07 +08:00 |
|
王怡栋
|
95fa3f04e1
|
Merge branch 'fixbug' into 'master'
* Fix bug #23474,23474,23441,23374.
See merge request easycorp/zentaopms!3830
|
2022-06-09 07:25:39 +00:00 |
|
liumengyi
|
63717f4fd0
|
* Fix bug of task #56454.
|
2022-06-09 15:18:56 +08:00 |
|
tanghucheng
|
415542746b
|
* Fix bug #23374.
|
2022-06-09 14:54:54 +08:00 |
|
tanghucheng
|
c4765a8431
|
* Fix bug #23441.
|
2022-06-09 14:41:26 +08:00 |
|
tanghucheng
|
87e879e047
|
* Fix bug #23474,23474.
|
2022-06-09 14:34:11 +08:00 |
|
王怡栋
|
fd0cb543ba
|
Merge branch 'master' into 'sprint_200'
# Conflicts:
# module/execution/lang/en.php
# module/execution/lang/zh-cn.php
# module/execution/view/kanban.html.php
# module/kanban/css/space.css
|
2022-06-09 03:16:20 +00:00 |
|
wangyidong
|
11e6edcd22
|
Merge branch 'zdoo18'
|
2022-06-08 17:06:07 +08:00 |
|
leiyong
|
49604b2248
|
* Adjust code.
|
2022-06-08 07:10:02 +00:00 |
|
王怡栋
|
196b78a0aa
|
Merge branch 'sprint/201_tianshujie_56476' into 'master'
Sprint/201 tianshujie 56476
See merge request easycorp/zentaopms!3794
|
2022-06-08 06:48:46 +00:00 |
|
liumengyi
|
5511a51882
|
* Fix bug #23340.
|
2022-06-08 10:35:41 +08:00 |
|
孙广明
|
b896377846
|
* Change zentao license.
|
2022-06-08 10:02:29 +08:00 |
|
孙广明
|
b528156589
|
* Change license.
|
2022-06-08 09:34:46 +08:00 |
|
leiyong
|
6ba36fc282
|
* Finish task#56387.
|
2022-06-07 08:16:56 +00:00 |
|
tianshujie
|
c7b1da840f
|
* Fix bug #56476.
|
2022-06-07 15:14:24 +08:00 |
|
liumengyi
|
6e4ac95a48
|
* Fix bug #23340.
|
2022-06-07 10:35:13 +08:00 |
|
xieqiyu
|
4bd7502e34
|
* Fix bug#23083.
|
2022-06-06 01:46:45 +08:00 |
|
wangyidong
|
fb786e9cf6
|
* remove useless flow action.
|
2022-06-02 15:02:38 +08:00 |
|
wangyidong
|
2400dfc83a
|
* code for task #55568.
|
2022-06-01 14:48:35 +08:00 |
|
tianshujie
|
7a70ae8481
|
* Finish task #55675.
|
2022-06-01 13:50:53 +08:00 |
|
tianshujie
|
2fb1cc0032
|
* Finish task #55675.
|
2022-06-01 10:57:07 +08:00 |
|
tianshujie
|
bee7fe5ae4
|
* Export tasks Add task mode.
|
2022-05-27 05:38:05 +08:00 |
|
tianshujie
|
ae096f635c
|
* Fix bug #22979.
|
2022-05-26 21:32:07 +08:00 |
|
tianshujie
|
53e95069e4
|
* Fix bug #22979.
|
2022-05-26 21:08:37 +08:00 |
|
tianshujie
|
50e9f82455
|
* Fix bug #22988.
|
2022-05-26 14:20:44 +08:00 |
|
tianshujie
|
8c2654c7d2
|
* Fix bug #22979.
|
2022-05-26 13:55:49 +08:00 |
|
tianshujie
|
017019f6af
|
* Fix bug #22952,22979.
|
2022-05-26 11:35:47 +08:00 |
|
tianshujie
|
3e427c11a4
|
* Fix bug #22943.
|
2022-05-26 11:35:01 +08:00 |
|
tianshujie
|
f30883a442
|
* Delete extra blank lines.
|
2022-05-25 17:28:44 +08:00 |
|
李玉春
|
b41cdeb6f4
|
Merge branch 'sprint/194_tianshujie_55257' into 'master'
Sprint/194 tianshujie 55257
See merge request easycorp/zentaopms!3594
|
2022-05-25 08:08:26 +00:00 |
|
tianshujie
|
8e3068d9b5
|
* Finish task #55257.
|
2022-05-25 14:26:21 +08:00 |
|
孙广明
|
2c60c73f47
|
Merge branch 'sprint/195_zg_55147' into 'master'
* Finish task#55174，55172
See merge request easycorp/zentaopms!3573
|
2022-05-25 05:51:37 +00:00 |
|
tianshujie
|
e3d1c44eae
|
* Finish task #55257.
|
2022-05-25 13:45:10 +08:00 |
|
mayue
|
33b78769b4
|
* Fix bug #22901.
|
2022-05-25 05:28:36 +00:00 |
|
daitingting
|
79af02f18a
|
* Remove useless object param.
|
2022-05-25 01:25:53 +00:00 |
|
zenggang
|
5b623fa3c4
|
* Finish task#55174
|
2022-05-25 01:12:37 +00:00 |
|
daitingting
|
e2f7c10296
|
* Set default value in getFieldControl function, finish task #54954.
|
2022-05-25 01:03:06 +00:00 |
|
孙广明
|
495a034784
|
* Finish task #55178.
|
2022-05-24 14:15:34 +08:00 |
|
wangyidong
|
967d24dd06
|
Merge branch 'sprint/189_package'
|
2022-05-24 10:32:09 +08:00 |
|
孙华伟
|
9e9395694d
|
*Fix bug #22375.
|
2022-05-19 15:27:37 +08:00 |
|
liumengyi
|
2d3f07a300
|
* Code format fot task #54318.
|
2022-05-19 10:35:12 +08:00 |
|
liumengyi
|
dee4ff7043
|
* Finish task #54318.
|
2022-05-19 08:55:27 +08:00 |
|
孙华伟
|
0d132275da
|
Update recordestimate.js
|
2022-05-18 07:59:48 +00:00 |
|