 Wenrui LI
|
7f87e44d12
|
* set doc/doclib vision on creation.
|
2022-01-20 11:06:30 +08:00 |
|
|
zhujinyong
|
4a4e42a234
|
Merge branch 'lite' of https://gitlab.zcorp.cc/easycorp/zentaopms into lite
|
2022-01-20 10:56:56 +08:00 |
|
|
zhujinyong
|
0790778685
|
+ Add OA and feedback.
|
2022-01-20 10:56:35 +08:00 |
|
|
Wenrui LI
|
60c5cbb906
|
* add vision to lang table.
|
2022-01-20 10:04:06 +08:00 |
|
|
Wenrui LI
|
1520f70a14
|
* tweak custom module for lite vision, task #47918,47919.
|
2022-01-20 09:54:09 +08:00 |
|
|
Wenrui LI
|
a329637f18
|
* remove product nav from lite vision.
|
2022-01-20 09:37:08 +08:00 |
|
|
朱金勇
|
23f87de831
|
Merge branch 'lite_tanghucheng' into 'lite'
* Finish task #47942.
See merge request easycorp/zentaopms!1507
|
2022-01-20 00:45:45 +00:00 |
|
|
tanghucheng
|
86001c975e
|
* Code for task #47944.
|
2022-01-19 19:53:09 +08:00 |
|
|
tanghucheng
|
59f26f0470
|
* Finish task #47942.
|
2022-01-19 17:22:05 +08:00 |
|
|
zhujinyong
|
49c0078aed
|
Merge branch 'lite' of https://gitlab.zcorp.cc/easycorp/zentaopms into lite
|
2022-01-19 17:06:57 +08:00 |
|
|
zhujinyong
|
97101097dd
|
* Fix bug in global search.
|
2022-01-19 17:06:37 +08:00 |
|
|
Wenrui LI
|
a2b55ad3b3
|
* change zentao sql to match vision.
|
2022-01-19 16:47:16 +08:00 |
|
|
Wenrui LI
|
9b78d18465
|
* tweak group and privs for lite vision, task #47917,47916.
|
2022-01-19 16:45:58 +08:00 |
|
|
tanghucheng
|
79e6a7e263
|
* Finish task #47922.
|
2022-01-19 15:40:26 +08:00 |
|
|
zhujinyong
|
3baf9213a2
|
* Fix rnd vision.
|
2022-01-19 14:34:55 +08:00 |
|
|
王怡栋
|
f8e0c430cd
|
* adjust for kanban in lite.
|
2022-01-19 13:41:29 +08:00 |
|
|
Wenrui LI
|
cd3e98322c
|
* add admin menu back.
|
2022-01-19 10:05:21 +08:00 |
|
|
Wenrui LI
|
4f5a4ad2d9
|
* tweak admin menu for lite vision, task #47908.
|
2022-01-19 09:39:14 +08:00 |
|
|
Wenrui LI
|
7f7cfc0ef1
|
* tweak admin/index for lite vision, task #47909.
|
2022-01-19 09:38:21 +08:00 |
|
|
zhujinyong
|
e8344ef109
|
Merge branch 'lite' of https://gitlab.zcorp.cc/easycorp/zentaopms into lite
|
2022-01-19 09:08:42 +08:00 |
|
|
王怡栋
|
e05dcdbe1b
|
Merge branch 'lite' of https://gitlab.zcorp.cc/easycorp/zentaopms into lite
|
2022-01-19 09:08:34 +08:00 |
|
|
zhujinyong
|
2e85ff6e08
|
Merge branch 'lite' of https://gitlab.zcorp.cc/easycorp/zentaopms into lite
|
2022-01-19 09:08:22 +08:00 |
|
|
zhujinyong
|
8ed8e31da9
|
* Fix doc menu for lite.
|
2022-01-19 09:08:07 +08:00 |
|
|
Wenrui LI
|
b29bd3173d
|
* tweak doc menu for lite vision, task #47863.
|
2022-01-19 09:08:06 +08:00 |
|
|
王怡栋
|
bd824458e3
|
* add edition.
|
2022-01-19 09:07:40 +08:00 |
|
|
王怡栋
|
03d2e3cb4a
|
Merge branch 'master' into lite
|
2022-01-19 08:44:43 +08:00 |
|
|
zhujinyong
|
7d45eb3383
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
zentaopms_16.2
|
2022-01-19 08:33:08 +08:00 |
|
|
zhujinyong
|
50755210a3
|
Merge branch 'sprint/songchenxuan_testcase'
|
2022-01-19 08:30:44 +08:00 |
|
|
孙广明
|
e7e01ddecd
|
Merge branch 'sprint/182_hufangzhou_18687' into 'master'
* Fix bug #18687.
See merge request easycorp/zentaopms!1489
|
2022-01-18 08:24:56 +00:00 |
|
|
hufangzhou
|
9b139eb1a9
|
* Fix bug #18687.
|
2022-01-18 16:24:18 +08:00 |
|
|
孙广明
|
51b913511b
|
Merge branch 'sprint/182_tianshujie_bug' into 'master'
* Fix drag sort issue.
See merge request easycorp/zentaopms!1488
|
2022-01-18 08:19:51 +00:00 |
|
|
tianshujie
|
29e8966c33
|
* Fix drag sort issue.
|
2022-01-18 16:18:15 +08:00 |
|
|
王怡栋
|
3954c3469d
|
Merge branch 'sgm_fixbug' into 'master'
* Fix bug.
See merge request easycorp/zentaopms!1487
|
2022-01-18 08:11:01 +00:00 |
|
|
孙广明
|
fa40efcc30
|
Merge branch 'sprint/182_tianshujie_18666' into 'master'
* Fix bug #18666.
See merge request easycorp/zentaopms!1485
|
2022-01-18 08:08:58 +00:00 |
|
|
孙广明
|
7299915e89
|
* Fix bug.
|
2022-01-18 16:08:13 +08:00 |
|
|
tianshujie
|
daf29be42b
|
* Fix bug #18520.
|
2022-01-18 16:01:25 +08:00 |
|
|
朱金勇
|
1a3020201f
|
Merge branch 'ztf_zhouxin_01' into 'master'
Add testcase for create and update method for productModel.
See merge request easycorp/zentaopms!1462
|
2022-01-18 08:01:10 +00:00 |
|
|
朱金勇
|
62c0cd2ed0
|
Merge branch 'autoTest_xieqiyu' into 'master'
Auto test xieqiyu
See merge request easycorp/zentaopms!1480
|
2022-01-18 08:00:21 +00:00 |
|
|
朱金勇
|
628de03897
|
Merge branch 'autotest_zhengrunyu' into 'master'
Autotest zhengrunyu
See merge request easycorp/zentaopms!1484
|
2022-01-18 07:59:08 +00:00 |
|
|
zhengrunyu
|
aa79ce443c
|
*autotest case.
|
2022-01-18 15:42:44 +08:00 |
|
|
tianshujie
|
236ffe6056
|
* Fix bug #18666.
|
2022-01-18 15:40:54 +08:00 |
|
|
zhouxin
|
a376617fc6
|
Add testcase for getList and getPairs method for productModel.
|
2022-01-18 07:38:15 +00:00 |
|
|
孙广明
|
2ff884df0a
|
Merge branch 'sprint/182_hufangzhou_18673' into 'master'
* Fix bug #18673.
See merge request easycorp/zentaopms!1483
|
2022-01-18 07:32:10 +00:00 |
|
|
hufangzhou
|
0f9fa42664
|
* Fix bug #18673.
|
2022-01-18 15:31:10 +08:00 |
|
|
王怡栋
|
0ea97815a5
|
Merge branch 'sgm_fixbug' into 'master'
* Fix bug.
See merge request easycorp/zentaopms!1482
|
2022-01-18 07:12:25 +00:00 |
|
|
孙广明
|
7f278b4c79
|
* Fix bug.
|
2022-01-18 15:10:57 +08:00 |
|
|
王怡栋
|
535340e47d
|
Merge branch 'sprint/182_liumengyi_fixbug' into 'master'
* Fix bug #18671.
See merge request easycorp/zentaopms!1479
|
2022-01-18 07:04:39 +00:00 |
|
|
王怡栋
|
6a87394ddf
|
Merge branch 'sprint/182_tianshujie_18469' into 'master'
* Fix bug #18469.
See merge request easycorp/zentaopms!1481
|
2022-01-18 07:04:03 +00:00 |
|
|
tianshujie
|
eee8de32a9
|
* Fix bug #18469.
|
2022-01-18 15:01:38 +08:00 |
|
|
xieqiyu
|
0525582e25
|
* Delete unused code.
|
2022-01-18 14:56:51 +08:00 |
|