Commit Graph
1178 Commits
Author SHA1 Message Date
xieqiyu 592a109bed * Code for task#67691. 2022-09-08 09:09:03 +08:00
zenggang 062af71ff8 * Fix sprint231 bugs 2022-08-29 07:23:32 +00:00
xieqiyu 97369a949c * Fix bug#26897. 2022-08-29 13:31:54 +08:00
xieqiyu fe9228b394 * Fix bug#26897. 2022-08-29 13:26:58 +08:00
xieqiyu c3ba9e70ae * Fix bug#26897. 2022-08-29 13:26:11 +08:00
zenggang 494474d349 * Fix sprint231 bugs 2022-08-26 05:10:26 +00:00
王怡栋 f0aa2a0111 Merge branch 'master' into 'sprint/231_zg_issues'
# Conflicts:
#   module/story/lang/zh-cn.php
2022-08-26 01:35:56 +00:00
王怡栋 7b8333da4e Merge branch 'master_xieqiyu_26878' into 'master'
* Fix bug#26878.

See merge request easycorp/zentaopms!5123
2022-08-26 01:21:00 +00:00
xieqiyu 2753d2d60b * Fix bug#26897. 2022-08-26 08:56:49 +08:00
liumengyi 769e701d7c * Fix bug #26784. 2022-08-25 16:13:50 +08:00
zenggang bf24ce64fd * Fix sprint/231 issues 2022-08-25 07:49:02 +00:00
zenggang 73c8091a82 * Finish task#65782,65779 2022-08-24 03:24:03 +00:00
曾刚 caed6b27cd Fix bug#26664 2022-08-19 05:10:19 +00:00
曾刚 3172961404 Sprint/228 zg tasks and units 2022-08-18 07:15:14 +00:00
tianshujie f9e9d52fdc * Finish task #63687. 2022-08-17 09:16:15 +08:00
tianshujie 6bd27a7aeb * Finish task #63687. 2022-08-15 19:33:12 +08:00
tianshujie 4cc14dfe59 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/224_tianshujie_63687 2022-08-11 11:04:58 +08:00
tianshujie e6685db2a8 * Finish task #63687. 2022-08-10 09:25:57 +08:00
tianshujie 1838710b42 * Finish task #63696,63695,63687. 2022-08-10 09:02:49 +08:00
daitingting 088a414920 * Finish task #63896. 2022-08-09 09:21:43 +00:00
wangyuting2 84c6278274 * Finish task #63288. 2022-08-03 13:32:41 +08:00
王怡栋 5ec5c071f3 Merge branch 'sprint/220_tianshujie_fixbug' into 'master'
Sprint/220 tianshujie fixbug

See merge request easycorp/zentaopms!4707
2022-07-28 05:47:21 +00:00
王怡栋 378fb33899 Merge branch 'sprint/xuanxuan_112' into 'master'
Sprint/xuanxuan 112

See merge request easycorp/zentaopms!4687
2022-07-27 08:59:23 +00:00
tianshujie fd1868a287 * Fix bug #25465. 2022-07-27 16:22:07 +08:00
xieqiyu 94c72b04e1 * Fix bug#25708. 2022-07-27 08:29:42 +08:00
zhouxudong cf6845878f * Fix bug. 2022-07-26 02:21:28 +00:00
chaideqing 3fc3cf64e0 * remove zentao card's top-right button 2022-07-26 09:12:42 +08:00
王怡栋 7e682c99c2 Merge branch 'sprint/xuanxuan_110' into 'master'
Sprint/xuanxuan 110

See merge request easycorp/zentaopms!4563
2022-07-15 03:17:39 +00:00
guofeilong dafb0452d3 * Fix bug #23351 2022-07-14 05:50:28 +00:00
guofeilong 618d44374a Fix bug #23351 in bug and task batchcreate 2022-07-14 05:37:00 +00:00
chaideqing 69f20c1205 * replace xhtml to html when click card 2022-07-13 10:54:12 +08:00
wangyidong bb0fdc74c9 * code for bug #24927. 2022-07-08 17:35:06 +08:00
tianshujie 3213065954 * Fix bug #24802. 2022-07-08 13:05:07 +08:00
tianshujie be1ca95624 * Fix bug #24977. 2022-07-08 08:15:42 +08:00
tianshujie 5ccd62ea84 * Merge insensitive refresh custom forms into one method. 2022-07-07 10:44:29 +08:00
tianshujie dc7e0ec546 * Put the functions that add and remove elements in my.full.js. 2022-07-06 16:37:10 +08:00
王怡栋 f25fcc1eb2 Merge branch 'master' into 'sprint/211_tianshujie_58557'
# Conflicts:
#   module/testcase/css/create.css
2022-07-06 06:47:25 +00:00
zhouxudong 1e1ce39096 * Fix bug #24736 #24738 #24745 #24748 #24844 #24849. 2022-07-06 06:18:09 +00:00
王怡栋 29bed0101b Merge branch 'sprint/master_zhouxudong_59525' into 'master'
Sprint/master zhouxudong 59525

See merge request easycorp/zentaopms!4365
2022-07-06 02:17:24 +00:00
zhouxudong bf19599c0e * Finish task #59525. 2022-07-06 02:15:33 +00:00
tianshujie 577b42f32c * Hide required fields in custom forms. 2022-07-06 08:41:20 +08:00
zhouxudong ddecdf5cb8 * Finish task #59525. 2022-07-06 00:31:05 +00:00
tianshujie cdaf164f0a * Fix bug #24752,24747. 2022-07-06 08:26:27 +08:00
王怡栋 bc00e9f66c Merge branch 'sprint/211_tianshujie_59475' into 'master'
Sprint/211 tianshujie 59475

See merge request easycorp/zentaopms!4353
2022-07-05 08:30:47 +00:00
tianshujie 987421cc77 * Finish task #59475. 2022-07-05 15:44:09 +08:00
王怡栋 1ab6ed7a95 Merge branch 'sprint/master_zhouxudong_59522' into 'master'
* Finish task #59518 #59522.

See merge request easycorp/zentaopms!4350
2022-07-05 07:36:15 +00:00
zhouxudong b9ee65ddfd * Fix bug #24751. 2022-07-05 06:54:04 +00:00
tianshujie 4c4e67f7e8 * Finish task #59475. 2022-07-05 14:08:00 +08:00
zhouxudong 60ddcc7894 * Finish task #59518 #59522. 2022-07-05 05:49:04 +00:00
王怡栋 a6916a73c5 Merge branch 'sprint/master_zhouxudong_59527' into 'master'
Sprint/master zhouxudong 59527

See merge request easycorp/zentaopms!4326
2022-07-05 02:07:26 +00:00