 wangyidong
|
331d38825b
|
* code for feature bar.
|
2023-02-23 16:09:59 +08:00 |
|
|
caoyanyi
|
e9b4bb067e
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289
|
2023-02-22 11:17:41 +08:00 |
|
|
tianshujie
|
4f5e7ef2e8
|
* Increment to the value of null time.
|
2023-02-21 17:20:53 +08:00 |
|
|
tianshujie
|
5b2cafa380
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289
|
2023-02-21 14:13:51 +08:00 |
|
|
孙广明
|
777b20ebdc
|
Merge branch 'sprint/tsj_task' into 'master'
Sprint/tsj task
See merge request easycorp/zentaopms!7009
|
2023-02-21 05:47:26 +00:00 |
|
|
caoyanyi
|
7e038c27d1
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289
|
2023-02-21 09:07:24 +08:00 |
|
|
caoyanyi
|
f2bd44df29
|
* Modify date diff result.
|
2023-02-21 08:58:32 +08:00 |
|
|
tianshujie
|
d6266bc607
|
* Code for finish task #85047.
|
2023-02-20 14:47:10 +08:00 |
|
|
caoyanyi
|
c8374b1e14
|
Merge branch 'master' into zentaopms_289
|
2023-02-17 10:11:16 +08:00 |
|
|
caoyanyi
|
b478779676
|
* Fix bug #32184,32192,32193.
|
2023-02-16 11:09:18 +08:00 |
|
|
caoyanyi
|
f53617aa6d
|
* Modify language get.
|
2023-02-15 17:11:48 +08:00 |
|
|
wangyidong
|
734a64958c
|
* code for custom menu lang.
|
2023-02-15 15:51:02 +08:00 |
|
|
caoyanyi
|
3bf16c880e
|
* Optimize main and ext files get, and add get default lang function.
|
2023-02-15 11:22:42 +08:00 |
|
|
wangyidong
|
ff5bc056bd
|
* code for replace menu lang.
|
2023-02-14 13:35:12 +08:00 |
|
|
tianshujie
|
da0ebacef2
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285
|
2023-02-13 08:27:05 +08:00 |
|
|
tianshujie
|
cca9a79498
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285
|
2023-02-10 10:55:46 +08:00 |
|
|
zhaoke
|
591fd06346
|
* Fix array_column not support object array.
|
2023-02-10 01:14:03 +00:00 |
|
|
zhaoke
|
55c9922a49
|
* Fix error for php5.3.
|
2023-02-09 09:14:17 +00:00 |
|
|
wangyuting2
|
e4c3846cca
|
* Fix bug #30351.
|
2023-02-09 14:47:26 +08:00 |
|
|
caoyanyi
|
88ad600143
|
* Adjust code.
|
2023-02-08 15:53:04 +08:00 |
|
|
田淑杰
|
c5925821b0
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/272
|
2022-12-20 09:37:03 +08:00 |
|
|
孔令茂
|
5de767bed3
|
* Optimize word.
|
2022-12-17 14:06:27 +00:00 |
|
|
tianshujie
|
c201a0e478
|
* Finish task #79634.
|
2022-12-13 14:47:28 +08:00 |
|
|
文睿 李
|
cb729e1864
|
* resolve conflict of task model, add method for task searching.
|
2022-12-08 03:44:50 +00:00 |
|
|
Wenrui LI
|
8aa30bd281
|
* use tasks api in zentao bot.
|
2022-12-07 10:36:49 +08:00 |
|
|
鲁飞
|
2f4ad5c556
|
* Format code and fix return value.
|
2022-12-06 06:05:18 +00:00 |
|
|
dingguodong
|
5fc4eeb5dd
|
* Adjust extension loading priority for saas.
|
2022-12-05 10:00:37 +08:00 |
|
|
wangyidong
|
e460772fc4
|
* code for task #77129.
|
2022-11-29 10:52:01 +08:00 |
|
|
liugang
|
08748eb7d4
|
Merge branch 'guanxiying/zentaopms-master'
|
2022-11-23 10:09:31 +08:00 |
|
|
wangyuting
|
a5488a96c9
|
* Fix bug #28221.
|
2022-11-18 06:42:14 +00:00 |
|
|
daitingting
|
40ff070bc9
|
* Fix bug #29652.
|
2022-11-16 09:15:15 +00:00 |
|
|
wangyuting
|
bec09e5a0a
|
* Adjust isFeature to canConfigFeature.
|
2022-11-11 07:28:46 +00:00 |
|
|
王怡栋
|
66b9e6b116
|
Merge branch 'master' into 'zentaopms258_wyd'
# Conflicts:
# framework/base/router.class.php
|
2022-11-11 02:49:32 +00:00 |
|
|
wangyidong
|
8a178c72fe
|
* adjust for project release link story and bug.
|
2022-11-11 10:47:01 +08:00 |
|
|
wangyidong
|
a5b9f374d1
|
* merge git stash.
|
2022-11-10 15:50:17 +08:00 |
|
|
wangyidong
|
6eae8345f7
|
* merge ztSessionHandler.
|
2022-11-10 15:47:05 +08:00 |
|
|
王怡栋
|
d8b1b0ba39
|
Merge branch 'zentaopms_258_task#75248' into 'master'
* Finish task #75248.
See merge request easycorp/zentaopms!6082
|
2022-11-09 08:00:04 +00:00 |
|
|
wangyuting
|
aed53849d1
|
* Finish task #75248.
|
2022-11-09 02:10:29 +00:00 |
|
|
宋辰轩
|
8883698534
|
* Delete unsed code.
|
2022-11-08 16:09:30 +08:00 |
|
|
宋辰轩
|
33c4c5278e
|
*Fix api cannot use bug.
|
2022-11-08 16:07:09 +08:00 |
|
|
wangyidong
|
9761648d59
|
Merge branch 'zentaopms_239'
|
2022-11-08 08:41:28 +08:00 |
|
|
鲁飞
|
b8619da3a6
|
* Fix missing requireFields error.
|
2022-11-07 09:14:12 +00:00 |
|
|
王怡栋
|
dc6371478d
|
Merge branch 'zentaopms_239_task_#74859' into 'zentaopms_239'
* Finish task #74859.
See merge request easycorp/zentaopms!6049
|
2022-11-07 00:32:52 +00:00 |
|
|
daitingting
|
bb4a0945fd
|
* Finish task #74859.
|
2022-11-04 09:20:53 +00:00 |
|
|
Lufei
|
35ef023439
|
* Fix die error for xuanxuan.
|
2022-11-04 17:17:49 +08:00 |
|
|
wangyuting2
|
0cefde5d28
|
* Optimize code for review code.
|
2022-11-04 06:35:21 +00:00 |
|
|
朱金勇
|
8fff18a3ea
|
Merge branch 'sprint/fix-api' into 'master'
* Fix call api error.
See merge request easycorp/zentaopms!6025
|
2022-11-04 02:51:21 +00:00 |
|
|
鲁飞
|
95d10ea6d3
|
* Fix call api error.
|
2022-11-04 02:51:20 +00:00 |
|
|
tianshujie
|
787ba2ad2d
|
* Fix bug #29247.
|
2022-11-04 10:17:00 +08:00 |
|
|
wangyidong
|
59f0cc09d9
|
* adjust for account.
|
2022-11-03 15:58:08 +08:00 |
|