 caoyanyi
|
0961139ea4
|
* Fix bug #18017.
|
2022-03-23 09:14:27 +08:00 |
|
|
王怡栋
|
f79a07116b
|
Merge branch 'sprint/lite6_lwr_hide_visions' into 'master'
* remove user vision field if there is no other vision available, task #51318, bug #20691.
See merge request easycorp/zentaopms!2407
|
2022-03-22 03:15:40 +00:00 |
|
|
Wenrui LI
|
4a36b134cd
|
* fix hidden vision inputs.
|
2022-03-22 11:06:54 +08:00 |
|
|
Wenrui LI
|
e920e855eb
|
* add hidden vision input if vision is not shown.
|
2022-03-22 10:51:40 +08:00 |
|
|
Wenrui LI
|
90ab73d1f7
|
* use correct id for input errors on batch create, task #51316, bug #20963.
|
2022-03-22 09:02:40 +08:00 |
|
|
王怡栋
|
fe91dc8481
|
Merge branch 'pailei2'
|
2022-03-22 09:01:03 +08:00 |
|
|
liyuchun
|
0187fb80c7
|
Merge branch 'devops24'
|
2022-03-22 08:28:32 +08:00 |
|
|
Wenrui LI
|
450f2d7d89
|
* remove user vision field if there is no other vision available, task #51318, bug #20691.
|
2022-03-21 17:06:12 +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 |
|
|
zenggang
|
dae974455f
|
* Adjust code
|
2022-03-18 01:02:35 +00:00 |
|
|
zenggang
|
414ec1b308
|
* Finish task#50667,50675
|
2022-03-17 09:05:02 +00: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 |
|
|
tanghucheng
|
72095bf38a
|
* Fix bug #20803.
|
2022-03-15 16:31:27 +08:00 |
|
|
王怡栋
|
c1f3258a74
|
* adjust for get dynamic.
|
2022-03-14 16:08:58 +08:00 |
|
|
zhujinyong
|
7f32ac7f61
|
* Fix error when updating.
|
2022-03-13 22:30:40 +08:00 |
|
|
王怡栋
|
f1f208db64
|
* fix bug #20669.
|
2022-03-11 14:06:04 +08:00 |
|
|
王怡栋
|
7f533c6a68
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-03-11 10:04:11 +08:00 |
|
|
王怡栋
|
8053903ba2
|
* code for task #20556.
|
2022-03-11 10:03:48 +08:00 |
|
|
tianshujie
|
af5a97ad40
|
* Fix bug #20591.
|
2022-03-11 08:34:54 +08:00 |
|
|
tanghucheng
|
6e0066af25
|
* Merge code.
|
2022-03-10 16:19:26 +08:00 |
|
|
孙广明
|
97859c945b
|
Merge branch 'master' into 'sprint/master_tanghucheng_fixbug'
# Conflicts:
# module/user/js/batchcreate.js
# module/user/view/batchcreate.html.php
|
2022-03-10 08:07:31 +00:00 |
|
|
tanghucheng
|
dc394cd674
|
* Fix code format.
|
2022-03-10 15:31:50 +08:00 |
|
|
tanghucheng
|
31588aacc7
|
* Adjust for batchcreate user.
|
2022-03-10 15:23:40 +08:00 |
|
|
tanghucheng
|
76fd14c845
|
* Adjust for create user.
|
2022-03-10 12:09:33 +08:00 |
|
|
王怡栋
|
01f6eb4cc3
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-03-10 10:36:40 +08:00 |
|
|
王怡栋
|
53c2dd44fb
|
* fix bug #20113.
|
2022-03-10 10:31:10 +08:00 |
|
|
zhouxudong
|
2eb4271b2b
|
* Finishi task #50425.
|
2022-03-09 13:20:09 +08:00 |
|
|
王怡栋
|
0529d3b656
|
Merge branch 'sprint/master_tanghucheng_fixbug' into 'master'
* Fix bug #20458,20369,20140,20373.
See merge request easycorp/zentaopms!2153
|
2022-03-09 03:52:04 +00:00 |
|
|
zhouxudong
|
c8704e30f8
|
* Finish task #50425.
|
2022-03-09 11:29:09 +08:00 |
|
|
tanghucheng
|
07f2f81d43
|
* Fix bug #20432.
|
2022-03-09 10:55:55 +08:00 |
|
|
王怡栋
|
f5d4dfc9ad
|
* code for task #49356.
|
2022-03-09 10:53:08 +08:00 |
|
|
tanghucheng
|
2d3c8464d3
|
* Fix bug #20458,20369,20140,20373.
|
2022-03-09 10:20:46 +08:00 |
|
|
王怡栋
|
b960a07ecf
|
* code for task #49352.
|
2022-03-08 10:52:48 +08:00 |
|
|
tianshujie
|
38d53186ba
|
* Modify the code.
|
2022-03-07 15:34:10 +08:00 |
|
|
tianshujie
|
1e11c1b4e1
|
* Fix bug #20287.
|
2022-03-07 14:15:15 +08:00 |
|
|
tianshujie
|
d616ef30c0
|
* Fix bug #20284.
|
2022-03-07 13:54:53 +08:00 |
|
|
王怡栋
|
a783b5d736
|
Merge branch 'master' into 'sprint/master_tanghucheng_fix'
# Conflicts:
# db/update16.4.sql
# module/user/view/batchcreate.html.php
|
2022-03-07 05:25:38 +00:00 |
|
|
孙广明
|
1b137f7bc8
|
Merge branch 'sprint/187_tianshujie' into 'master'
Sprint/187 tianshujie
See merge request easycorp/zentaopms!2107
|
2022-03-07 05:13:55 +00:00 |
|
|
tanghucheng
|
79a38cc9ad
|
* Fix bug.
|
2022-03-07 13:04:06 +08:00 |
|
|
tianshujie
|
8215369e8d
|
* Modify the code.
|
2022-03-07 12:26:44 +08:00 |
|
|
王怡栋
|
3a6dc5a72c
|
* code for task #48840.
|
2022-03-07 11:32:12 +08:00 |
|
|
tianshujie
|
01d0a6b902
|
* Finish task #50311.
|
2022-03-07 11:32:10 +08:00 |
|
|
tianshujie
|
162b015ae5
|
* Modify the code.
|
2022-03-04 14:09:12 +08:00 |
|
|
tianshujie
|
5b5213c761
|
* Fix bug #20301.
|
2022-03-04 13:21:09 +08:00 |
|
|
tianshujie
|
75ba14eb95
|
* Fix bug #20298.
|
2022-03-03 17:05:35 +08:00 |
|
|
孙广明
|
b33cb32e4b
|
Merge branch 'sprint/master_tanghucheng_fixbug' into 'master'
* Fix priv and classic mode.
See merge request easycorp/zentaopms!2031
|
2022-03-02 03:05:06 +00:00 |
|
|
tianshujie
|
391d9cc18b
|
* Fix bug #20090.
|
2022-03-02 10:02:27 +08:00 |
|
|
tanghucheng
|
87aa943546
|
* Fix bug for classic.
|
2022-03-02 09:04:20 +08:00 |
|
|
tanghucheng
|
ccc11c4e4b
|
* Hide preference and tutorial.
|
2022-02-28 15:18:57 +08:00 |
|