 leiyong
|
f1d9e3375f
|
* Fix bug#24031.
|
2022-06-23 01:16:26 +00:00 |
|
|
王怡栋
|
9ffdc942c2
|
Merge branch 'master' into 'sprint/205'
# Conflicts:
# module/execution/lang/en.php
# module/execution/lang/zh-cn.php
|
2022-06-22 09:21:12 +00:00 |
|
|
leiyong
|
0feed34baa
|
* Finish task#57901.
|
2022-06-21 09:54:50 +00:00 |
|
|
liyuchun
|
76a318cb30
|
* Finish task #57656.
|
2022-06-20 06:10:33 +00:00 |
|
|
wangyidong
|
11e6edcd22
|
Merge branch 'zdoo18'
|
2022-06-08 17:06:07 +08:00 |
|
|
孙广明
|
b896377846
|
* Change zentao license.
|
2022-06-08 10:02:29 +08:00 |
|
|
孙广明
|
b528156589
|
* Change license.
|
2022-06-08 09:34:46 +08:00 |
|
|
wangyuting2
|
6e05fa0cfa
|
* Add openEntry function for js class.
|
2022-06-07 15:16:38 +08:00 |
|
|
daitingting
|
2b4cbd97c4
|
* Finish task #56054.
|
2022-06-07 02:52:36 +00:00 |
|
|
孙广明
|
f8d681efac
|
* Fix bugs.
|
2022-06-06 13:54:06 +08:00 |
|
|
孙广明
|
ea678a3736
|
Merge branch 'liyuchun_fixbug' into 'master'
* Fix bug #23132.
See merge request easycorp/zentaopms!3710
|
2022-06-02 05:55:29 +00:00 |
|
|
liyuchun
|
29ceb63023
|
* Fix bug #23132.
|
2022-06-02 02:49:27 +00:00 |
|
|
tianshujie
|
eb3f621a92
|
* Modify the logic of the back button.
|
2022-05-26 11:41:09 +08:00 |
|
|
tianshujie
|
b43eed49d0
|
* Modify the logic of the return button.
|
2022-05-26 11:39:23 +08:00 |
|
|
wangyidong
|
967d24dd06
|
Merge branch 'sprint/189_package'
|
2022-05-24 10:32:09 +08:00 |
|
|
wangyuting2
|
b5337689e2
|
* Optimized code.
|
2022-05-20 16:09:50 +08:00 |
|
|
mayue
|
aa0b81f0a6
|
* Fix bug #22246.
|
2022-05-18 07:19:19 +00:00 |
|
|
wangyidong
|
d6cf08b9d7
|
Merge branch 'tid'
|
2022-05-18 10:20:48 +08:00 |
|
|
王怡栋
|
ebd8840dbb
|
Merge branch 'sprint/wangyuting_fixbug_22520' into 'master'
* Fix bug #22520
See merge request easycorp/zentaopms!3435
(cherry picked from commit 670520548f)
faf8ee28 * Fix bug #22520
|
2022-05-17 08:49:15 +00:00 |
|
|
王怡栋
|
32108b6ad2
|
Merge branch 'sgm_fixbug' into 'master'
* Fix jira and markdown bug.
See merge request easycorp/zentaopms!3444
|
2022-05-17 08:00:12 +00:00 |
|
|
孙广明
|
1c9bfe9bd6
|
* Fix jira and markdown bug.
|
2022-05-17 15:10:28 +08:00 |
|
|
wangyuting2
|
d204f15d47
|
* Fix workflow default lang bug.
|
2022-05-17 14:56:44 +08:00 |
|
|
王怡栋
|
1ed6b45e30
|
Merge branch 'sgm_sprint190' into 'master'
Sgm sprint190
See merge request easycorp/zentaopms!3440
|
2022-05-17 03:20:36 +00:00 |
|
|
孙广明
|
59b7e2675c
|
* Remove unused code.
|
2022-05-17 11:18:05 +08:00 |
|
|
孙广明
|
46e4eae295
|
* Finish task #54205.
|
2022-05-17 11:15:33 +08:00 |
|
|
王怡栋
|
670520548f
|
Merge branch 'sprint/wangyuting_fixbug_22520' into 'master'
* Fix bug #22520
See merge request easycorp/zentaopms!3435
|
2022-05-17 03:03:53 +00:00 |
|
|
wangyuting2
|
faf8ee28b9
|
* Fix bug #22520
|
2022-05-17 09:58:28 +08:00 |
|
|
zhouxudong
|
48c052efad
|
* Fix bug #22531.
|
2022-05-16 09:23:29 +00:00 |
|
|
wangyuting2
|
34609e9036
|
* Optimize code.
|
2022-05-12 13:33:56 +08:00 |
|
|
wangyuting2
|
28f4a384ee
|
* Add biz version judgment conditions.
|
2022-05-12 13:27:41 +08:00 |
|
|
wangyuting2
|
6331cede38
|
* Fix workflow bug.
|
2022-05-12 13:07:37 +08:00 |
|
|
xieqiyu
|
ce7c0afdc1
|
* Finish task#53666.
|
2022-05-11 18:24:13 +08:00 |
|
|
daitingting
|
d577d57a33
|
* Add id for checking unique field.
|
2022-05-09 17:02:23 +08:00 |
|
|
wangyuting2
|
d29cf03d41
|
* Merge lib dao code.
|
2022-05-07 13:11:44 +08:00 |
|
|
孙广明
|
6f60b5627a
|
Merge branch 'master_xieqiyu_22092' into 'master'
* Fix bug#22092.
See merge request easycorp/zentaopms!3199
|
2022-04-28 10:33:01 +00:00 |
|
|
xieqiyu
|
aa74a708de
|
* Fix bug#22100.
|
2022-04-28 17:34:10 +08:00 |
|
|
孙广明
|
2db91483d3
|
Merge branch 'sprint/master_zhouxudong_22038' into 'master'
* Fix bug #22038.
See merge request easycorp/zentaopms!3163
|
2022-04-28 09:11:30 +00:00 |
|
|
zhouxudong
|
fd52256122
|
* Fix bug #22038.
|
2022-04-28 03:27:09 +00:00 |
|
|
zhouxudong
|
e2aa928abe
|
* Fix bug #22038.
|
2022-04-28 02:57:42 +00:00 |
|
|
liyuchun
|
537c1bea2d
|
* Fix bug #15039.
|
2022-04-28 02:06:10 +00:00 |
|
|
zhouxudong
|
0c2651b436
|
* Fix bug #22038.
|
2022-04-27 07:45:27 +00:00 |
|
|
wangyidong
|
f77b7875cc
|
* adjust for kilin.
|
2022-04-26 09:46:33 +08:00 |
|
|
caoyanyi
|
fa3411ce92
|
* Fix bug #15292.
|
2022-04-21 01:04:50 +00:00 |
|
|
李玉春
|
243dca8934
|
Merge branch 'bug_21823' into 'master'
Fix bug #21823,7042
See merge request easycorp/zentaopms!3032
|
2022-04-20 07:55:40 +00:00 |
|
|
zenggang
|
7c159eeb96
|
* Fix bug #21823,7042
|
2022-04-20 06:58:50 +00:00 |
|
|
Hao Sun
|
6dc60ceead
|
* fix issue on show avatar.
|
2022-04-20 11:31:36 +08:00 |
|
|
孙广明
|
425a272096
|
Merge branch 'liyuchun_fixbug_12931' into 'master'
* Fix bug #20178.
See merge request easycorp/zentaopms!3020
|
2022-04-20 02:36:43 +00:00 |
|
|
Hao Sun
|
c25231c297
|
* optimize helper method "js::locate", support for using app as target.
|
2022-04-19 16:06:19 +08:00 |
|
|
liyuchun
|
2d3195b0e6
|
* Fix bug #20178.
|
2022-04-19 11:16:53 +08:00 |
|
|
liyuchun
|
13d354ba8c
|
* Fix bug #21518.
|
2022-04-18 11:35:36 +08:00 |
|