 王怡栋
|
25bb8d8810
|
Merge branch 'notify_email' into 'master'
* Adjust style
See merge request easycorp/zentaopms!5041
|
2022-08-22 01:39:56 +00:00 |
|
|
王怡栋
|
81aae6a252
|
Update model.php
|
2022-08-22 01:34:24 +00:00 |
|
|
王怡栋
|
4446295fd7
|
Merge branch 'sprint_liuhong' into 'master'
Sprint liuhong
See merge request easycorp/zentaopms!5040
|
2022-08-22 01:31:06 +00:00 |
|
|
王怡栋
|
a4c474011c
|
Merge branch 'sprint/master_zhouxudong_updateCode' into 'master'
* Optimization task #64887.
See merge request easycorp/zentaopms!5033
|
2022-08-22 01:29:07 +00:00 |
|
|
王怡栋
|
f8fa7dc0c9
|
Merge branch 'spritn/master_zhouxudong_fixbug' into 'master'
* Fix bug.
See merge request easycorp/zentaopms!5034
|
2022-08-22 01:23:30 +00:00 |
|
|
zenggang
|
7ebf86134f
|
* Adjust style
|
2022-08-19 08:37:39 +00:00 |
|
|
liuhong
|
650d491c44
|
*Fix bug
|
2022-08-19 08:30:20 +00:00 |
|
|
liyuchun
|
f51cd775ef
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-08-19 16:01:03 +08:00 |
|
|
liyuchun
|
806bc627ed
|
* Remove sql.
|
2022-08-19 16:00:49 +08:00 |
|
|
王怡栋
|
4a7b95fbe0
|
Merge branch 'sprint/228_tianshujie_kanban' into 'master'
* Fixed bug where Kanban prompts for newline under execution.
See merge request easycorp/zentaopms!5038
|
2022-08-19 07:55:38 +00:00 |
|
|
tianshujie
|
5eb41bedef
|
* Fixed bug where Kanban prompts for newline under execution.
|
2022-08-19 15:53:08 +08:00 |
|
|
liyuchun
|
cb2b5d9e24
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-08-19 15:42:01 +08:00 |
|
|
liyuchun
|
fc4615e871
|
* Adjust style in repo maintain.
|
2022-08-19 15:40:00 +08:00 |
|
|
李玉春
|
dbf11ab4da
|
Merge branch 'app_bug' into 'master'
* Modify control params.
See merge request easycorp/zentaopms!5035
|
2022-08-19 07:23:46 +00:00 |
|
|
caoyanyi
|
634342230f
|
* Modify control params.
|
2022-08-19 15:22:12 +08:00 |
|
|
李玉春
|
550865ae3c
|
Merge branch 'sprint/228_tianshujie_bug26339' into 'master'
* Fix bug #26339.
See merge request easycorp/zentaopms!5031
|
2022-08-19 06:59:19 +00:00 |
|
|
zhouxudong
|
000f8842e8
|
* Fix bug.
|
2022-08-19 06:55:39 +00:00 |
|
|
tianshujie
|
0b1327902b
|
* Finish task #63696.
|
2022-08-19 14:45:10 +08:00 |
|
|
zhouxudong
|
f3b134581f
|
* Optimization task #64887.
|
2022-08-19 06:43:38 +00:00 |
|
|
tianshujie
|
095b35b675
|
* Fix bug #26339.
|
2022-08-19 13:48:57 +08:00 |
|
|
liuhong
|
6d74ea8acc
|
*Fix bug
|
2022-08-19 05:35:37 +00:00 |
|
|
liuhong
|
e863a2c792
|
*Fix bug 64879.
|
2022-08-19 05:30:24 +00:00 |
|
|
王怡栋
|
e75b9b4b5f
|
Merge branch 'sprint/228_tianshujie_api' into 'master'
* Get the execution list.
See merge request easycorp/zentaopms!5029
|
2022-08-19 05:13:29 +00:00 |
|
|
王怡栋
|
0c1750f575
|
Merge branch 'sprint/hufangzhou_action' into 'master'
* Add the ignored object type config for plugin.
See merge request easycorp/zentaopms!5028
|
2022-08-19 05:12:45 +00:00 |
|
|
王怡栋
|
035494261b
|
Merge branch 'max42_tanghucheng' into 'master'
* Fix bug #26677.
See merge request easycorp/zentaopms!5027
|
2022-08-19 05:12:14 +00:00 |
|
|
王怡栋
|
861242917e
|
Merge branch 'sprint/master_zhouxudong_26612' into 'master'
* Fix bug #26612.
See merge request easycorp/zentaopms!5026
|
2022-08-19 05:11:53 +00:00 |
|
|
王怡栋
|
2794dbb783
|
Merge branch 'sprint/229_zhouxudong_64882' into 'master'
Sprint/229 zhouxudong 64882
See merge request easycorp/zentaopms!5022
|
2022-08-19 05:11:07 +00:00 |
|
|
王怡栋
|
5e76c2db87
|
Merge branch 'sprint/228_26664' into 'master'
Fix bug#26664
See merge request easycorp/zentaopms!5021
|
2022-08-19 05:10:19 +00:00 |
|
|
曾刚
|
caed6b27cd
|
Fix bug#26664
|
2022-08-19 05:10:19 +00:00 |
|
|
wangyidong
|
99eafb5d59
|
* fix bug for install extension.
|
2022-08-19 12:17:25 +08:00 |
|
|
tianshujie
|
b47cd1b77b
|
* Fixed an issue where the admin could not click on the program.
|
2022-08-19 11:36:05 +08:00 |
|
|
tianshujie
|
e667ba15db
|
* Get the execution list.
|
2022-08-19 11:33:10 +08:00 |
|
|
tanghucheng
|
858f0c98ef
|
* Code for bug #26677.
|
2022-08-19 11:26:24 +08:00 |
|
|
hufangzhou
|
9a5c9299b3
|
* Add the ignored object type config for plugin.
|
2022-08-19 11:16:04 +08:00 |
|
|
tanghucheng
|
8898465485
|
* Fix bug #26677.
|
2022-08-19 11:11:29 +08:00 |
|
|
zhouxudong
|
6312af0dea
|
* Fix bug #26612.
|
2022-08-19 03:11:05 +00:00 |
|
|
zhouxudong
|
b058344542
|
* Fix bug #26612.
|
2022-08-19 03:07:13 +00:00 |
|
|
王怡栋
|
aad7d0638f
|
Merge branch 'fixbug' into 'master'
* Fix bug #26673.
See merge request easycorp/zentaopms!5025
|
2022-08-19 03:02:44 +00:00 |
|
|
王怡栋
|
fcaa812a59
|
Update dao.class.php
|
2022-08-19 03:02:13 +00:00 |
|
|
tanghucheng
|
62226afa38
|
* Fix bug #26673.
|
2022-08-19 10:57:18 +08:00 |
|
|
liuhong
|
f0cdfea18a
|
*Fix bug
|
2022-08-19 02:39:40 +00:00 |
|
|
wangyidong
|
4c15f7fa5b
|
Merge branch 'sprint/zentaomax42'
|
2022-08-19 10:35:42 +08:00 |
|
|
王怡栋
|
e8654f20a9
|
Merge branch 'master' into 'sprint/zentaomax42'
# Conflicts:
# db/update17.5.sql
|
2022-08-19 02:34:50 +00:00 |
|
|
zhouxudong
|
9dbfa8b99b
|
* FInish task #64882.
|
2022-08-19 02:22:42 +00:00 |
|
|
zhouxudong
|
0a3c297b43
|
* Finish task #64882.
|
2022-08-19 02:18:16 +00:00 |
|
|
zhouxudong
|
3435040a3f
|
* Finish task #64882.
|
2022-08-19 01:55:48 +00:00 |
|
|
王怡栋
|
ce335348a8
|
Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug #23932
See merge request easycorp/zentaopms!5020
|
2022-08-19 01:31:23 +00:00 |
|
|
王怡栋
|
b5e7d1e0dc
|
Merge branch 'sprint/max42_mayue_fixbug' into 'master'
* Fix workflow issue.
See merge request easycorp/zentaopms!5019
|
2022-08-19 01:30:50 +00:00 |
|
|
lanzongjun
|
039d4a4e19
|
* fix bug #23932
|
2022-08-19 09:23:18 +08:00 |
|
|
mayue
|
a3e8222009
|
* Fix workflow issue.
|
2022-08-19 08:52:37 +08:00 |
|