Commit Graph

29779 Commits

Author SHA1 Message Date
孙广明
73e6d617ef Merge branch 'sprint/autoTest_liumengyi_bug' into 'master'
* Modify code.

See merge request easycorp/zentaopms!2383
2022-03-21 00:29:00 +00:00
zhujinyong
9fcb03b0fd + Add api of tetsuite. 2022-03-21 08:25:20 +08:00
liumengyi
dfb6c1361e * Modify code. 2022-03-21 08:12:51 +08: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
bbec29d361 * Fix bug. 2022-03-18 14:30:34 +08:00
tanghucheng
27457ae17f * Fix bug #20907. 2022-03-18 10:16:44 +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
王怡栋
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
Zongjun Lan
9a53b1d0fe * fix bug #20905 2022-03-18 09:39:52 +08: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
tianshujie
8089de48b7 * Delete useless files when upgrading. 2022-03-17 17:23:16 +08:00
孙广明
4b68b7c78c Merge branch 'sprint/autoTest_liumengyi_bug' into 'master'
* Add auto test of bug.

See merge request easycorp/zentaopms!2350
2022-03-17 09:13:33 +00:00
liumengyi
bb361baa6e * Add function annotation. 2022-03-17 17:12:08 +08:00
tianshujie
4d7112b9b7 * Fix bug of ext files. 2022-03-17 16:41:29 +08:00
Zongjun Lan
ad622ccb02 * fix bug #t 2022-03-17 15:58:35 +08:00
tanghucheng
18cd2a98aa * Adjust for vision name. 2022-03-17 10:24:41 +08:00
王怡栋
e865920607 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-03-16 16:46:25 +08:00
王怡栋
69d7749489 * code for welcome block. 2022-03-16 16:35:33 +08:00
hufangzhou
f1f3f13f5d * Adjust the width of global search box. 2022-03-16 15:08:00 +08:00
liyuchun
15e03af077 * Fix bug #20833. 2022-03-16 13:36:28 +08:00
liyuchun
53dec485b8 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-03-16 13:28:57 +08:00
王怡栋
e187adafd8 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-03-16 13:27:01 +08:00
王怡栋
eac22108fe * code for story #31383. 2022-03-16 13:25:44 +08:00
zhujinyong
489be02f3f * Fix review. 2022-03-16 12:11:09 +08:00
tianshujie
df14bc65ef * Fix icon for kanban project. 2022-03-16 10:39:50 +08:00
tanghucheng
b9542612cb * Fix bug. 2022-03-16 09:51:36 +08:00
孙广明
c498c964ba * Change version. 2022-03-16 08:35:21 +08:00
王怡栋
f8b6ae99bb Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-03-15 17:17:49 +08:00
王怡栋
c2e8cea442 * adjust code for check update. 2022-03-15 17:17:12 +08:00
孙广明
69c22ecbf3 Merge branch 'sprint/master_tanghucheng_fix' into 'master'
* Fix bug #20779,20782,20783.

See merge request easycorp/zentaopms!2275
2022-03-15 08:34:33 +00:00
tanghucheng
72095bf38a * Fix bug #20803. 2022-03-15 16:31:27 +08:00
tanghucheng
88230cd949 * Fix bug #20779,20782,20783. 2022-03-15 15:49:25 +08:00
王怡栋
78de67f523 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-03-15 14:31:51 +08:00
王怡栋
9ffa55da56 * fix bug #20682. 2022-03-15 14:31:01 +08:00
王怡栋
286aa9c7d0 Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug #19535

See merge request easycorp/zentaopms!2260
2022-03-15 03:29:28 +00:00
王怡栋
2ae8b25fa9 Merge branch 'sprint/master_tanghucheng_fix' into 'master'
* Fix bug #20754,20776,20759.

See merge request easycorp/zentaopms!2262
2022-03-15 03:27:08 +00:00
tanghucheng
9cffc3bcf7 * Fix bug #20754,20776,20759. 2022-03-15 11:13:26 +08:00
Zongjun Lan
5be25315f3 * fix bug #19535 2022-03-15 11:10:30 +08:00
tianshujie
305ec3c69a * Modify code location. 2022-03-15 09:57:56 +08:00
tianshujie
ffe15a3b23 * Fix bug #20751. 2022-03-15 09:54:53 +08:00
tianshujie
ff24c06fc9 * Modify the code judgment logic. 2022-03-15 09:41:54 +08:00
tianshujie
91e99b699b * Fix bug #20751. 2022-03-15 09:36:13 +08:00
王怡栋
c5d1d463a8 Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug #20703,#19430

See merge request easycorp/zentaopms!2235
2022-03-15 00:58:13 +00:00
王怡栋
e2fad711b4 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-03-14 17:28:35 +08:00