zhujinyong
|
7f32ac7f61
|
* Fix error when updating.
|
2022-03-13 22:30:40 +08:00 |
|
tianshujie
|
af5a97ad40
|
* Fix bug #20591.
|
2022-03-11 08:34:54 +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
|
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 |
|
tanghucheng
|
07f2f81d43
|
* Fix bug #20432.
|
2022-03-09 10:55:55 +08:00 |
|
tianshujie
|
d616ef30c0
|
* Fix bug #20284.
|
2022-03-07 13:54:53 +08:00 |
|
王怡栋
|
3a6dc5a72c
|
* code for task #48840.
|
2022-03-07 11:32:12 +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 |
|
liumengyi
|
e0814cd74b
|
* Change maxVersion bizVersion proVersion to edition.
|
2022-02-24 16:15:08 +08:00 |
|
zhujinyong
|
408f8d4d91
|
* Move die to return.
|
2022-02-22 14:15:00 +08:00 |
|
王怡栋
|
3082abe478
|
* adjust for set vision.
|
2022-02-18 08:36:54 +08:00 |
|
王怡栋
|
3ebcfb1ddc
|
* fix bug #19693.
|
2022-02-17 11:06:28 +08:00 |
|
zhujinyong
|
d02ddc138c
|
Merge branch 'lite' into sprint/185
|
2022-02-17 10:20:50 +08:00 |
|
zhujinyong
|
5bd64d9312
|
Merge branch 'lite' into sprint/185
|
2022-02-17 08:56:40 +08:00 |
|
王怡栋
|
98c6d7b2b1
|
* code for task #48840.
|
2022-02-15 09:42:47 +08:00 |
|
liyuchun
|
0d16a79b63
|
* Fix bug #19323.
|
2022-02-15 08:22:25 +08:00 |
|
Wenrui LI
|
2702a886da
|
* query group by vision when authorizing user.
|
2022-01-21 10:18:05 +08:00 |
|
liumengyi
|
79813a2166
|
* Modify judgment.
|
2022-01-17 18:53:45 +08:00 |
|
liumengyi
|
c11615933a
|
* Fix bug #18625.
|
2022-01-17 18:51:50 +08:00 |
|
liumengyi
|
47e7cd7f10
|
* Fix bug #18625.
|
2022-01-17 18:46:58 +08:00 |
|
liumengyi
|
842ca07618
|
* Fix bug #18625.
|
2022-01-17 18:25:39 +08:00 |
|
孙广明
|
66515d7ed8
|
Merge branch 'sprint/182_liumengyi_fixbug' into 'kanban'
* FIx bug #18489,#18478,#18466.
See merge request easycorp/zentaopms!1420
|
2022-01-17 00:57:03 +00:00 |
|
孙广明
|
758c03968f
|
* Add kanban type in query.
|
2022-01-17 08:41:59 +08:00 |
|
liumengyi
|
fc5ad0f893
|
* FIx bug #18489,#18478,#18466.
|
2022-01-16 17:11:40 +08:00 |
|
Hao Sun
|
dff300cf88
|
* Task #46524, refactor user selector for page "project/managemembers".
|
2021-12-30 17:02:32 +08:00 |
|
王怡栋
|
0d2f111a67
|
* fix error for php8.0.
|
2021-12-24 08:40:34 +08:00 |
|
朱金勇
|
8ba0385b58
|
Merge branch 'sql-optimization-zhangrunyu' into 'master'
SQL optimization
See merge request easycorp/zentaopms!924
|
2021-12-20 00:47:21 +00:00 |
|
liyuchun
|
df21c2f8bf
|
* Fix bug #17521.
|
2021-12-14 16:56:40 +08:00 |
|
Yurun
|
c89277b5fc
|
Optimize user module
|
2021-12-11 09:06:08 +08:00 |
|
王怡栋
|
c16478c5d0
|
* fix for upgrade from lower version.
|
2021-12-03 15:47:39 +08:00 |
|
孙广明
|
c42cca1249
|
Merge branch 'sprint/168'
|
2021-11-30 14:38:32 +08:00 |
|
王怡栋
|
8fc78ccd45
|
* adjust for api.
|
2021-11-29 13:06:47 +08:00 |
|
孙广明
|
2dc2c46737
|
* Fix bug #16703.
|
2021-11-24 10:55:42 +08:00 |
|
liyuchun
|
412fbb2305
|
* Finish task #44370.
|
2021-11-16 16:25:00 +08:00 |
|
王怡栋
|
77b0b5d61e
|
* code for task #44305.
|
2021-11-16 09:31:10 +08:00 |
|
王怡栋
|
784f729a81
|
* code for task #43338.
|
2021-10-21 15:10:40 +08:00 |
|
xieqiyu
|
3e8e0dbcce
|
* Fix bug#15457.
|
2021-10-16 15:32:13 +08:00 |
|
liyuchun
|
cfdce3652f
|
* Finish task #43187.
|
2021-10-14 13:51:47 +08:00 |
|
王怡栋
|
f30eb20fbd
|
* code for task #42835.
|
2021-09-27 14:50:09 +08:00 |
|
zenggang
|
ee07a042a4
|
* Fix bug#15211,14525
|
2021-09-16 17:31:40 +08:00 |
|
王怡栋
|
4eee4d5523
|
Merge branch '15.4'
|
2021-09-02 19:21:30 +08:00 |
|