Commit Graph
5093 Commits
Author SHA1 Message Date
hufangzhou 125a4384af * Add the new version. 2023-03-15 02:53:46 +00:00
tianshujie 2b7cff9090 * Fixed list title color issues. 2023-03-15 09:22:49 +08:00
tianshujie 6cd6ba3858 * Add skip stash page. 2023-03-13 14:55:29 +08:00
caoyanyi ef62dca574 Merge branch 'dev/gfl_theme_refactors' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_fixbug 2023-03-10 10:04:06 +08:00
tianshujie 665422c7ce * Fix bug #32761. 2023-03-09 16:50:22 +08:00
孙广明 806e3a4742 Merge branch 'sprint/295_liumengyi_86258' into 'master'
* Finish task #86281 86258.

See merge request easycorp/zentaopms!7166
2023-03-09 08:07:59 +00:00
孙广明 aa43899adf Merge branch 'sprint/fixbug_liumengyi_31827' into 'master'
* Fix bug #31827.

See merge request easycorp/zentaopms!7151
2023-03-08 01:27:19 +00:00
孙广明 429661db3b Merge branch 'zentaopms_289' into 'master'
Zentaopms 289

See merge request easycorp/zentaopms!7150
2023-03-08 01:26:34 +00:00
孙广明 08a56aa814 Merge branch 'sprint/294_liumengyi_85646' into 'master'
* Finish task #85646.

See merge request easycorp/zentaopms!7144
2023-03-08 01:25:24 +00:00
孙广明 59c05f91c7 Merge branch 'fixbug_liumengyi_32633' into 'master'
* Fix bug 32603 32632 32633.

See merge request easycorp/zentaopms!7142
2023-03-08 01:24:54 +00:00
tianshujie cecb8315ac * Modify language items for product,project common. 2023-03-07 16:34:48 +08:00
liumengyi b25022e3b0 * Fix bug #31827. 2023-03-07 06:52:09 +00:00
tianshujie 903c858cf1 * Implement custom use case filter tags. 2023-03-06 16:36:06 +08:00
liumengyi 3f63404953 * Finish task #86258. 2023-03-06 06:09:13 +00:00
liumengyi 3326617ffd * Finish task #85646. 2023-03-06 03:45:49 +00:00
王怡栋 3438722a8c Merge branch 'master' into 'zentaopms_289'
# Conflicts:
#   db/update18.2.sql
2023-03-06 03:26:34 +00:00
tianshujie f996230e1f * Added Kanban Filter tag language entry. 2023-03-06 10:43:43 +08:00
liumengyi e9db77ef6c * Fix bug #32603. 2023-03-06 00:38:08 +00:00
Yagami f95691948a Merge branch 'zentaopms_294' 2023-03-06 08:37:11 +08:00
tianshujie f9a666909c Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289 2023-03-06 08:30:49 +08:00
Yagami eebc016b4a * Remove unused code. 2023-03-03 15:18:41 +08:00
孙广明 9d3a52f0af Merge branch 'lyk_fixbug' into 'master'
* Fix bug #32374.

See merge request easycorp/zentaopms!7138
2023-03-03 02:15:41 +00:00
liuyongkai 10478231d8 * Fix bug #32374. 2023-03-03 10:11:06 +08:00
王怡栋 b80d37fcfb Merge branch 'daitingting_bug_postparentisempty' into 'master'
* Fix bug for the post parent is empty.

See merge request easycorp/zentaopms!7136
2023-03-03 02:03:05 +00:00
liuyongkai c2bfa8c8ab * Fix bug #32374. 2023-03-03 09:56:31 +08:00
daitingting 6880b7428b * Fix bug for the post parent is empty. 2023-03-03 01:53:23 +00:00
caoyanyi 86c6968243 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289 2023-03-03 08:48:41 +08:00
liuyongkai 846129297d * Fix bug #32374. 2023-03-02 17:32:47 +08:00
liuyongkai bc54729fff * Fix bug #32374. 2023-03-02 17:27:44 +08:00
liumengyi fc44446224 * Fix bug #32603. 2023-03-02 07:49:41 +00:00
caoyanyi 25f195767f Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289 2023-03-02 13:18:34 +08:00
liumengyi f898b790ef * Fix bug #32588. 2023-03-02 03:23:59 +00:00
liumengyi cb7757e92d * Fix bug #32582. 2023-03-02 01:02:17 +00:00
tianshujie 3886a5f25b Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289 2023-03-02 08:27:28 +08:00
hufangzhou 38dcd2e51e * Fix bug #32490. 2023-03-01 08:46:17 +00:00
caoyanyi edc301d455 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289 2023-03-01 15:24:30 +08:00
Yagami 97c421c5b4 * Fix bug #32374. 2023-03-01 14:48:12 +08:00
liumengyi 6529c78e32 * Finish task #85646. 2023-03-01 02:52:05 +00:00
tianshujie 872137cea6 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289 2023-03-01 08:35:21 +08:00
王怡栋 23d4e4d11e Merge branch 'daitingting_bug_#32503' into 'master'
* Fix bug #32503.

See merge request easycorp/zentaopms!7094
2023-03-01 00:31:59 +00:00
孙广明 c9a7c22553 Merge branch 'sprint/294_liumengyi_fixbug' into 'master'
* Fix bug 32493 32502 32495 32494 32491.

See merge request easycorp/zentaopms!7092
2023-02-28 09:12:43 +00:00
Yagami 1efa245724 * Code for program progress bug. 2023-02-28 17:10:36 +08:00
caoyanyi 0eb7b70d48 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289 2023-02-28 17:07:32 +08:00
liumengyi 241c923453 * Fix bug #32491. 2023-02-28 08:55:37 +00:00
daitingting 2271e5bd70 * Fix bug #32503. 2023-02-28 08:38:00 +00:00
孙广明 cde3ff49f3 Merge branch 'master' into 'sprint/294_liumengyi_fixbug'
# Conflicts:
#   module/project/js/execution.js
2023-02-28 07:16:39 +00:00
孙广明 54c3641625 Merge branch 'fixbug_liumengyi' into 'master'
* Optimize code, fix bug 32456 32457 32463 32464 32477 32480.

See merge request easycorp/zentaopms!7086
2023-02-28 07:15:20 +00:00
liumengyi e96d7b0e00 * Fix bug #32455. 2023-02-28 06:25:07 +00:00
Yagami 0f38f55480 * Fix bug #32450. 2023-02-28 14:22:49 +08:00
liumengyi 5daf06d2f1 * Fix bug #32480. 2023-02-28 06:03:03 +00:00