Commit Graph

21593 Commits

Author SHA1 Message Date
holan20180123
bcf4be71d1 Merge branch 'master' of https://git.zcorp.cc/zentaopms 2021-01-19 10:13:23 +08:00
holan20180123
e6a9fec35c * Finish task #9043. 2021-01-19 10:12:59 +08:00
Yagami
2db4bb2c4a * Finish task #9023. 2021-01-19 10:10:47 +08:00
hufangzhou
dd9b052b24 Merge branch 'master' of https://git.zcorp.cc/zentaopms 2021-01-19 09:49:03 +08:00
hufangzhou
a75fa99132 * Adjust the code. 2021-01-19 09:48:58 +08:00
tianshujie98
84e973ac62 Merge branch 'master' of https://git.zcorp.cc/zentaopms 2021-01-19 09:40:09 +08:00
tianshujie98
029c157cc6 * Finish task #9048. 2021-01-19 09:39:53 +08:00
hufangzhou
2d7fd95881 Merge branch 'master' of https://git.zcorp.cc/zentaopms 2021-01-19 08:55:17 +08:00
hufangzhou
bf5ba32e1b * Link the stories of the plans to the project. 2021-01-19 08:54:03 +08:00
Catouse
3e0f61c8ce * add imgcutter files. 2021-01-18 17:30:34 +08:00
Yagami
23f1c4b024 * Code for task #5688. 2021-01-18 17:29:36 +08:00
tianshujie98
f5a19a1f02 * Finish task #9048. 2021-01-18 16:41:22 +08:00
tianshujie98
ff6589a60c * Fix bug. 2021-01-18 16:38:58 +08:00
holan20180123
b846cba424 * Finish task #8988. 2021-01-18 16:27:01 +08:00
Yagami
00cc8ff2c3 * Fix story lang. 2021-01-18 16:15:56 +08:00
hufangzhou
1fdc90b119 Merge branch 'master' of https://git.zcorp.cc/zentaopms 2021-01-18 15:47:48 +08:00
hufangzhou
a060f88a0d * Fix the search form of the story linked project. 2021-01-18 15:47:45 +08:00
qiyu-xie
b0ff295e89 * Remove extra spaces. 2021-01-18 15:32:58 +08:00
tianshujie98
6128f82d16 Merge branch 'master' of https://git.zcorp.cc/zentaopms 2021-01-18 15:09:36 +08:00
tianshujie98
9d8ae60c7b * Finish task #9021. 2021-01-18 15:09:15 +08:00
Catouse
50c8836b97 * add $.tabs.getLastTab method to index. 2021-01-18 15:05:57 +08:00
qiyu-xie
9c8fb2c131 * Finish task#8963.#8962. Fix bug. 2021-01-18 14:59:12 +08:00
holan20180123
fa2c0ff692 Merge branch 'master' of https://git.zcorp.cc/zentaopms 2021-01-18 14:39:44 +08:00
holan20180123
8d77e71634 * Finish task #8957. 2021-01-18 14:39:16 +08:00
Yagami
7a5e58e606 * Add required. 2021-01-18 14:25:04 +08:00
hufangzhou
fdcbb2cf7c Merge branch 'master' of https://git.zcorp.cc/zentaopms 2021-01-18 14:21:55 +08:00
hufangzhou
44f7c95639 * Fix a bug for story view page. 2021-01-18 14:21:52 +08:00
qiyu-xie
9c5cfa592d * Finish task#8963. 2021-01-18 14:18:08 +08:00
hufangzhou
5d72faff48 Merge branch 'master' of https://git.zcorp.cc/zentaopms 2021-01-18 13:26:01 +08:00
hufangzhou
dd341daed7 * Fix the bug of the story filter. 2021-01-18 13:25:58 +08:00
tianshujie98
ebc5eccbed Merge branch 'master' of https://git.zcorp.cc/zentaopms 2021-01-18 13:18:10 +08:00
tianshujie98
e989d459fa * Finish task #9049. 2021-01-18 13:17:54 +08:00
qiyu-xie
08a8b5f2e9 * Finish task#8962. Fix bug. 2021-01-18 13:16:19 +08:00
qiyu-xie
c907c0fad5 * Finish task#8962. 2021-01-18 13:03:24 +08:00
Yagami
999ca1631c * Add icon to program tree. 2021-01-18 11:39:25 +08:00
Yagami
25020888fa * Fix bug. 2021-01-18 11:35:23 +08:00
tianshujie98
8f589d655d Merge branch 'master' of https://git.zcorp.cc/zentaopms 2021-01-18 11:34:19 +08:00
tianshujie98
418039eecf * Finish task #9049. 2021-01-18 11:34:01 +08:00
Yagami
bfe7766a3d * Fix bug. 2021-01-18 11:32:36 +08:00
Yagami
f3d06bde9c * Add hour unit to project all. 2021-01-18 11:12:05 +08:00
Yagami
8faf4a6c40 * Finish task #8972/ 2021-01-18 11:10:07 +08:00
holan20180123
c40e49b3c0 * Finish task #9002. 2021-01-18 10:58:54 +08:00
holan20180123
02228d9f5a * Finish task #8988. 2021-01-18 10:58:18 +08:00
Yagami
dafb68b70c * Code for hour unit. 2021-01-18 10:49:39 +08:00
Yagami
0b7969de49 * Finish task #9014. 2021-01-18 10:38:34 +08:00
Yagami
92a559c37d * Fix story bug. 2021-01-18 10:20:39 +08:00
tianshujie98
8d2aa37fad Merge branch 'master' of https://git.zcorp.cc/zentaopms 2021-01-18 10:17:08 +08:00
tianshujie98
242782e081 * Modify language item. 2021-01-18 10:16:39 +08:00
holan20180123
a5607fbb6b * Finish task #8988. 2021-01-18 10:16:36 +08:00
Yagami
2ce5ef1d5b * Fix story hour detail. 2021-01-18 10:13:46 +08:00