Commit Graph
43112 Commits
Author SHA1 Message Date
liuhong bd88264c46 *Finish task #63775 2022-08-08 08:08:02 +00:00
wangyidong 024c2352ee * fix bug #26080. 2022-08-08 15:52:01 +08:00
wangyidong 660c82b46e * adjust for change table engine in upgrade. 2022-08-08 14:05:50 +08:00
孙广明 0e7fde7030 Merge branch 'lyk_fixbug_kanban' into 'master'
* Fix the view of kanbans' content

See merge request easycorp/zentaopms!4840
2022-08-08 05:30:04 +00:00
liuyongkai 628834cbab * Fix the view of kanbans' content 2022-08-08 05:28:11 +00:00
liuyongkai 7e7b535c13 * Fix the view of kanbans' content 2022-08-08 05:25:02 +00:00
王怡栋 ed951dc12e Merge branch 'sprint/gantt_upgrade' into 'master'
Sprint/gantt upgrade

See merge request easycorp/zentaopms!4835
2022-08-08 03:25:42 +00:00
mayue 0b362d4061 * Add lang . 2022-08-08 11:23:36 +08:00
wangyidong f0448407e8 Merge branch 'sprint/hufangzhou_createdoc' 2022-08-08 11:05:43 +08:00
王怡栋 ec328f7432 Merge branch 'master' into 'sprint/hufangzhou_createdoc'
# Conflicts:
#   config/zentaopms.php
2022-08-08 03:05:17 +00:00
hufangzhou 5280ed4fc6 * Remove the unused code. 2022-08-08 11:02:06 +08:00
hufangzhou f8b34bc690 * Remove the unused code. 2022-08-08 10:56:49 +08:00
mayue fc0a0b2d61 * Optimize code. 2022-08-08 10:56:43 +08:00
hufangzhou 6b9705e6c6 * Remove the uploader file in the first step of create doc. 2022-08-08 10:45:59 +08:00
mayue b338d96743 * Optimize code. 2022-08-08 10:41:26 +08:00
mayue fc13fad289 resolve conflict 2022-08-08 10:39:25 +08:00
孙广明 716bdc49c0 Merge branch 'liyuchun_unittest' into 'master'
Liyuchun unittest

See merge request easycorp/zentaopms!4826
2022-08-08 02:34:50 +00:00
孙广明 03ffa85dba Merge branch 'liyuchun_fixbug' into 'master'
* Fix bug #25176.

See merge request easycorp/zentaopms!4829
2022-08-08 02:34:19 +00:00
王怡栋 8c7c196e70 Merge branch 'sprint/221_liumengyi_fixbug' into 'master'
* Fix bug #26102, #25992.

See merge request easycorp/zentaopms!4828
2022-08-08 01:47:35 +00:00
liyuchun a9661e5718 * Fix bug #25176. 2022-08-07 08:40:43 +00:00
sunguangming 1e05476b43 * Code for kanban action. 2022-08-05 17:35:29 +08:00
liumengyi 911ba77fea * Fix bug #25992. 2022-08-05 16:16:05 +08:00
lanzongjun 8429ff7062 realbegin date fix 2022-08-05 16:04:10 +08:00
lanzongjun 9c6356fded debug 2022-08-05 15:50:24 +08:00
liumengyi 756c8d4dc0 * Fix bug #26102. 2022-08-05 15:49:56 +08:00
lanzongjun 408150ff5c debug 2022-08-05 15:40:25 +08:00
liyuchun 54488775af Add unit cases. 2022-08-05 07:13:10 +00:00
liyuchun 54c81c82e2 * Add unit case. 2022-08-05 07:06:35 +00:00
孙广明 209ed28c5c Merge branch 'sprint/221_liumengyi_login' into 'master'
* Fix bug for task #62949.

See merge request easycorp/zentaopms!4825
2022-08-05 07:05:46 +00:00
liumengyi 28bd299fee * Fix bug for task #62949. 2022-08-05 15:04:34 +08:00
王怡栋 86693cfb4f Merge branch 'sprint/221_zg_bugs' into 'master'
* Fix sprint211 problems.

See merge request easycorp/zentaopms!4818
2022-08-05 06:48:01 +00:00
王怡栋 8f66bb355b Merge branch 'sprint/master_zhouxudong_bug' into 'master'
* Fix bug.

See merge request easycorp/zentaopms!4819
2022-08-05 06:46:20 +00:00
王怡栋 d450dcc900 Merge branch 'sprint/221_liumengyi_fixbug' into 'master'
* Fix bug #22507.

See merge request easycorp/zentaopms!4822
2022-08-05 06:45:59 +00:00
王怡栋 a1518aaf67 Merge branch 'master_liuhong_25973' into 'master'
*Fix bug #25973

See merge request easycorp/zentaopms!4823
2022-08-05 06:45:43 +00:00
王怡栋 3c7f9c969f Merge branch 'sprint/tianshujie_issue' into 'master'
* Fixed style issues with the story view page.

See merge request easycorp/zentaopms!4824
2022-08-05 06:45:21 +00:00
tianshujie 258ed79ec5 * Fixed style issues with the requirements details page. 2022-08-05 14:43:45 +08:00
zenggang a9fc847711 * Adjust code 2022-08-05 06:37:45 +00:00
sunguangming b065484875 * Code for kanban btn. 2022-08-05 14:29:56 +08:00
tianshujie 4d5875072c * Fixed style issues with the story view page. 2022-08-05 14:22:59 +08:00
lanzongjun 8adc70569f fix 2022-08-05 14:21:04 +08:00
liuhong 3f62f19b7f *Fix bug #25973 2022-08-05 06:17:05 +00:00
liumengyi 3ac5869c0f * Fix bug #22507. 2022-08-05 14:01:40 +08:00
王怡栋 12bc9c9e21 Merge branch 'sprint/221_tianshujie_issue' into 'master'
Sprint/221 tianshujie issue

See merge request easycorp/zentaopms!4820
2022-08-05 05:52:40 +00:00
tianshujie 803495a54b * Resolved issue #705,704,703,702. 2022-08-05 13:49:01 +08:00
zhouxudong f6f6dbe5a1 * Fix bug. 2022-08-05 05:34:12 +00:00
wangyidong 7e732dfae7 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-08-05 13:23:25 +08:00
wangyidong 51df481862 * fix for getOptionMenu. 2022-08-05 13:22:57 +08:00
zenggang 262ab9e5cd * Fix sprint211 problems. 2022-08-05 05:19:47 +00:00
孙广明 c7c7d0a3af Merge branch 'sprint/221_liumengyi_fixbug' into 'master'
* Fix bug #26033.

See merge request easycorp/zentaopms!4817
2022-08-05 05:16:04 +00:00
liumengyi 05f3985def * Fix bug #26033. 2022-08-05 13:15:17 +08:00