王怡栋
|
82968630b0
|
Merge branch 'master_xieqiyu_53671' into 'master'
Master xieqiyu 53671
See merge request easycorp/zentaopms!3322
|
2022-05-11 05:17:05 +00:00 |
|
xieqiyu
|
c77a6505d3
|
* Finish task#53671.
|
2022-05-11 09:01:17 +08:00 |
|
孙广明
|
e6ba9acf68
|
Merge branch 'sprint/tianshujie_task53668' into 'master'
Sprint/tianshujie task53668
See merge request easycorp/zentaopms!3310
|
2022-05-10 09:09:34 +00:00 |
|
tianshujie
|
5bdb7f521c
|
* Finish task #53668.
|
2022-05-10 17:05:49 +08:00 |
|
sunjun
|
631601a39b
|
sprint_sunjun_53665
|
2022-05-10 06:42:34 +00:00 |
|
tianshujie
|
5c00aa823c
|
* Modify language item error.
|
2022-05-10 11:24:17 +08:00 |
|
liyuchun
|
81903f2fe5
|
* Fix bug #15563.
|
2022-04-28 06:05:39 +00:00 |
|
tanghucheng
|
c781eadd94
|
* Fix bug.
|
2022-04-27 17:28:08 +08:00 |
|
tanghucheng
|
f4666d8384
|
* Fix bug #15677.
|
2022-04-27 14:21:00 +08:00 |
|
lanzongjun
|
68270a031b
|
* fix bug #15834
|
2022-04-26 10:50:44 +08:00 |
|
tanghucheng
|
76c0462119
|
* Fix bug #21439.
|
2022-04-24 01:53:07 +00:00 |
|
Zongjun Lan
|
c6678ed77b
|
* fix bug undefined from
|
2022-04-22 14:16:08 +08:00 |
|
Zongjun Lan
|
e2cfcf4e8d
|
* fix param name
|
2022-04-22 10:34:12 +08:00 |
|
Zongjun Lan
|
6ff7ac0d24
|
* fix bug #18933
|
2022-04-21 16:49:56 +08:00 |
|
王怡栋
|
eec155064a
|
* fix bug #20933.
|
2022-04-20 11:26:32 +08:00 |
|
Hao Sun
|
af43ca6bb3
|
* bug #6910, optimize helper "text-limit" and support for displaying html.
|
2022-04-18 10:25:28 +08:00 |
|
朱金勇
|
1ad5accfce
|
Merge branch 'sprint/sunhao/bug19052' into 'master'
* bug #19052, fix width for some models.
See merge request easycorp/zentaopms!2965
|
2022-04-18 00:10:55 +00:00 |
|
Hao Sun
|
6ea976a722
|
* bug #19052, fix width for some models.
|
2022-04-15 14:35:05 +08:00 |
|
sunjun
|
3a60274cf6
|
*Fixbug_sunjun_19732
|
2022-04-15 14:23:08 +08:00 |
|
renying
|
d219dac730
|
Fix bug#17274
|
2022-04-14 14:37:10 +08:00 |
|
孙广明
|
92eb57d9ef
|
Merge branch 'shunhuawei_fixbug_21488' into 'master'
*Beautify the interface.
See merge request easycorp/zentaopms!2894
|
2022-04-12 07:50:54 +00:00 |
|
孙华伟
|
6c85c8f49c
|
*Beautify the interface.
|
2022-04-12 15:47:01 +08:00 |
|
孙广明
|
1e86d0872a
|
Merge branch 'shunhuawei_fixbug_21488' into 'master'
Shunhuawei fixbug 21488
See merge request easycorp/zentaopms!2879
|
2022-04-12 06:44:47 +00:00 |
|
孙华伟
|
684196f776
|
*Optimize the code.
|
2022-04-12 14:43:05 +08:00 |
|
孙华伟
|
91597abdb7
|
*Optimize the code.
|
2022-04-12 14:39:27 +08:00 |
|
孙华伟
|
03cf60bdcb
|
*project,execution,bug have the same problem.
|
2022-04-12 14:26:12 +08:00 |
|
Hao Sun
|
281ad7e876
|
* fix search and redirect in ajax dropmenu not work as expected sometimes.
|
2022-04-08 11:43:35 +08:00 |
|
tianshujie
|
14fd19d50b
|
* Fix bug #18781.
|
2022-04-07 16:58:07 +08:00 |
|
朱金勇
|
33adc0ffbb
|
Merge branch 'sprint/sunhao/bug17170' into 'master'
* bug #17170, support for toggle all children rows on toggle parent row.
See merge request easycorp/zentaopms!2744
|
2022-04-02 08:23:42 +00:00 |
|
Hao Sun
|
f4222d7247
|
* bug #17170, support for toggle all children rows on toggle parent row.
|
2022-04-02 16:10:53 +08:00 |
|
xieqiyu
|
f9295faec3
|
* Fix bug#19711.
|
2022-04-02 15:39:03 +08:00 |
|
zhouxudong
|
c0bf8f5275
|
* Fix bug #21378.
|
2022-04-02 14:16:09 +08:00 |
|
王怡栋
|
4fa721b0bb
|
Merge branch '165_package'
|
2022-04-01 15:30:36 +08:00 |
|
xieqiyu
|
4542ffb0e2
|
* Fix bug#19197.
|
2022-03-31 13:59:38 +08:00 |
|
孙广明
|
e2c29e7854
|
Merge branch 'sprint/master_zhouxudong_18270' into 'master'
Sprint/master zhouxudong 18270
See merge request easycorp/zentaopms!2654
|
2022-03-31 03:08:33 +00:00 |
|
孙广明
|
5072b8929b
|
Merge branch 'sprint/master_zhouxudong_18002' into 'master'
Sprint/master zhouxudong 18002
See merge request easycorp/zentaopms!2659
|
2022-03-31 02:37:33 +00:00 |
|
xieqiyu
|
79d9664263
|
* Fix bug#18002.
|
2022-03-30 20:48:33 +08:00 |
|
王怡栋
|
08e3b0e29d
|
Merge branch 'master' into 'sprint/master_fixbug'
# Conflicts:
# module/execution/model.php
|
2022-03-30 08:01:18 +00:00 |
|
王怡栋
|
6c078665da
|
Merge branch 'sprint/tianshujie_fixbug' into 'master'
Sprint/tianshujie fixbug
See merge request easycorp/zentaopms!2636
|
2022-03-30 08:00:01 +00:00 |
|
tianshujie
|
a93dcb0ec7
|
* Modify the link in the executive board.
|
2022-03-30 15:55:45 +08:00 |
|
tanghucheng
|
19e6390ed7
|
* Fix bug #20890.
|
2022-03-30 15:16:52 +08:00 |
|
zhouxudong
|
c7e76c1176
|
* Fix bug #18270.
|
2022-03-30 13:05:59 +08:00 |
|
xieqiyu
|
f418c9b954
|
* Fix bug#21283.
|
2022-03-30 11:10:49 +08:00 |
|
zhouxudong
|
6b9eddc355
|
* Fix bug #18002.
|
2022-03-30 09:35:59 +08:00 |
|
zhouxudong
|
ecf749b7da
|
* Fix bug #18002.
|
2022-03-29 16:59:33 +08:00 |
|
zhouxudong
|
3e70b88210
|
* Fix bug #18270.
|
2022-03-29 14:49:01 +08:00 |
|
tianshujie
|
7885b87ef3
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/tianshujie_bug16101
|
2022-03-29 14:30:55 +08:00 |
|
zenggang
|
028833b838
|
* Fix bug#21092,11398
|
2022-03-29 06:16:14 +00:00 |
|
tianshujie
|
a0c4457a95
|
* Fix bug #16101.
|
2022-03-29 13:59:16 +08:00 |
|
tianshujie
|
0194c5b3c7
|
* Fix bug #21186.
|
2022-03-28 11:13:23 +08:00 |
|