Commit Graph
698 Commits
Author SHA1 Message Date
tianshujie e56cac6b7a * Finish task #70015. 2022-09-26 14:57:23 +08:00
曹延义 8eef51bf19 * Fix bug #27856. 2022-09-23 11:22:58 +08:00
tanghucheng 710b11ff0c * Finish task #69001. 2022-09-14 17:16:53 +08:00
wangyidong ee148d3a0e * fix bug #27447. 2022-09-13 15:29:55 +08:00
xieqiyu 8fe84e651f * Modify submit review icon. 2022-09-09 13:23:09 +08:00
xieqiyu 052556f908 * Fix bug#27354. 2022-09-08 11:28:18 +08:00
xieqiyu 6768c63f62 * Fix bug. 2022-09-01 12:15:09 +08:00
王怡栋 58c0d43da5 Merge branch 'master_xieqiyu_66955' into 'master'
Master xieqiyu 66955

See merge request easycorp/zentaopms!5219
2022-09-01 03:05:12 +00:00
xieqiyu 0d321210c5 * Code for task#66954. 2022-08-31 20:05:42 +08:00
mayue c1c4a8349b * Optimize code. 2022-08-31 17:10:08 +08:00
mayue 8d7cc56826 * Fix bug #27112. 2022-08-31 17:03:08 +08:00
xieqiyu 0cd8ce30cd * Finish task#66954,#66960,#66959,#66958,#66956. 2022-08-31 12:35:45 +08:00
tanghucheng 8514669f10 * Fix bug #26996. 2022-08-29 15:15:57 +08:00
王怡栋 5580dd55d9 Merge branch 'master_liuhong' into 'master'
*Fix bug

See merge request easycorp/zentaopms!5122
2022-08-26 02:10:06 +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 01956d14b3 * Fix bug#26878. 2022-08-26 08:08:16 +08:00
liuhong d1576572ff *Fix bug 2022-08-25 06:49:05 +00:00
xieqiyu 6245e04233 * Fix bug#26870. 2022-08-25 14:45:02 +08:00
xieqiyu 14ce3c97f9 * Fix bug#26804,26797. 2022-08-24 22:43:27 +08:00
xieqiyu 99e4534f38 Merge branch 'master' into master_xieqiyu_draftStory 2022-08-22 17:29:21 +08:00
王怡栋 4446295fd7 Merge branch 'sprint_liuhong' into 'master'
Sprint liuhong

See merge request easycorp/zentaopms!5040
2022-08-22 01:31:06 +00:00
liuhong 650d491c44 *Fix bug 2022-08-19 08:30:20 +00:00
liuhong e863a2c792 *Fix bug 64879. 2022-08-19 05:30:24 +00:00
王怡栋 e8654f20a9 Merge branch 'master' into 'sprint/zentaomax42'
# Conflicts:
#   db/update17.5.sql
2022-08-19 02:34:50 +00:00
lanzongjun 039d4a4e19 * fix bug #23932 2022-08-19 09:23:18 +08:00
liuhong 06e7729212 *Fix bug 2022-08-19 00:47:06 +00:00
liuhong 3fcef9c093 *Finish task #64879. 2022-08-18 02:51:35 +00:00
tanghucheng ca66cb5d7f * Finish task #64938. 2022-08-17 21:46:02 +08:00
tanghucheng eaaf6e7498 * Update lang for lite. 2022-08-16 14:00:50 +08:00
tanghucheng 68f35f5262 * Fix bug #26520,26520. 2022-08-16 13:58:19 +08:00
tanghucheng d3314f22aa * Fix bug #26256. 2022-08-16 09:28:41 +08:00
tanghucheng c816179a08 * Fix bug #26419,26417. 2022-08-15 12:26:44 +08:00
tanghucheng 087c4a37b1 * Code for lite story export. 2022-08-14 16:16:40 +08:00
xieqiyu 17773dee90 * Code for story of add draft status. 2022-08-12 16:00:00 +08:00
刘刚 d6c7e4e50d Merge branch 'sprint/devplat_31' into 'master'
* Fix bug #22376.

See merge request easycorp/zentaopms!4939
2022-08-12 02:58:15 +00:00
孙广明 77b27f5eb3 Merge branch 'lyk_fixbug' into 'master'
* Fix bug of the view of admin in lite

See merge request easycorp/zentaopms!4929
2022-08-12 00:14:12 +00:00
tanghucheng 81f8cdcd6d * Fix bug #26336. 2022-08-11 16:55:30 +08:00
liugang c1f71409f8 * Fix bug #22376. 2022-08-11 16:49:59 +08:00
liuyongkai fe65aba0de * Fix bug of the view of admin in lite 2022-08-11 06:41:57 +00:00
孙广明 fe0f69fc77 Merge branch 'lyk_64217' into 'master'
* Finish task #64217

See merge request easycorp/zentaopms!4844
2022-08-08 08:59:22 +00:00
王怡栋 7f6e2709d2 Merge branch 'master_xieqiyu_26113' into 'master'
* Fix bug#26113.

See merge request easycorp/zentaopms!4831
2022-08-08 08:45:32 +00:00
liuyongkai da82407e9d * Finish task #64217 2022-08-08 08:37:53 +00:00
tanghucheng 3ad6700786 * Fix bug #26111. 2022-08-08 11:59:27 +08:00
xieqiyu 03528bdfc9 * Fix bug#26113. 2022-08-08 10:10:12 +08:00
chaideqing 3fc3cf64e0 * remove zentao card's top-right button 2022-07-26 09:12:42 +08:00
王怡栋 70d17e226b Merge branch 'sprint/master_zhouxudong_61442' into 'master'
* Finish task #61442.

See merge request easycorp/zentaopms!4611
2022-07-21 02:04:09 +00:00
zhouxudong a49f1b9961 * Finish task #61442. 2022-07-21 01:38:12 +00:00
zhouxudong 106788fa59 * Finish task #61442. 2022-07-20 06:22:59 +00:00
tianshujie 75ecda8852 * Fix bug #25486. 2022-07-20 14:15:52 +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