 王怡栋
|
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 |
|
|
tianshujie
|
e2669481c7
|
* Added German and French.
|
2022-06-22 15:28:45 +08:00 |
|
|
tianshujie
|
7372f7f936
|
* Finish story #32623.
|
2022-06-22 08:51:05 +08:00 |
|
|
王怡栋
|
83ecf656d3
|
Merge branch 'sgm_parentplan' into 'master'
* Code for feedback #397.
See merge request easycorp/zentaopms!4033
(cherry picked from commit beaddb012c)
f0c23584 * Code for feedback #397.
|
2022-06-21 06:28:13 +00:00 |
|
|
王怡栋
|
c30ba304ab
|
Revert "Merge branch 'sgm_parentplan' into 'master'"
This reverts merge request !4033
|
2022-06-21 06:25:45 +00:00 |
|
|
孙广明
|
f0c23584e0
|
* Code for feedback #397.
|
2022-06-21 10:23:58 +08:00 |
|
|
zhouxudong
|
f8792b01bf
|
* Finish task #57871.
|
2022-06-21 00:42:05 +00:00 |
|
|
zhouxudong
|
64310b7dfb
|
* Finish task #57871.
|
2022-06-20 08:17:44 +00:00 |
|
|
zhouxudong
|
e2d00ec066
|
* Finish task #57880 #57881 #57866.
|
2022-06-20 08:11:52 +00:00 |
|
|
zhouxudong
|
32c34c35e9
|
* Finish task #57880 #57881 #57866.
|
2022-06-20 07:43:08 +00:00 |
|
|
zhouxudong
|
19d289455a
|
* Finish task #57880 #57881 #57866.
|
2022-06-20 06:34:29 +00:00 |
|
|
leiyong
|
32b846cdf5
|
* Finish task#56926.
|
2022-06-15 07:57:50 +00:00 |
|
|
leiyong
|
791cc7a40f
|
* Finish task#56926.
|
2022-06-14 08:54:42 +00:00 |
|
|
liumengyi
|
7cb27c5456
|
* Fix bug #23459.
|
2022-06-09 09:41:23 +08:00 |
|
|
liumengyi
|
1daf6e8f91
|
* Add annotation.
|
2022-06-08 17:02:44 +08:00 |
|
|
liumengyi
|
e834782533
|
* Fix bug of task #56455.
|
2022-06-08 16:54:01 +08:00 |
|
|
liumengyi
|
bb2ab1cf7b
|
* Finish task #56455.
|
2022-06-08 15:05:47 +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 |
|
|
tianshujie
|
ee2d74d99d
|
* Fix bug #23358.
|
2022-06-07 14:43:42 +08:00 |
|
|
李玉春
|
21c7ec71b5
|
Merge branch 'fixbug_sunjun_22885' into 'master'
fixbug_sunjun_22885
See merge request easycorp/zentaopms!3752
|
2022-06-07 01:13:09 +00:00 |
|
|
liumengyi
|
5c552b5dff
|
* Fix bug #23271.
|
2022-06-06 16:34:32 +08:00 |
|
|
sunjun
|
13f565ed69
|
fixbug_sunjun_22885
|
2022-06-06 08:14:04 +00:00 |
|
|
zenggang
|
7d5615ffac
|
* Adjust story sort default to desc
|
2022-05-24 09:10:28 +00:00 |
|
|
孙广明
|
c9ed9ca81f
|
Merge branch 'sprint/194_liumengyi_fixbug' into 'master'
* Fix bug #22800.
See merge request easycorp/zentaopms!3567
|
2022-05-24 08:23:23 +00:00 |
|
|
liumengyi
|
2561c857b7
|
* Fix bug #22800.
|
2022-05-24 16:14:00 +08:00 |
|
|
mayue
|
21402a6f66
|
* Finish task #55171.
|
2022-05-24 08:12:28 +00:00 |
|
|
wangyidong
|
967d24dd06
|
Merge branch 'sprint/189_package'
|
2022-05-24 10:32:09 +08:00 |
|
|
mayue
|
8a1fdfe0d8
|
Fix bug #22756.
|
2022-05-20 09:29:39 +00:00 |
|
|
wangyidong
|
3b7aa9ed80
|
* fix bug.
|
2022-05-20 17:07:55 +08:00 |
|
|
wangyidong
|
17d1e3301b
|
* code for #54801.
|
2022-05-20 15:54:35 +08:00 |
|
|
daitingting
|
00ebebb6ed
|
* Check privilege by buildMenu.
|
2022-05-20 07:38:22 +00:00 |
|
|
leiyong
|
59a3d51ee6
|
* Finish task#54490.
|
2022-05-20 02:47:24 +00:00 |
|
|
孙广明
|
97f5dcdc9f
|
Merge branch 'sprint190_zg_bugs' into 'master'
* Fix bug#22554,22673,22555
See merge request easycorp/zentaopms!3508
|
2022-05-20 01:41:31 +00:00 |
|
|
mayue
|
08588cc445
|
* Optimize code.
|
2022-05-19 07:52:24 +00:00 |
|
|
mayue
|
8e415b38cb
|
* Fix bug #22639.
|
2022-05-19 07:45:02 +00:00 |
|
|
mayue
|
66c6bf6bc5
|
* Fix bug #22639.* Fix bug #22639.* Fix bug #22639.* Fix bug #22639.* Fix bug #22639.* Fix bug #22639.* Fix bug #22639.* Fix bug #22639.
|
2022-05-19 07:39:46 +00:00 |
|
|
mayue
|
0e0aed22f1
|
* Fix bug #22639.
|
2022-05-19 03:26:18 +00:00 |
|
|
zenggang
|
430209e92b
|
* Fix bug#22554,22673
|
2022-05-19 03:23:35 +00:00 |
|
|
李玉春
|
579391bd84
|
Merge branch 'sprint/191_liumengyi_54350' into 'master'
* Finish task #54350.
See merge request easycorp/zentaopms!3506
|
2022-05-19 03:18:38 +00:00 |
|
|
liumengyi
|
acd0b33267
|
* Fix bug for task #54350.
|
2022-05-19 11:05:22 +08:00 |
|
|
liumengyi
|
ff4e5ba635
|
* Fix bug for task#54350.
|
2022-05-19 10:24:14 +08:00 |
|
|
mayue
|
d11349b974
|
* Fix bug #22630.
|
2022-05-19 01:05:00 +00:00 |
|
|
liumengyi
|
b8c091aa27
|
* Finish task #54350.
|
2022-05-18 15:17:51 +08:00 |
|
|
mayue
|
9c336a223e
|
* Fix bug #22587.
|
2022-05-18 03:15:15 +00:00 |
|
|
mayue
|
117865e63d
|
* Optimize code.
|
2022-05-18 03:11:12 +00:00 |
|
|
mayue
|
bf4ac6a465
|
* Fix bug #22574.
|
2022-05-18 02:48:51 +00:00 |
|
|
daitingting
|
244f061700
|
* Build flow menu.
|
2022-05-17 09:14:29 +00:00 |
|
|
wangyuting2
|
f5638d6481
|
* Fix buildOperateMenu bug.
|
2022-05-17 16:56:25 +08:00 |
|
|
mayue
|
d0340d5666
|
* Optimize code.
|
2022-05-17 07:47:50 +00:00 |
|