Commit Graph

124 Commits

Author SHA1 Message Date
xieqiyu
2468300051 * Fix bug#30968. 2023-02-02 10:06:33 +08:00
孙广明
6d0110a732 Revert "Merge branch 'lyk_ticket_287' into 'master'"
This reverts merge request !6797
2023-01-30 07:40:49 +00:00
liuyongkai
f1030b3c5e * Resolve ticket #287. 2023-01-30 13:27:38 +08:00
wangyuting
6a204a32c0 * Fix bug #29720. 2022-11-15 09:35:10 +00:00
tianshujie
209d2b6d8d * Adjust task list and create task page style. 2022-10-20 13:56:53 +08:00
曹延义
e29deea929 * Modify line width. 2022-10-11 17:03:40 +08:00
tianshujie
ff6c9221cb * Finish task #71904. 2022-10-10 16:14:45 +08:00
tianshujie
9eac41d7e3 * Finish task #71895. 2022-10-10 10:36:39 +08:00
zhouxin
6ff8f6ba41 * Resolve feedback. 2022-09-20 17:24:37 +08:00
xieqiyu
104787503b * Fix bug#27528. 2022-09-19 00:19:56 +00:00
xieqiyu
9dedf90d27 * Fix bug#27276,#27280. 2022-09-06 14:20:39 +08:00
xieqiyu
62e9b5aa44 * Code for task#66955. 2022-09-02 09:44:14 +08:00
王怡栋
e1b02d65f8 Merge branch 'sprint/235_tianshujie_bug' into 'master'
Sprint/235 tianshujie bug

See merge request easycorp/zentaopms!5238
2022-09-01 05:45:30 +00:00
tianshujie
f0ab716d29 * Fix bug #25848. 2022-09-01 13:22:52 +08:00
xieqiyu
d552aa67f9 * Code for task#66955. 2022-09-01 10:47:58 +08:00
xieqiyu
e6bc611d14 * Finish task#66955. 2022-08-31 19:20:02 +08:00
tianshujie
44e31923f7 * Fix bug #26918. 2022-08-26 10:12:12 +08:00
tianshujie
72ef1b0ebd * Refactor the getStats method under the project. 2022-08-15 15:59:42 +08:00
tanghucheng
d71cb4dd67 * Code for port. 2022-08-08 11:07:36 +08:00
tanghucheng
4da40b6021 * Code for task config. 2022-08-02 08:52:47 +08:00
tanghucheng
2eacd5271e * Code for port. 2022-07-25 08:10:22 +08:00
tanghucheng
40fdd61654 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into importExport 2022-07-22 10:53:27 +08:00
tanghucheng
004561024f Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into importExport 2022-07-21 17:37:48 +08:00
liuhong
25a0350108 * Fix bug#24666. 2022-07-21 04:20:57 +00:00
zhouxudong
8e46671c20 * Finish task #61441. 2022-07-20 03:07:38 +00:00
zhouxudong
178ea59c4e * Finish task #61441. 2022-07-20 02:30:19 +00:00
tanghucheng
5fb0364aba * Code for import. 2022-07-13 13:19:52 +08:00
tanghucheng
60e8db1d1f * Code for import. 2022-07-11 17:23:56 +08:00
tanghucheng
e2cb73a383 * Fix initFieldList. 2022-07-07 12:02:48 +08:00
tanghucheng
c7c198453c * Finish simple export. 2022-07-06 16:33:33 +08:00
tanghucheng
b03afaebb3 * Code for export. 2022-07-06 14:35:09 +08:00
leiyong
f888f66bf5 * Finish task#58578. 2022-06-28 09:59:34 +00:00
tianshujie
bee7fe5ae4 * Export tasks Add task mode. 2022-05-27 05:38:05 +08:00
zhouxudong
5c09cedfe9 * Fix bug #22022. 2022-04-27 01:11:34 +00:00
tanghucheng
3d3ffe9348 * Fix bug #21403,21474,21410,21414,21417,21456. 2022-04-07 15:27:54 +08:00
孙华伟
ffa6d43736 *Fix bug#20452 2022-03-14 16:10:35 +08:00
李玉春
9405f7bf71 Merge branch 'sprint/185' into 'sprint/185_zhengrunyu_49283'
# Conflicts:
#   db/update16.4.sql
#   module/user/view/story.html.php
2022-02-23 01:33:37 +00:00
zhangzilong
4e84e5cbd7 * Finish task #49284. 2022-02-17 17:35:11 +08:00
zhengrunyu
aa444513d6 * Finish task 49283. 2022-02-17 16:13:24 +08:00
qiyu-xie
11ac174b15 * Finish task#41766. 2021-08-20 13:12:43 +08:00
dingguodong
9e76157a0c * Put product into removal field and bug fix. 2021-07-08 14:54:18 +08:00
dingguodong
882f7195fd * Keep uniformed style for fixer removal action. 2021-07-08 10:54:23 +08:00
dingguodong
47e3c473a1 * Put strings in long line to config file. 2021-07-07 17:16:06 +08:00
tianshujie98
f06e34b0fa * Fix bug #11913. 2021-04-09 11:06:10 +08:00
holan20180123
f2f7d0669a * Fix bug #11422. 2021-03-26 16:45:46 +08:00
tianshujie98
33bcb0922e * Finish task #36438. 2021-03-09 17:28:23 +08:00
holan20180123
af55b74c4d * Distinguish program/project/execution in story. 2021-03-04 17:27:26 +08:00
Yagami
d03194717d * Remove hourunit. 2021-01-20 15:48:58 +08:00
Yagami
2ce5ef1d5b * Fix story hour detail. 2021-01-18 10:13:46 +08:00
z
5644b81408 Merge branch '12.x' 2020-10-30 16:58:47 +08:00