 王怡栋
|
6325ce1ccc
|
Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* recover user
See merge request easycorp/zentaopms!3872
|
2022-06-13 02:09:30 +00:00 |
|
|
lanzongjun
|
7c6b288878
|
* recover user
|
2022-06-10 17:26:57 +08:00 |
|
|
zenggang
|
8c5c2f2149
|
* Finish task#56549,56552
|
2022-06-10 00:51:11 +00:00 |
|
|
王怡栋
|
fd0cb543ba
|
Merge branch 'master' into 'sprint_200'
# Conflicts:
# module/execution/lang/en.php
# module/execution/lang/zh-cn.php
# module/execution/view/kanban.html.php
# module/kanban/css/space.css
|
2022-06-09 03:16:20 +00:00 |
|
|
wangyidong
|
11e6edcd22
|
Merge branch 'zdoo18'
|
2022-06-08 17:06:07 +08:00 |
|
|
leiyong
|
513b62abb0
|
* Adjust code.
|
2022-06-08 08:50:09 +00:00 |
|
|
lanzongjun
|
b31b45c11f
|
* finish task #56023
|
2022-06-08 15:44:50 +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 |
|
|
leiyong
|
bb31bbdca2
|
* Finish task#56360.
|
2022-06-07 07:55:58 +00:00 |
|
|
孙广明
|
61ad544156
|
Merge branch 'zentaopms_198'
|
2022-06-02 15:04:56 +08:00 |
|
|
孙广明
|
cf5dbf0f23
|
* Remove unused code.
|
2022-06-02 14:53:51 +08:00 |
|
|
孙广明
|
23d19bd6b3
|
* Code for export users.
|
2022-06-02 14:52:16 +08:00 |
|
|
leiyong
|
71a4c1099d
|
* Adjust the prompt text for plugin expiration.
|
2022-05-26 10:39:16 +00:00 |
|
|
leiyong
|
4744448fc5
|
* Adjust method name.
|
2022-05-26 07:43:52 +00:00 |
|
|
leiyong
|
ea4eb1d2de
|
* Finish task#54979.
|
2022-05-26 07:28:03 +00:00 |
|
|
李玉春
|
6b667195b1
|
Merge branch 'sprint/191_tianshujie_54329' into 'master'
Sprint/191 tianshujie 54329
See merge request easycorp/zentaopms!3496
|
2022-05-19 02:22:36 +00:00 |
|
|
tianshujie
|
db940f77fd
|
* Finish task #54329.
|
2022-05-19 09:43:34 +08:00 |
|
|
tianshujie
|
f0a7f24db9
|
* Finish task #54329.
|
2022-05-18 17:12:29 +08:00 |
|
|
tianshujie
|
f1f4c511b5
|
* Finish task #54329.
|
2022-05-18 16:08:09 +08:00 |
|
|
wangyidong
|
d6cf08b9d7
|
Merge branch 'tid'
|
2022-05-18 10:20:48 +08:00 |
|
|
zhouxudong
|
925aa3f8d8
|
* Finish task #54480.
|
2022-05-17 08:12:27 +00:00 |
|
|
zhouxudong
|
c097334f3b
|
* Finish task #54480.
|
2022-05-17 07:58:26 +00:00 |
|
|
zhouxudong
|
cca3f56437
|
* Finish task #54480.
|
2022-05-17 07:38:22 +00:00 |
|
|
孙广明
|
c4e649ef25
|
* Finish task #54186.
|
2022-05-17 09:35:32 +08:00 |
|
|
hufangzhou
|
401ea2f810
|
* Fix bug #22407.
|
2022-05-13 08:47:46 +08:00 |
|
|
孙广明
|
aff78c6d45
|
Merge branch 'fixbug_sunjun_17828' into 'master'
*Fixbug_sunjun_17828
See merge request easycorp/zentaopms!3183
|
2022-04-28 05:30:05 +00:00 |
|
|
sunjun
|
445279bb1a
|
*Fixbug_sunjun_17828
|
2022-04-28 05:26:17 +00:00 |
|
|
tianshujie
|
42992a4b12
|
* Count the use cases under the use case library.
|
2022-04-27 14:25:58 +08:00 |
|
|
李玉春
|
2aa57d045b
|
Merge branch 'cyy_bug' into 'master'
* Fix unlink file error.
See merge request easycorp/zentaopms!3115
|
2022-04-26 03:11:42 +00:00 |
|
|
zhouxudong
|
ed3f3bd7b4
|
* Fix bug #21984.
|
2022-04-26 01:06:30 +00:00 |
|
|
caoyanyi
|
2df290f018
|
* Fix bug #19311.
|
2022-04-26 09:04:11 +08:00 |
|
|
孙广明
|
10496fd993
|
Merge branch 'sprint/master_zhouxudong_16729' into 'master'
* Fix bug from max #16729.
See merge request easycorp/zentaopms!3080
|
2022-04-22 06:55:14 +00:00 |
|
|
zhouxudong
|
aaffd2788c
|
* Fix bug from max #16729.
|
2022-04-22 13:07:10 +08:00 |
|
|
王怡栋
|
b9eab52620
|
* fix vulnerability.
|
2022-04-22 10:38:41 +08:00 |
|
|
朱金勇
|
7df8158405
|
Merge branch 'sprint/sunhao/fix_avatar_display' into 'master'
* fix issue on show avatar.
See merge request easycorp/zentaopms!3025
|
2022-04-20 07:47:16 +00:00 |
|
|
xieqiyu
|
565ea292d3
|
* Fix bug#21642.
|
2022-04-20 14:31:47 +08:00 |
|
|
Hao Sun
|
6dc60ceead
|
* fix issue on show avatar.
|
2022-04-20 11:31:36 +08:00 |
|
|
liyuchun
|
c5eddbe19b
|
* Fix bug #21565.
|
2022-04-18 11:49:44 +08:00 |
|
|
xieqiyu
|
477a2a4162
|
* Fix bug#19318.
|
2022-04-15 13:57:35 +08:00 |
|
|
zhouxin
|
5f11d21fbf
|
* Fix bug #21783.
|
2022-04-15 03:19:06 +00:00 |
|
|
xieqiyu
|
5468912f57
|
* Fix bug#21382.
|
2022-04-14 15:22:54 +08:00 |
|
|
zenggang
|
6908956c24
|
* Fix bug#17082,17990
|
2022-04-14 06:28:31 +00:00 |
|
|
xieqiyu
|
22b629b707
|
* Fix bug#21382.
|
2022-04-13 13:15:08 +08:00 |
|
|
zhouxin
|
1571548411
|
* Fix bug #21654.
|
2022-04-12 01:34:40 +00:00 |
|
|
zhouxin
|
d79f9f22e4
|
* Fix bug #21320.
|
2022-04-11 06:14:00 +00:00 |
|
|
zhouxin
|
50fe51a2e5
|
* Fix bug #21320.
|
2022-04-11 01:18:40 +00:00 |
|
|
liyuchun
|
ff102f75c4
|
* Fix bug #20986.
|
2022-04-08 10:07:46 +08:00 |
|
|
zenggang
|
691cde081b
|
* Fix bug#19960
|
2022-04-07 03:32:14 +00:00 |
|
|
zenggang
|
2429bc7f6e
|
* Fix bug#20886,16610
|
2022-04-07 01:58:09 +00:00 |
|