Commit Graph
2232 Commits
Author SHA1 Message Date
tianshujie 324dfe4650 * Code for task #90780. 2023-04-12 09:08:51 +08:00
朱金勇 d20df48faf * Fix primary key of dmdb. 2023-04-11 03:05:50 +00:00
tianshujie c99fed9fe9 * Code for task #90792. 2023-04-10 14:31:21 +08:00
tianshujie 5e1c7bee70 * Fix bug #33539. 2023-03-30 13:27:44 +08: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
tianshujie 6cd6ba3858 * Add skip stash page. 2023-03-13 14:55:29 +08:00
tianshujie 665422c7ce * Fix bug #32761. 2023-03-09 16:50:22 +08:00
tianshujie f996230e1f * Added Kanban Filter tag language entry. 2023-03-06 10:43:43 +08:00
caoyanyi 86c6968243 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289 2023-03-03 08:48:41 +08:00
liumengyi f898b790ef * Fix bug #32588. 2023-03-02 03:23:59 +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
tianshujie 872137cea6 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289 2023-03-01 08:35:21 +08:00
liumengyi 241c923453 * Fix bug #32491. 2023-02-28 08:55:37 +00:00
caoyanyi e7c8ceed8d * Modify dynamic language. 2023-02-23 10:10:11 +08:00
caoyanyi 6caaf4c316 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289 2023-02-23 08:32:25 +08:00
孙广明 25fa088422 Merge branch 'sprint/292_liumengyi_fixbug' into 'master'
* Fix bug.

See merge request easycorp/zentaopms!7033
2023-02-22 07:55:34 +00:00
liumengyi 5ed6406041 * Fix issue #754, #751, and adjust width of create project guide. 2023-02-22 07:50:21 +00:00
tianshujie af76befb02 * Resolve issue #756. 2023-02-22 15:15:34 +08:00
caoyanyi e9b4bb067e Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289 2023-02-22 11:17:41 +08:00
hufangzhou 98a5efb31c * Recovery code. 2023-02-22 01:34:50 +00:00
caoyanyi 7df9719cf3 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289 2023-02-22 08:24:22 +08:00
zhujinyong 6b241f1d06 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2023-02-21 15:56:50 +08:00
zhujinyong 39b2773e77 * Fix bug #32332. 2023-02-21 15:55:33 +08:00
wangyidong 64a84d59c9 Merge branch 'zentaopms_289' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289 2023-02-21 15:32:54 +08:00
wangyidong 9ef211ef57 * code for task #84544. 2023-02-21 15:32:37 +08:00
孙广明 777b20ebdc Merge branch 'sprint/tsj_task' into 'master'
Sprint/tsj task

See merge request easycorp/zentaopms!7009
2023-02-21 05:47:26 +00:00
zhujinyong 6ae6909717 * Fix merge bug. 2023-02-21 10:28:55 +08:00
zhujinyong 5551177931 + Add error of different type. 2023-02-21 10:24:00 +08:00
hufangzhou 2c1995d4a9 * Finish task #85049. 2023-02-20 07:23:49 +00:00
tianshujie d6266bc607 * Code for finish task #85047. 2023-02-20 14:47:10 +08:00
liumengyi 6520a56bee * Fix bug of browse gantt. 2023-02-20 02:04:33 +00:00
hufangzhou 75b5b2562c * Finish task #84583. 2023-02-18 16:04:53 +00:00
wangyidong 7bc1b0da56 * fix bug #32203. 2023-02-17 09:25:07 +08:00
tianshujie 484f34396c Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_284 2023-02-16 08:59:00 +08:00
hufangzhou f3cd2e7d4d * Change the Easy Soft to ZenTao Software. 2023-02-15 17:01:22 +08:00
liumengyi 7ea51e54b5 * Finish task #84584. 2023-02-14 13:13:46 +08:00
liumengyi bc4c383fa5 * Finish task #84582. 2023-02-13 16:12:24 +08:00
liumengyi 2379ab313a * Finish task #84582. 2023-02-13 15:36:41 +08:00
tianshujie ec0078c708 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_284 2023-02-13 14:03:58 +08:00
王怡栋 9331b9856a Merge branch 'master' into 'zentaopms_wangyuting'
# Conflicts:
#   module/programplan/view/gantt.html.php
2023-02-08 08:30:14 +00:00
wangyuting2 ab16894c06 * Optimize page css. 2023-02-08 16:17:16 +08:00
wangyuting2 afaa89f8fd * Fix bug #27242. 2023-02-08 16:03:35 +08:00
Yagami c2724b9f57 Merge branch 'zentaopms_281' 2023-02-08 15:31:13 +08:00
Yagami cf5c7a2fbc * Code for project required field. 2023-02-03 13:17:12 +08:00
wangyidong 1f1e8b0836 * fix bug #31519. 2023-02-03 08:48:18 +08:00
Yagami 7f6892bf38 * Fix edit waterfall project bug. 2023-02-02 16:39:57 +08:00
Yagami fd399560f9 * Code for task #83209. 2023-01-31 08:54:50 +08:00
liumengyi 5e179c8b05 * Finish task #83215, #83210. 2023-01-30 15:39:20 +08:00