Commit Graph
18126 Commits
Author SHA1 Message Date
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
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
Yagami 2ce5ef1d5b * Fix story hour detail. 2021-01-18 10:13:46 +08:00
tianshujie98 e49e6d834f Merge branch 'master' of https://git.zcorp.cc/zentaopms 2021-01-18 10:11:26 +08:00
tianshujie98 ba5df886e3 * Fix bug. 2021-01-18 10:11:14 +08:00
hufangzhou e9f8ec68f6 Merge branch 'master' of https://git.zcorp.cc/zentaopms 2021-01-18 10:01:12 +08:00
hufangzhou 9019fbbc04 * Fix a bug. 2021-01-18 10:01:08 +08:00
tianshujie98 d6e060a114 * Fix bug. 2021-01-18 09:53:43 +08:00
Yagami 27e8797364 * Finish task #9018. 2021-01-18 09:34:21 +08:00
Yagami 8c6c006680 * Finish task #9011. 2021-01-18 09:19:44 +08:00
hufangzhou aff5fe33c7 * Fix an error. 2021-01-18 09:16:00 +08:00
hufangzhou 1e9474c6f9 Merge branch 'master' of https://git.zcorp.cc/zentaopms 2021-01-18 09:13:04 +08:00
hufangzhou 4966757b9d * Fix a bug. 2021-01-18 09:13:01 +08:00
Yagami 8b90a207c0 * Finish task #9010. 2021-01-18 09:11:40 +08:00
tianshujie98 954ce428e5 Merge branch 'master' of https://git.zcorp.cc/zentaopms 2021-01-18 09:11:26 +08:00
tianshujie98 2f4c8a0efb * Finish task #8968,8967. 2021-01-18 09:10:55 +08:00
Yagami ad1885be6a * Finish task #9020. 2021-01-18 09:04:56 +08:00
hufangzhou a85e679cc9 * Adjust the code. 2021-01-18 08:47:16 +08:00
qiyu-xie cd2c7278b7 * Finish task#9033. 2021-01-15 17:24:26 +08:00
Yagami 269ec964e4 * Fix detail. 2021-01-15 16:56:13 +08:00
Yagami 435194190b * Finish task #8972. 2021-01-15 16:42:11 +08:00
hufangzhou 2d14f0aec4 * Finish task#8956. 2021-01-15 16:41:41 +08:00
Yagami fe95537914 * Fix bug #3780. 2021-01-15 16:22:27 +08:00
Yagami 9d6c2e618a * Finish task #9028. 2021-01-15 15:36:40 +08:00
tianshujie98 554313dfd9 Merge branch 'master' of https://git.zcorp.cc/zentaopms 2021-01-15 15:34:29 +08:00
tianshujie98 e647640432 * Change color. 2021-01-15 15:33:49 +08:00
Yagami e9fe2d96d5 * Finish task #8998. 2021-01-15 15:28:03 +08:00
Yagami 820fb4cffe * Fix menu divider. 2021-01-15 15:20:36 +08:00
holan20180123 c53e9ac526 * Finish task #9002. 2021-01-15 14:28:57 +08:00
holan20180123 c131e1941e * Finish task #8988. 2021-01-15 14:23:16 +08:00
holan20180123 907dfc23d7 * Finish task #8988. 2021-01-15 14:17:46 +08:00