 tianshujie
|
98694da2ae
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/228_tianshujie_64967
|
2022-08-18 16:47:14 +08:00 |
|
|
曾刚
|
3172961404
|
Sprint/228 zg tasks and units
|
2022-08-18 07:15:14 +00:00 |
|
|
tianshujie
|
884d6fa30a
|
* Finish task #64967.
|
2022-08-18 13:44:04 +08:00 |
|
|
tianshujie
|
df8c9caf46
|
* Finish task #64967.
|
2022-08-17 16:37:02 +08:00 |
|
|
tianshujie
|
619068ea8d
|
* Finish task #64967.
|
2022-08-17 15:40:01 +08:00 |
|
|
tianshujie
|
24e39026cc
|
* Finish task #64967.
|
2022-08-16 17:07:27 +08:00 |
|
|
leiyong
|
489fa70400
|
* Fix single sign-on.
|
2022-08-11 01:54:32 +00:00 |
|
|
孙广明
|
fe0f69fc77
|
Merge branch 'lyk_64217' into 'master'
* Finish task #64217
See merge request easycorp/zentaopms!4844
|
2022-08-08 08:59:22 +00:00 |
|
|
王怡栋
|
22bf2d8058
|
Merge branch 'sprint/hufangzhou_62965' into 'master'
* Finish task #62965. Fix bug #26130, #26129, #26120.
See merge request easycorp/zentaopms!4843
|
2022-08-08 08:47:08 +00:00 |
|
|
王怡栋
|
9e6111ad6c
|
Merge branch 'master' into 'sprint/devplat_30'
# Conflicts:
# db/update17.4.sql
|
2022-08-08 08:44:25 +00:00 |
|
|
liuyongkai
|
da82407e9d
|
* Finish task #64217
|
2022-08-08 08:37:53 +00:00 |
|
|
hufangzhou
|
b44ed94231
|
* Finish task #62965. Fix bug #26130, #26129, #26120.
|
2022-08-08 16:31:20 +08:00 |
|
|
王怡栋
|
3cc4c75950
|
Merge branch 'sprint/221_tianshujie_issue' into 'master'
Sprint/221 tianshujie issue
See merge request easycorp/zentaopms!4810
|
2022-08-05 02:34:09 +00:00 |
|
|
王怡栋
|
7cbbcc9cad
|
Merge branch 'lyk_25879' into 'master'
* Fix bug 25879.
See merge request easycorp/zentaopms!4792
|
2022-08-05 02:25:35 +00:00 |
|
|
tianshujie
|
e6ddd61174
|
* Finish task #62948.
|
2022-08-05 09:36:56 +08:00 |
|
|
wangyuting2
|
9021138b70
|
* Adjust featurebar sort to config.
|
2022-08-05 09:01:31 +08:00 |
|
|
wangyuting2
|
5bc8123a58
|
* Add note.
|
2022-08-03 17:06:56 +08:00 |
|
|
wangyuting2
|
afba28db68
|
* Add project execution approval menu.
|
2022-08-03 16:48:10 +08:00 |
|
|
wangyuting2
|
731e5a4161
|
* Fix warring.
|
2022-08-03 14:35:54 +08:00 |
|
|
wangyuting2
|
84c6278274
|
* Finish task #63288.
|
2022-08-03 13:32:41 +08:00 |
|
|
liuyongkai
|
c45499b497
|
* Fix bug 25879.
|
2022-08-02 06:33:56 +00:00 |
|
|
liuyongkai
|
d1c2928233
|
* Fix bug #25879.
|
2022-08-02 01:04:58 +00:00 |
|
|
wangyidong
|
bbb79d5f94
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-07-20 10:59:50 +08:00 |
|
|
wangyidong
|
7542c26998
|
* code for task #61483.
|
2022-07-20 10:58:57 +08:00 |
|
|
caoyanyi
|
07465a327d
|
* Modify merge request view.
|
2022-07-19 17:04:12 +08:00 |
|
|
caoyanyi
|
8163199cf1
|
* Modify merge request for gitea.
|
2022-07-19 10:56:04 +08:00 |
|
|
wangyidong
|
1fcfdf2972
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-07-15 10:06:00 +08:00 |
|
|
wangyidong
|
c4af3c24b6
|
* fix bug #25346.
|
2022-07-15 10:05:43 +08:00 |
|
|
liugang
|
a53697f342
|
* Fix bug of print kanban.
|
2022-07-14 15:36:10 +08:00 |
|
|
tianshujie
|
49007c2a17
|
* Fix bug #25234.
|
2022-07-14 10:05:15 +08:00 |
|
|
tianshujie
|
b5a9fe8c52
|
* Fix bug #25234,25233.
|
2022-07-14 09:57:56 +08:00 |
|
|
王怡栋
|
96ad1bfff8
|
Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug #25016
See merge request easycorp/zentaopms!4440
|
2022-07-08 07:22:37 +00:00 |
|
|
lanzongjun
|
5c95d9fd18
|
* fix bug #25016
|
2022-07-08 14:52:46 +08:00 |
|
|
wangyidong
|
9c61acba52
|
* fix bug for misc-captcha.
|
2022-07-08 14:46:25 +08:00 |
|
|
tianshujie
|
9df3094887
|
* Troubleshooting Play Course 302 Network Issues.
|
2022-07-08 11:32:17 +08:00 |
|
|
wangyidong
|
38cc476bb9
|
* fix bug #22749.
|
2022-07-08 09:47:42 +08:00 |
|
|
liumengyi
|
d24c7185f5
|
* Fix bug of task #59480, #59481.
|
2022-07-07 15:35:19 +08:00 |
|
|
孙广明
|
b5a365422f
|
* Code for pri error.
|
2022-07-07 09:57:20 +08:00 |
|
|
孙广明
|
d175ae0f5e
|
Merge branch 'master' into 'liyuchun_59437'
# Conflicts:
# module/repo/control.php
|
2022-07-05 09:20:43 +00:00 |
|
|
liyuchun
|
8a3d924e2b
|
* Finish task #59451.
|
2022-07-05 08:42:48 +00:00 |
|
|
wangyidong
|
c88aa6b8f1
|
Merge branch 'zentaomax35'
|
2022-07-04 14:16:06 +08:00 |
|
|
王怡栋
|
d8094cba31
|
Merge branch 'sprint/workflow' into 'master'
* Add openedApproval config.
See merge request easycorp/zentaopms!4268
|
2022-06-30 07:06:32 +00:00 |
|
|
wangyuting2
|
20ef9ee98e
|
* Add openedApproval config.
|
2022-06-30 14:38:45 +08:00 |
|
|
wangyidong
|
18a15b1d9d
|
* fix bug #23590.
|
2022-06-30 14:02:48 +08:00 |
|
|
tianshujie
|
98b100b6d1
|
* Add comments.
|
2022-06-30 13:40:43 +08:00 |
|
|
tianshujie
|
5a7778acbe
|
* Fixed TAB return error.
|
2022-06-30 13:37:34 +08:00 |
|
|
xieqiyu
|
7b579cfa1f
|
* Fix bug#24395.
|
2022-06-29 15:37:04 +08:00 |
|
|
tianshujie
|
f994051ea8
|
* Finish task #58552.
|
2022-06-28 12:16:11 +08:00 |
|
|
tanghucheng
|
25d4830892
|
* Fix code format.
|
2022-06-24 08:30:07 +08:00 |
|
|
王怡栋
|
748f1ffedf
|
Merge branch 'master' into 'sgm_prjadmin'
# Conflicts:
# db/update17.1.sql
|
2022-06-23 05:00:48 +00:00 |
|