 王怡栋
|
e6be417612
|
Merge branch 'master' into 'tsj_task'
# Conflicts:
# module/doc/view/lefttree.html.php
|
2023-04-13 09:03:14 +00:00 |
|
|
tianshujie
|
e5bcb8b2f9
|
* The ID of the last accessed object is retained.
|
2023-04-13 16:58:25 +08:00 |
|
|
王怡栋
|
ac0347ae6c
|
Merge branch 'dev/gfl_zentaopms_305' into 'master'
Dev/gfl zentaopms 305
See merge request easycorp/zentaopms!7402
|
2023-04-13 08:58:07 +00:00 |
|
|
guofeilong
|
60499b8226
|
* Adjust code for css in doc/index .
|
2023-04-13 16:56:28 +08:00 |
|
|
guofeilong
|
c7bd3087d2
|
* Add position to focus input .
|
2023-04-13 16:56:13 +08:00 |
|
|
guofeilong
|
0991e685b1
|
* Code for add scroll func to lefttree while add child .
|
2023-04-13 16:56:13 +08:00 |
|
|
tianshujie
|
8d97ca43a5
|
* Resolve issue #768.
|
2023-04-13 16:44:31 +08:00 |
|
|
tianshujie
|
adcaacc46d
|
* Document processing permission.
|
2023-04-13 16:40:46 +08:00 |
|
|
tianshujie
|
d2782dc46a
|
* Resolve issue #775.
|
2023-04-13 16:37:20 +08:00 |
|
|
tianshujie
|
e279e91070
|
* Resolve issue #775.
|
2023-04-13 16:22:45 +08:00 |
|
|
wangyidong
|
ad6e538eca
|
* code for issue #772.
|
2023-04-13 16:17:21 +08:00 |
|
|
wangyidong
|
17ce13af75
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2023-04-13 16:01:05 +08:00 |
|
|
wangyidong
|
8a69021d9b
|
* code for issue #776.
|
2023-04-13 16:00:40 +08:00 |
|
|
tianshujie
|
ee0f443ee4
|
* Resolve issue #763.
|
2023-04-13 15:51:36 +08:00 |
|
|
tianshujie
|
0c935c7eea
|
* Modify jump link.
|
2023-04-13 15:45:51 +08:00 |
|
|
朱金勇
|
6e3b635868
|
* Add default value for zt_workflowaction.
|
2023-04-13 07:36:12 +00:00 |
|
|
朱金勇
|
b38b7e992e
|
Merge branch 'session' into 'master'
* Fix typo.
See merge request easycorp/zentaopms!7395
|
2023-04-13 06:09:07 +00:00 |
|
|
朱金勇
|
6dcf3bc19e
|
* Add default value for workflow.
|
2023-04-13 05:48:38 +00:00 |
|
|
孙广明
|
adb2477a71
|
Merge branch 'pipeline_jenkins_ly' into 'master'
- Delete gitlab runner yaml file and adjust Jenkinsfile.
See merge request easycorp/zentaopms!7400
|
2023-04-13 05:32:47 +00:00 |
|
|
wangyidong
|
eab4c77775
|
Merge branch 'cyy_fixbug'
|
2023-04-13 13:30:55 +08:00 |
|
|
王怡栋
|
5ac6adcb09
|
Merge branch 'master' into 'cyy_fixbug'
# Conflicts:
# module/doc/view/lefttree.html.php
|
2023-04-13 05:30:11 +00:00 |
|
|
liyang
|
e8b2a9bbb1
|
- Delete gitlab runner yaml file and adjust Jenkinsfile.
|
2023-04-13 13:29:15 +08:00 |
|
|
王怡栋
|
7dcfba812e
|
Merge branch 'dev/gfl_zentaopms_305' into 'master'
* Code for task 90776 .
See merge request easycorp/zentaopms!7396
|
2023-04-13 05:28:57 +00:00 |
|
|
朱金勇
|
030da6729d
|
* Fix bug#34112.
|
2023-04-13 05:28:37 +00:00 |
|
|
guofeilong
|
052751d7ad
|
* Code for task #90777 .
|
2023-04-13 13:27:03 +08:00 |
|
|
guofeilong
|
b73c301143
|
* Code for task 90776 .
|
2023-04-13 13:27:03 +08:00 |
|
|
刘刚
|
ff16a13233
|
Merge branch 'screen_filter' into 'master'
* Update go-view dist.
See merge request easycorp/zentaopms!7399
|
2023-04-13 05:26:50 +00:00 |
|
|
刘刚
|
37acca3d5f
|
Merge branch 'daitingting_task_#34006' into 'master'
* Fix bug #34006.
See merge request easycorp/zentaopms!7398
|
2023-04-13 05:26:33 +00:00 |
|
|
qixinzhi
|
e5ba059a33
|
* Update go-view dist.
|
2023-04-13 13:21:44 +08:00 |
|
|
caoyanyi
|
5c39e492be
|
* Add form tips, Fix bug #33541.
|
2023-04-13 13:19:15 +08:00 |
|
|
朱金勇
|
c7e37cba47
|
* Fix bug #34136.
|
2023-04-13 05:15:22 +00:00 |
|
|
朱金勇
|
c12196da3a
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2023-04-13 05:10:29 +00:00 |
|
|
朱金勇
|
bb531cfd2c
|
* Fix bugs in dmdb.
|
2023-04-13 05:10:17 +00:00 |
|
|
caoyanyi
|
b425266ecf
|
* Code for bug #33884.
|
2023-04-13 13:07:44 +08:00 |
|
|
daitingting
|
6cb02b9cea
|
* Fix bug #34006.
|
2023-04-13 13:06:27 +08:00 |
|
|
wangyidong
|
548a0c453c
|
* fix bug #33700.
|
2023-04-13 13:03:42 +08:00 |
|
|
caoyanyi
|
7fca60ca3a
|
* Modify doc icon size.
|
2023-04-13 13:01:31 +08:00 |
|
|
caoyanyi
|
293a22158c
|
* Modify api lib sort, Fix bug #33899.
|
2023-04-13 11:22:14 +08:00 |
|
|
tianshujie
|
22f4b33a66
|
* Code for story #43645,43646.
|
2023-04-13 11:19:28 +08:00 |
|
|
王怡栋
|
40e2ae98d5
|
Merge branch 'dev/gfl_zentaopms_305' into 'master'
Dev/gfl zentaopms 305
See merge request easycorp/zentaopms!7393
|
2023-04-13 03:10:18 +00:00 |
|
|
guofeilong
|
4b603d8495
|
* Adjust code for change icons .
|
2023-04-13 11:09:10 +08:00 |
|
|
guofeilong
|
640e0f6642
|
* Adjust code for css bug in crumbs .
|
2023-04-13 11:08:39 +08:00 |
|
|
guofeilong
|
cddd2ee040
|
* Code for adjust positon in tree-item img .
|
2023-04-13 11:08:39 +08:00 |
|
|
guofeilong
|
53da287c46
|
* Code for task #90971.
|
2023-04-13 11:08:39 +08:00 |
|
|
guofeilong
|
03bf3e54e6
|
* Code for adjust width .
|
2023-04-13 11:08:39 +08:00 |
|
|
caoyanyi
|
d69a0b7caf
|
* Fix bug #34036.
|
2023-04-13 11:08:05 +08:00 |
|
|
caoyanyi
|
5e3b05aea8
|
* Code for bug #33953.
|
2023-04-13 11:03:45 +08:00 |
|
|
孙广明
|
82dc38118e
|
Merge branch 'zhouxin_feedback_2644' into 'master'
* Reslove feedback #2644.
See merge request easycorp/zentaopms!7394
|
2023-04-13 03:00:56 +00:00 |
|
|
孙广明
|
e5dc4e8d4f
|
Merge branch 'zenops_66' into 'master'
Zenops 66
See merge request easycorp/zentaopms!7392
|
2023-04-13 03:00:45 +00:00 |
|
|
Lufei
|
6c1ea3dca9
|
* Fix typo.
|
2023-04-13 10:51:26 +08:00 |
|