 leiyong
|
f1d9e3375f
|
* Fix bug#24031.
|
2022-06-23 01:16:26 +00:00 |
|
|
王怡栋
|
6fd3c28a23
|
Merge branch 'sprint205_leiyong_task_57878' into 'master'
Sprint205 leiyong task 57878
See merge request easycorp/zentaopms!4074
|
2022-06-23 00:41:00 +00:00 |
|
|
朱金勇
|
bdca637fcf
|
Merge branch 'sprint/205_hufangzhou_24153' into 'master'
* Fix bug #24157,#24155,#24154,#24153.
See merge request easycorp/zentaopms!4080
|
2022-06-22 09:44:34 +00:00 |
|
|
hufangzhou
|
ee7960af51
|
* Fix bug #24157,#24155,#24154.
|
2022-06-22 17:42:59 +08:00 |
|
|
王怡栋
|
9ffdc942c2
|
Merge branch 'master' into 'sprint/205'
# Conflicts:
# module/execution/lang/en.php
# module/execution/lang/zh-cn.php
|
2022-06-22 09:21:12 +00:00 |
|
|
hufangzhou
|
c7a3a89c5b
|
* Fix bug #24153.
|
2022-06-22 17:11:20 +08:00 |
|
|
leiyong
|
3d1a9eb517
|
* Finish task#57878.
|
2022-06-22 08:48:19 +00:00 |
|
|
leiyong
|
df2ef74d07
|
* Finish task#57878.
|
2022-06-22 08:23:43 +00:00 |
|
|
tianshujie
|
e2669481c7
|
* Added German and French.
|
2022-06-22 15:28:45 +08:00 |
|
|
tianshujie
|
7372f7f936
|
* Finish story #32623.
|
2022-06-22 08:51:05 +08:00 |
|
|
hufangzhou
|
adad8ea3ae
|
* Finish task #57882, #57874, #57873, #57855.
|
2022-06-21 17:30:36 +08:00 |
|
|
孙广明
|
c41b4f6e69
|
Merge branch 'sprint205_leiyong_task_57901' into 'sprint/205'
Sprint205 leiyong task 57901
See merge request easycorp/zentaopms!4032
|
2022-06-21 06:45:17 +00:00 |
|
|
王怡栋
|
a3bb60c87d
|
Merge branch 'sprint/master_zhouxudong_57871' into 'sprint/205'
Sprint/master zhouxudong 57871
See merge request easycorp/zentaopms!4024
|
2022-06-21 06:03:28 +00:00 |
|
|
leiyong
|
b0645c9cdd
|
* Adjust CSS.
|
2022-06-21 02:13:42 +00:00 |
|
|
leiyong
|
725f37fcd0
|
* Finish task#57868.
|
2022-06-20 09:55:19 +00:00 |
|
|
leiyong
|
bb125909dc
|
Finish task#57864.
|
2022-06-20 09:44:25 +00:00 |
|
|
leiyong
|
101c0f58a5
|
* Finish task#57863.
|
2022-06-20 06:58:29 +00:00 |
|
|
zhouxudong
|
19d289455a
|
* Finish task #57880 #57881 #57866.
|
2022-06-20 06:34:29 +00:00 |
|
|
zhouxudong
|
85dac08786
|
* Fix bug #23693.
|
2022-06-15 06:22:17 +00:00 |
|
|
zhouxudong
|
6307cd07e2
|
* Fix bug #23693.* Fix bug #23693.* Fix bug #23693.* Fix bug #23693.* Fix bug #23693.* Fix bug #23693.* Fix bug #23693.* Fix bug #23693.
|
2022-06-15 06:20:28 +00:00 |
|
|
xieqiyu
|
771db77e9f
|
* Finish task#56907.
|
2022-06-13 14:03:54 +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 |
|
|
xieqiyu
|
36e609f808
|
* Fix bug#23116.
|
2022-06-06 16:52:30 +08:00 |
|
|
孙广明
|
61ad544156
|
Merge branch 'zentaopms_198'
|
2022-06-02 15:04:56 +08:00 |
|
|
leiyong
|
ea4eb1d2de
|
* Finish task#54979.
|
2022-05-26 07:28:03 +00:00 |
|
|
zenggang
|
c1f648d22a
|
* Fix bug#22957
|
2022-05-26 05:36:53 +00:00 |
|
|
tianshujie
|
ad49931b1d
|
* Add testcase of block module.
|
2022-05-13 22:32:17 +08:00 |
|
|
tianshujie
|
2835c2a3e8
|
* Add testcase of block module.
|
2022-05-13 11:13:36 +08:00 |
|
|
wangyidong
|
9508d7729b
|
* code for bug #21400.
|
2022-04-27 09:55:50 +08:00 |
|
|
wangyidong
|
66df7b4990
|
* code for bug #15377.
|
2022-04-26 16:43:10 +08:00 |
|
|
wangxiaomeng
|
c49b50b422
|
fixbug_#21834.
|
2022-04-20 15:37:56 +08:00 |
|
|
xieqiyu
|
0eb4023b74
|
* Fix bug#13863.
|
2022-04-19 11:25:05 +08:00 |
|
|
xieqiyu
|
8ce20cb746
|
* Fix bug#14454.
|
2022-04-18 13:45:46 +08:00 |
|
|
王怡栋
|
323f7366ba
|
* code for bug #21020.
|
2022-04-18 13:26:25 +08:00 |
|
|
tanghucheng
|
3707793e40
|
* Fix bug for product index.
|
2022-04-15 15:27:46 +08:00 |
|
|
王怡栋
|
8f11396658
|
Merge branch 'fixbug' into 'master'
* Fix bug #17634.
See merge request easycorp/zentaopms!2962
|
2022-04-15 06:42:32 +00:00 |
|
|
tanghucheng
|
9761644a92
|
* Fix bug #17634.
|
2022-04-15 14:41:18 +08:00 |
|
|
王怡栋
|
1191d86cd4
|
Merge branch 'sprint/master_zhouxudong_17929' into 'master'
* Fix bug #17929.
See merge request easycorp/zentaopms!2947
|
2022-04-14 09:21:00 +00:00 |
|
|
xieqiyu
|
a7c8401684
|
* Fix bug#14454.
|
2022-04-14 16:45:28 +08:00 |
|
|
xieqiyu
|
f971ded6fd
|
* Fix bug#14454.
|
2022-04-14 16:13:18 +08:00 |
|
|
zhouxudong
|
68fbd1baf0
|
* Fix bug #17929.
|
2022-04-14 16:00:27 +08:00 |
|
|
孙广明
|
96aac66684
|
Merge branch 'master_xieqiyu_13127' into 'master'
* Fix bug#13127.
See merge request easycorp/zentaopms!2914
|
2022-04-13 08:22:07 +00:00 |
|
|
zhouxudong
|
61198c8486
|
* Fix bug #14189.
|
2022-04-13 15:40:09 +08:00 |
|
|
王怡栋
|
6e9c3a8afc
|
Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug *21293
See merge request easycorp/zentaopms!2915
|
2022-04-13 06:49:48 +00:00 |
|
|
Zongjun Lan
|
0aa1cc9ad9
|
* fix bug *21293
|
2022-04-13 14:39:33 +08:00 |
|
|
xieqiyu
|
573fa80df6
|
* Fix bug#13127.
|
2022-04-13 14:00:25 +08:00 |
|
|
zhouxudong
|
20a9051148
|
* Fix bug #14891.
|
2022-04-13 11:23:29 +08:00 |
|
|
王怡栋
|
f6b236aed7
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-04-13 10:02:05 +08:00 |
|
|
王怡栋
|
a9809c35aa
|
* code for bug #20823.
|
2022-04-13 10:01:36 +08:00 |
|