朱金勇
|
97f1e1f68d
|
Merge branch 'sgm_storytest' into 'master'
* Add story auto test.
See merge request easycorp/zentaopms!2378
|
2022-03-18 09:13:26 +00:00 |
|
sgm0422
|
f3041476c3
|
* Add story auto test.
|
2022-03-18 16:51:27 +08:00 |
|
孙广明
|
f2d235caef
|
Merge branch 'autotest_ly' into 'master'
add company test
See merge request easycorp/zentaopms!2377
|
2022-03-18 07:59:17 +00:00 |
|
liyang
|
5151585496
|
add company test
|
2022-03-18 15:55:27 +08:00 |
|
王怡栋
|
01abf2d1c6
|
Merge branch 'fixbug' into 'master'
* Fix bug.
See merge request easycorp/zentaopms!2373
|
2022-03-18 06:59:17 +00:00 |
|
王怡栋
|
3a2774b102
|
Merge branch 'sprint/master_tanghucheng_fixbug' into 'master'
* Fix bug#20897,20907.
See merge request easycorp/zentaopms!2359
|
2022-03-18 06:58:41 +00:00 |
|
唐胡成
|
8f7328c7b2
|
Update lite.php
|
2022-03-18 06:41:49 +00:00 |
|
唐胡成
|
ec401cf865
|
Update lite.php
|
2022-03-18 06:40:32 +00:00 |
|
唐胡成
|
26e52edd7c
|
Merge branch 'master' into 'sprint/master_tanghucheng_fixbug'
# Conflicts:
# extension/lite/kanban/ext/lang/en/lite.php
# extension/lite/kanban/ext/lang/zh-cn/lite.php
|
2022-03-18 06:36:42 +00:00 |
|
tanghucheng
|
ad7b6144f9
|
* Fix bug.
|
2022-03-18 14:35:02 +08:00 |
|
tanghucheng
|
bbec29d361
|
* Fix bug.
|
2022-03-18 14:30:34 +08:00 |
|
朱金勇
|
65306e362a
|
Merge branch 'sprint/master_lanzongjun_fixbug_lite' into 'master'
Sprint/master lanzongjun fixbug lite
See merge request easycorp/zentaopms!2370
|
2022-03-18 05:35:36 +00:00 |
|
Zongjun Lan
|
4f658421dc
|
* add en lang
|
2022-03-18 13:32:22 +08:00 |
|
孙广明
|
daf8a4143a
|
Merge branch 'autotest_denghongtao' into 'master'
add misc and productplan
See merge request easycorp/zentaopms!2366
|
2022-03-18 05:15:40 +00:00 |
|
孙广明
|
21d6c27a4b
|
Update getlist.php
|
2022-03-18 05:15:30 +00:00 |
|
孙广明
|
071c930bec
|
Update getbyidlist.php
|
2022-03-18 05:15:13 +00:00 |
|
王怡栋
|
f00fe19d41
|
Merge branch 'sprint/master_lanzongjun_fixbug_lite' into 'master'
* fix bug #20922
See merge request easycorp/zentaopms!2362
zentaopms_16.5.beta1
|
2022-03-18 04:12:25 +00:00 |
|
denghongtao
|
c9904a1eae
|
change getpairs.php.die;
|
2022-03-18 11:31:33 +08:00 |
|
denghongtao
|
15799d29aa
|
add misc and productplan
|
2022-03-18 11:14:36 +08:00 |
|
Zongjun Lan
|
109c2606df
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/master_lanzongjun_fixbug_lite
|
2022-03-18 11:10:36 +08:00 |
|
孙广明
|
90159bc2b0
|
Merge branch 'autotest_ly' into 'master'
update product plan
See merge request easycorp/zentaopms!2364
|
2022-03-18 03:09:44 +00:00 |
|
liyang
|
a60760a52a
|
update product plan
|
2022-03-18 11:07:01 +08:00 |
|
孙广明
|
6aa79b6007
|
Merge branch 'sprint/autoTest_liumengyi_bug' into 'master'
* Add auto test of bug.
See merge request easycorp/zentaopms!2361
|
2022-03-18 02:53:05 +00:00 |
|
Zongjun Lan
|
09cedab84e
|
Merge branch 'sprint/master_lanzongjun_fixbug_lite' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/master_lanzongjun_fixbug_lite
|
2022-03-18 10:51:07 +08:00 |
|
Zongjun Lan
|
b3bb1036b9
|
* fix bug #20922
|
2022-03-18 10:50:56 +08:00 |
|
liumengyi
|
50d2efa3c0
|
* Add auto test of bug.
|
2022-03-18 10:42:36 +08:00 |
|
孙广明
|
8b3c1af81d
|
Merge branch 'autotest_ly' into 'master'
add storyspec data
See merge request easycorp/zentaopms!2360
|
2022-03-18 02:41:54 +00:00 |
|
liyang
|
18d174d62d
|
add storyspec data
|
2022-03-18 10:38:59 +08:00 |
|
tanghucheng
|
27457ae17f
|
* Fix bug #20907.
|
2022-03-18 10:16:44 +08:00 |
|
王怡栋
|
f9b078f056
|
Merge branch 'sprint/master_lanzongjun_fixbug_lite'
|
2022-03-18 10:16:02 +08:00 |
|
王怡栋
|
b7ffb3134b
|
Merge branch 'master' into 'sprint/master_lanzongjun_fixbug_lite'
# Conflicts:
# extension/lite/install/ext/lang/zh-cn/lite.php
|
2022-03-18 02:15:23 +00:00 |
|
Zongjun Lan
|
2af12a5c0d
|
* fix bug #20905
|
2022-03-18 10:12:06 +08:00 |
|
Zongjun Lan
|
4c8a7a3eae
|
* fix bug #20905
|
2022-03-18 10:11:22 +08:00 |
|
Zongjun Lan
|
2435d84cdc
|
* fix bug #20905
|
2022-03-18 10:06:04 +08:00 |
|
王怡栋
|
24442be3c5
|
Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug #19287(biz)
See merge request easycorp/zentaopms!2357
|
2022-03-18 01:58:27 +00:00 |
|
王怡栋
|
897ae6e1b2
|
Merge branch 'sprint/master_lanzongjun_fixbug_nopermission' into 'master'
* fix bug no permisssion
See merge request easycorp/zentaopms!2347
|
2022-03-18 01:51:46 +00:00 |
|
王怡栋
|
7216dbd7c9
|
Merge branch 'sprint/master_tanghucheng_install' into 'master'
* Adjust for lite install.
See merge request easycorp/zentaopms!2354
|
2022-03-18 01:51:05 +00:00 |
|
王怡栋
|
7638020fad
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-03-18 09:49:48 +08:00 |
|
王怡栋
|
b3cca161cc
|
* adjust for install page in lite.
|
2022-03-18 09:49:05 +08:00 |
|
tanghucheng
|
ab74b5b58d
|
* Fix bug#20897.
|
2022-03-18 09:43:20 +08:00 |
|
Zongjun Lan
|
9a53b1d0fe
|
* fix bug #20905
|
2022-03-18 09:39:52 +08:00 |
|
朱金勇
|
4f2780027d
|
Merge branch 'sgm_usercase' into 'master'
Sgm usercase
See merge request easycorp/zentaopms!2355
|
2022-03-18 01:24:42 +00:00 |
|
孙广明
|
19d86da89f
|
Merge branch 'sprint/master_tanghucheng_fixbug' into 'master'
* Fix bug #20712,20800.
See merge request easycorp/zentaopms!2313
|
2022-03-18 01:21:20 +00:00 |
|
tanghucheng
|
ec5f6244dd
|
* Fix bug #20906.
|
2022-03-18 09:18:34 +08:00 |
|
sgm0422
|
cebc26863a
|
* Remove unused code.
|
2022-03-18 09:16:55 +08:00 |
|
sgm0422
|
9e53d5bbf8
|
* Finish user auto test.
|
2022-03-18 09:14:11 +08:00 |
|
tanghucheng
|
99a61f79ee
|
* Adjust for lite install.
|
2022-03-18 09:00:32 +08:00 |
|
Zongjun Lan
|
3fefbe3699
|
* fix bug no permisssion
|
2022-03-17 17:32:55 +08:00 |
|
sgm0422
|
ab5db10f05
|
* Add user auto test.
|
2022-03-17 17:30:47 +08:00 |
|
李玉春
|
f6e47fb1ce
|
Merge branch 'tianshujie_upgrade' into 'master'
* Delete useless files when upgrading.
See merge request easycorp/zentaopms!2353
|
2022-03-17 09:25:12 +00:00 |
|