 zhujinyong
|
19170148fe
|
* Use dbQuery() instead of dbh->query().
|
2023-09-05 14:16:12 +08:00 |
|
|
zenggang
|
fdd027a824
|
* Merged 18.x
|
2023-08-28 09:30:26 +00:00 |
|
|
zhaoke
|
ae78101cf4
|
* Fix bug #37100.
|
2023-08-08 10:48:02 +08:00 |
|
|
Yagami
|
5935f603f4
|
* Change judgment condition.
|
2023-05-04 18:57:45 +08:00 |
|
|
Yagami
|
c4c20cae54
|
* Change judgment condition.
|
2023-05-04 18:04:34 +08:00 |
|
|
Yagami
|
a50a745a41
|
* Finish task #92289.
|
2023-05-04 15:10:38 +08:00 |
|
|
tanghucheng
|
c8a626480d
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaoipd
|
2023-04-21 13:49:46 +08:00 |
|
|
hufangzhou
|
f9f5c459e9
|
* Rename the privilege of custom-limitTaskDate.
|
2023-04-19 09:18:07 +08:00 |
|
|
liumengyi
|
825600f1fe
|
- Delete the privilege of custom-index.
|
2023-04-13 16:01:32 +08:00 |
|
|
tanghucheng
|
0af9b86b70
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaoipd
|
2023-04-13 10:23:19 +08:00 |
|
|
朱金勇
|
8050bee793
|
* Fix data type of dmdb.
|
2023-04-12 01:49:08 +00:00 |
|
|
Yagami
|
5666aaf667
|
* Fix bug #33181.
|
2023-04-10 10:12:58 +08:00 |
|
|
tanghucheng
|
035a68b78c
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaoipd
|
2023-04-03 10:37:42 +08:00 |
|
|
tanghucheng
|
c89ecac12b
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaoipd
|
2023-03-31 09:19:02 +08:00 |
|
|
tanghucheng
|
b5d99d0ee1
|
* Fix bug #33485.
|
2023-03-29 15:44:49 +08:00 |
|
|
tianshujie
|
3abf7ef71d
|
* Fix bug #33307.
|
2023-03-23 17:23:59 +08:00 |
|
|
tanghucheng
|
6a4189996a
|
* Fix bug #33161.
|
2023-03-21 15:50:51 +08:00 |
|
|
tianshujie
|
53666d1580
|
* Add the concept of default requirements.
|
2023-03-16 16:16:00 +08:00 |
|
|
tanghucheng
|
3cf4954c2c
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaoipd
|
2023-03-16 10:19:13 +08:00 |
|
|
tianshujie
|
e68579843f
|
* Fix bug 32965.
|
2023-03-15 15:55:49 +08:00 |
|
|
王怡栋
|
f526a16291
|
Merge branch 'master' into 'tsj_fixbug'
# Conflicts:
# module/custom/lang/zh-cn.php
|
2023-03-15 06:19:32 +00:00 |
|
|
tanghucheng
|
8a3538fd6c
|
* Code for task #87176.
|
2023-03-15 13:51:12 +08:00 |
|
|
tianshujie
|
445323e278
|
* Modify product line language.
|
2023-03-15 11:00:45 +08:00 |
|
|
hufangzhou
|
125a4384af
|
* Add the new version.
|
2023-03-15 02:53:46 +00:00 |
|
|
liumengyi
|
9728298427
|
* Fix bug of task #87014.
|
2023-03-13 07:37:04 +00:00 |
|
|
liumengyi
|
637b0912a7
|
* Finish task #87013.
|
2023-03-13 07:07:13 +00:00 |
|
|
caoyanyi
|
6e7c9e25e8
|
* Update project common lang.
|
2023-03-08 09:36:56 +08:00 |
|
|
tianshujie
|
1d6825f5b6
|
* Modify language items for project,product common.
|
2023-03-07 17:03:52 +08:00 |
|
|
王怡栋
|
3438722a8c
|
Merge branch 'master' into 'zentaopms_289'
# Conflicts:
# db/update18.2.sql
|
2023-03-06 03:26:34 +00:00 |
|
|
tianshujie
|
462e737432
|
* Fixed the issue of initializing more drop-down language items.
|
2023-03-06 10:45:12 +08:00 |
|
|
Yagami
|
f95691948a
|
Merge branch 'zentaopms_294'
|
2023-03-06 08:37:11 +08:00 |
|
|
tianshujie
|
4d400723ce
|
* Modify more select display method.
|
2023-03-03 15:54:33 +08:00 |
|
|
tianshujie
|
3387bf56e3
|
* Code for finish task 84527.
|
2023-03-03 13:03:53 +08:00 |
|
|
caoyanyi
|
bec24aafa9
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289
|
2023-03-01 11:52:44 +08:00 |
|
|
liumengyi
|
a1c9148a6b
|
* Finish task #85640.
|
2023-03-01 02:03:03 +00:00 |
|
|
liumengyi
|
76be77868c
|
* Fix bug #32520.
|
2023-03-01 01:34:14 +00:00 |
|
|
caoyanyi
|
ac2891ac41
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289
|
2023-02-28 13:53:09 +08:00 |
|
|
hufangzhou
|
d1f2700812
|
* Finish task #85629.
|
2023-02-28 05:16:43 +00:00 |
|
|
tianshujie
|
c82f1a02a7
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_ui
|
2023-02-28 13:13:13 +08:00 |
|
|
tianshujie
|
cd595dc605
|
* Code for fix bug #32461.
|
2023-02-28 11:03:02 +08:00 |
|
|
tianshujie
|
f6a573a51f
|
* Code for fix bug #32458.
|
2023-02-28 10:32:13 +08:00 |
|
|
tianshujie
|
5fe4075ef1
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289
|
2023-02-28 08:26:03 +08:00 |
|
|
wangyidong
|
11507ffff2
|
* fix bug #32277.
|
2023-02-27 16:16:04 +08:00 |
|
|
tianshujie
|
fc99d01af9
|
* Fixed Save labels clearing other labels.
|
2023-02-27 16:09:06 +08:00 |
|
|
liumengyi
|
4912b2004e
|
* Finish task #85630.
|
2023-02-27 06:54:39 +00:00 |
|
|
王怡栋
|
b547e0006c
|
Merge branch 'sprint/tsj_nav' into 'zentaopms_289'
Sprint/tsj nav
See merge request easycorp/zentaopms!7074
|
2023-02-27 06:28:53 +00:00 |
|
|
wangyidong
|
1e9fc76676
|
* add unit test for dev.
|
2023-02-27 14:26:18 +08:00 |
|
|
tianshujie
|
aaac6a6d0e
|
* The tag output problem was rectified.
|
2023-02-27 13:42:15 +08:00 |
|
|
wangyidong
|
84efbac63f
|
* code for custom menu lang.
|
2023-02-25 12:10:08 +08:00 |
|
|
caoyanyi
|
6caaf4c316
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289
|
2023-02-23 08:32:25 +08:00 |
|