 mayue
|
a074537835
|
* Resolve feedback #1941.
|
2023-01-10 13:07:38 +08:00 |
|
|
王怡栋
|
7fe559597f
|
Merge branch 'zentaopms_283_fix_task_#82075' into 'master'
* Finish task #82075.
See merge request easycorp/zentaopms!6729
|
2023-01-09 00:25:09 +00:00 |
|
|
王怡栋
|
0b625878de
|
Merge branch 'master' into 'zentaopms_283_task_#82064'
# Conflicts:
# module/story/view/view.html.php
|
2023-01-09 00:23:49 +00:00 |
|
|
daitingting
|
40f8690b60
|
* Finish task #82075.
|
2023-01-08 02:29:13 +00:00 |
|
|
daitingting
|
903cfc57ac
|
* Finish task #82064.
|
2023-01-06 09:15:42 +00:00 |
|
|
王怡栋
|
b6f3986894
|
Merge branch 'zentaopms_283' into 'master'
Zentaopms 283
See merge request easycorp/zentaopms!6725
|
2023-01-06 08:31:14 +00:00 |
|
|
liuhong
|
309ee56b03
|
* Fix bug #31537.
|
2023-01-06 06:36:13 +00:00 |
|
|
daitingting
|
aa6206cdb3
|
* Finish task #82064.
|
2023-01-06 03:24:35 +00:00 |
|
|
hufangzhou
|
df9a7a806a
|
* Fix bug #31444.
|
2023-01-04 08:44:56 +00:00 |
|
|
daitingting
|
80cce4e580
|
* Finish task #82075.
|
2023-01-04 08:08:38 +00:00 |
|
|
tanghucheng
|
62c1ed7f9c
|
Merge branch 'master' into zenops_46
|
2022-12-30 09:40:04 +08:00 |
|
|
田淑杰
|
b790198243
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/272
|
2022-12-30 08:46:01 +08:00 |
|
|
孙广明
|
137953e0ae
|
Merge branch 'zentaopms_277'
|
2022-12-30 08:45:34 +08:00 |
|
|
孙广明
|
9b3d6387a5
|
* Finish task #81192.
|
2022-12-29 10:55:03 +08:00 |
|
|
xieqiyu
|
bb0c7167c9
|
* Code for task#81187.
|
2022-12-28 14:20:57 +08:00 |
|
|
xieqiyu
|
260e043338
|
* Code for task#81187.
|
2022-12-28 13:40:27 +08:00 |
|
|
田淑杰
|
bf26d1f914
|
* Fix bug #29365.
|
2022-12-26 09:58:01 +08:00 |
|
|
lanzongjun
|
795dc6c13b
|
* Finish Task #80491
|
2022-12-22 10:52:01 +08:00 |
|
|
wangyidong
|
d24441491c
|
* fix bug #30591.
|
2022-12-21 16:48:09 +08:00 |
|
|
wangyidong
|
bc02660990
|
* code for task #80451.
|
2022-12-21 15:50:17 +08:00 |
|
|
caoyanyi
|
71bc8ac80a
|
Merge branch 'master' into zenops_46
|
2022-12-21 13:56:27 +08:00 |
|
|
wangyidong
|
164cca5ffe
|
* code task #80451.
|
2022-12-21 10:31:46 +08:00 |
|
|
lanzongjun
|
73b44f6bdd
|
* Finish Task #80491
|
2022-12-20 18:03:52 +08:00 |
|
|
tanghucheng
|
5b2babca14
|
Merge branch 'master' into zenops_46
|
2022-12-20 16:36:44 +08:00 |
|
|
孙广明
|
aedf34e7dc
|
Merge branch 'master_xieqiyu_30291' into 'master'
* Fix bug#30291.
See merge request easycorp/zentaopms!6585
|
2022-12-16 08:22:35 +00:00 |
|
|
孙广明
|
a5a440f62e
|
Merge branch 'sprint/zentaopms271_lanzongjun' into 'master'
* Fix Bug
See merge request easycorp/zentaopms!6584
|
2022-12-16 07:55:58 +00:00 |
|
|
xieqiyu
|
d0fb46062d
|
* Fix bug#30291.
|
2022-12-16 15:55:54 +08:00 |
|
|
lanzongjun
|
cbe351104a
|
* Fix Bug
|
2022-12-16 15:55:01 +08:00 |
|
|
孙广明
|
6fe0374751
|
Merge branch 'master_xieqiyu_30855' into 'master'
* Fix bug#30855.
See merge request easycorp/zentaopms!6582
|
2022-12-16 07:09:28 +00:00 |
|
|
孙广明
|
4c98d0cd33
|
Merge branch 'sprint/zentaopms271_lanzongjun' into 'master'
* Fix Bug #30957
See merge request easycorp/zentaopms!6583
|
2022-12-16 07:09:02 +00:00 |
|
|
lanzongjun
|
febbe41e69
|
* Fix Bug #30957
|
2022-12-16 15:01:38 +08:00 |
|
|
xieqiyu
|
af8cf547ea
|
* Fix bug#30855.
|
2022-12-16 14:52:42 +08:00 |
|
|
xieqiyu
|
61e41379be
|
* Fix bug#30583.
|
2022-12-16 14:23:21 +08:00 |
|
|
孙广明
|
294ab34e83
|
Merge branch 'sprint/zentaopms271_lanzongjun' into 'master'
* Fix Bug product release show error #30883
See merge request easycorp/zentaopms!6573
|
2022-12-16 05:06:52 +00:00 |
|
|
lanzongjun
|
8e7afd50c9
|
* Fix Bug #30883
|
2022-12-16 11:00:36 +08:00 |
|
|
xieqiyu
|
dc425fd923
|
* Fix bug#30891.
|
2022-12-16 10:36:40 +08:00 |
|
|
孙广明
|
8649716ad4
|
* Fix bug #30916.
|
2022-12-16 10:30:46 +08:00 |
|
|
王怡栋
|
2225fa3632
|
Merge branch 'zentaopms_bug_#30911' into 'master'
* Fix bug #30911.
See merge request easycorp/zentaopms!6566
|
2022-12-15 08:27:11 +00:00 |
|
|
xieqiyu
|
5c34348cd9
|
* Fix bug#30901.
|
2022-12-15 16:18:18 +08:00 |
|
|
daitingting
|
d241f76e49
|
* Fix bug #30911.
|
2022-12-15 08:10:58 +00:00 |
|
|
孙广明
|
b827ae2002
|
Merge branch 'sprint/zentaopms271_lanzongjun' into 'master'
* fix bug #30796#30765#79453#30886#30909
See merge request easycorp/zentaopms!6549
|
2022-12-15 07:58:29 +00:00 |
|
|
孙广明
|
2bcd6ed191
|
Merge branch 'master_xieqiyu_30844' into 'master'
* Fix bug#30844.
See merge request easycorp/zentaopms!6553
|
2022-12-15 07:57:10 +00:00 |
|
|
孙广明
|
e173f7e3bf
|
Merge branch 'master_liuhong_30897' into 'master'
* Fix bug #30897.
See merge request easycorp/zentaopms!6561
|
2022-12-15 07:49:58 +00:00 |
|
|
孙广明
|
a788dedd50
|
* Fix bug #30916.
|
2022-12-15 15:46:34 +08:00 |
|
|
孙广明
|
2a2ea5e9b0
|
* Remove unused code.
|
2022-12-15 15:33:15 +08:00 |
|
|
tanghucheng
|
85ffa23da8
|
Merge branch 'master' into zenops_46_tanghucheng
|
2022-12-15 15:27:59 +08:00 |
|
|
孙广明
|
4acb2e69ec
|
* Fix bug #30658.
|
2022-12-15 15:17:10 +08:00 |
|
|
liuhong
|
82a2cb0381
|
* Fix bug #30897.
|
2022-12-15 06:51:55 +00:00 |
|
|
lanzongjun
|
b4dd6cb307
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/zentaopms271_lanzongjun
|
2022-12-15 13:54:20 +08:00 |
|
|
孙广明
|
dc7d8a5500
|
Merge branch 'master' into 'sprint_273_79667'
# Conflicts:
# module/story/lang/de.php
# module/story/lang/en.php
# module/story/lang/fr.php
# module/story/lang/zh-cn.php
|
2022-12-15 05:30:51 +00:00 |
|