朱金勇
|
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 |
|
王怡栋
|
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 |
|
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 |
|
孙广明
|
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 |
|
tianshujie
|
8c2654c7d2
|
* Fix bug #22979.
|
2022-05-26 13:55:49 +08:00 |
|
tianshujie
|
3e427c11a4
|
* Fix bug #22943.
|
2022-05-26 11:35:01 +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 |
|
孙广明
|
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 |
|
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 |
|
孙华伟
|
545dcf550c
|
*Optimize the code.
|
2022-05-17 17:28:11 +08:00 |
|
孙华伟
|
3099628ce1
|
*Optimize the code.
|
2022-05-17 17:08:27 +08:00 |
|
孙华伟
|
4bc08301f8
|
*Fix bug #22375
|
2022-05-17 10:40:11 +08:00 |
|
xieqiyu
|
e085535743
|
* Fix bug#22375.
|
2022-05-16 14:59:06 +08:00 |
|
wangyuting2
|
3380222afc
|
* Fix build action menu bug.
|
2022-05-11 16:11:34 +08:00 |
|
wangyuting2
|
d4ed89e64a
|
* Finish task #53548.
|
2022-05-11 15:05:13 +08:00 |
|
孙广明
|
37733991df
|
Merge branch 'fixbug_21140' into 'master'
*Fixbug_21140
See merge request easycorp/zentaopms!3107
|
2022-04-25 06:42:26 +00:00 |
|
sunjun
|
1cf2e5e541
|
*Fixbug_21140
|
2022-04-25 13:10:55 +08:00 |
|
xieqiyu
|
3a533b72c9
|
* Fix bug#21947.
|
2022-04-24 09:48:31 +08:00 |
|
孙广明
|
c37e1ef5b6
|
Merge branch 'fixbug_21140' into 'master'
*Fixbug_21140
See merge request easycorp/zentaopms!3069
|
2022-04-22 00:50:58 +00:00 |
|
sunjun
|
cce29cd63c
|
*Fixbug_21140
|
2022-04-22 08:48:03 +08:00 |
|
孙广明
|
e4295fdbe5
|
* Code for workflow bug.
|
2022-04-21 10:40:56 +08:00 |
|
孙广明
|
7fb3a62058
|
* Fix workflow bug.
|
2022-04-21 10:24:25 +08:00 |
|
孙广明
|
e4738c50ea
|
* Add required to workflow field.
|
2022-04-20 13:08:20 +08:00 |
|
孙广明
|
313e39712c
|
* Fix workflow bug.
|
2022-04-20 10:17:16 +08:00 |
|
xieqiyu
|
6618197691
|
* Fix bug#19196.
|
2022-04-08 09:48:11 +08:00 |
|
孙广明
|
1746814316
|
Merge branch 'sprint/master_zhouxudong_17123' into 'master'
* Fix bug #17123.
See merge request easycorp/zentaopms!2672
|
2022-03-31 07:18:02 +00:00 |
|
zhouxudong
|
2b69acf643
|
* Fix bug #17123.
|
2022-03-31 14:55:04 +08:00 |
|
孙广明
|
5e8b3f2249
|
Merge branch 'fixbugs_zhouxin_21333' into 'master'
* Fix bug #21333.
See merge request easycorp/zentaopms!2668
|
2022-03-31 06:33:31 +00:00 |
|
zhouxin
|
bb47bfa04c
|
* Fix bug #21333.
|
2022-03-31 06:02:31 +00:00 |
|
孙广明
|
df2cda6e8b
|
Merge branch 'sprint/master_zhouxudong_18083' into 'master'
Sprint/master zhouxudong 18083
See merge request easycorp/zentaopms!2653
|
2022-03-31 03:06:37 +00:00 |
|
zhouxudong
|
a42d621269
|
* Fix bug #18083.
|
2022-03-30 09:13:13 +08:00 |
|
xieqiyu
|
01a7b6391b
|
* Fix bug#11308,#20582.
|
2022-03-29 08:22:45 +08:00 |
|
xieqiyu
|
f72da77a5d
|
* Code for bug#20875.
|
2022-03-28 13:52:42 +08:00 |
|
王怡栋
|
39c46536f1
|
* code for task #51327.
|
2022-03-23 11:05:58 +08:00 |
|
王怡栋
|
d71568e98d
|
* code for task #51327.
|
2022-03-23 10:55:05 +08:00 |
|
zenggang
|
784e153159
|
* Finish task#51115,51116,51120,51121,51133
|
2022-03-22 07:11:57 +00:00 |
|
zhouxudong
|
a643044137
|
* Fix bug #16070.
|
2022-03-22 14:53:08 +08:00 |
|
王怡栋
|
fe91dc8481
|
Merge branch 'pailei2'
|
2022-03-22 09:01:03 +08:00 |
|
zhouxudong
|
a7516f1178
|
* Fix bug #11985.
|
2022-03-21 09:41:23 +08:00 |
|