Commit Graph
5112 Commits
Author SHA1 Message Date
tianshujie 324dfe4650 * Code for task #90780. 2023-04-12 09:08:51 +08:00
朱金勇 58f458f6d0 * Fix bugs of program action. 2023-04-11 05:28:42 +00:00
朱金勇 d20df48faf * Fix primary key of dmdb. 2023-04-11 03:05:50 +00:00
王怡栋 f1bc3b73cc Merge branch 'tsj_doc' into 'master'
* Code for task #90792.

See merge request easycorp/zentaopms!7343
2023-04-11 00:35:16 +00:00
wangyidong 1a32c02940 * fix bug #33914. 2023-04-10 17:36:53 +08:00
朱金勇 0dde8ad3ed Fix default value of db. 2023-04-10 09:19:01 +00:00
tianshujie c99fed9fe9 * Code for task #90792. 2023-04-10 14:31:21 +08:00
朱金勇 75a3485f47 * Fix order in dmdb. 2023-04-10 03:13:24 +00:00
caoyanyi e90e7b9160 * Mofify api struct page locate. 2023-04-07 16:07:28 +08:00
tianshujie e6591f64d8 * Fix bug #33759. 2023-04-06 08:57:42 +08:00
朱金勇 22f9f1d087 Merge branch 'db' 2023-04-05 14:30:11 +00:00
朱金勇 7f9d638d28 * Fix sql for dmdb. 2023-04-05 14:18:24 +00:00
wangyidong e24a70f5b7 * code for task #89150. 2023-03-31 10:46:52 +08:00
tianshujie 5e1c7bee70 * Fix bug #33539. 2023-03-30 13:27:44 +08:00
liumengyi b873f07eb0 * Main lib's acl is default. 2023-03-29 14:39:38 +08:00
liumengyi 00f30608bc * Fix bug #33102. 2023-03-20 08:29:19 +00:00
wangxuepeng bd0979b334 * Fix bug 33045. 2023-03-17 07:17:07 +00:00
caoyanyi 1bc1e3fc0f * Adjust code. 2023-03-16 15:53:11 +08:00
caoyanyi a99ed812d3 * Code for bug #33010. 2023-03-16 15:37:12 +08:00
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