Commit Graph

718 Commits

Author SHA1 Message Date
xieqiyu
05fdbfd0d3 * Fix bug#20257. 2022-03-02 16:49:23 +08:00
zhengrunyu
b641170d85 * Fix bug 19941 19923 19922 19787. 2022-02-25 11:01:31 +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
zhujinyong
b17c3c8206 * Move die to return print. 2022-02-22 08:42:32 +08:00
zhengrunyu
0805d25735 * Finish task 49283. 2022-02-21 10:47:27 +08:00
hufangzhou
64f8980289 * Fix bug #19506. 2022-02-14 13:57:52 +08:00
xieqiyu
11a69d6206 * Adjust classic mode. 2022-01-26 09:47:01 +08:00
xieqiyu
03936d7b29 * Modify product plan view problem. 2022-01-25 16:27:51 +08:00
xieqiyu
895d345775 * Code for task#47991. 2022-01-24 09:59:49 +08:00
zhouxudong
0b86002428 *Fix bug #17257. 2022-01-13 10:39:56 +08:00
mayue
b94fc62ca1 * Fix a bug #17581. 2021-12-23 13:16:30 +08:00
songchenxuan
c0e1f91e9a *Finish task #46100. 2021-12-23 09:29:34 +08:00
朱金勇
efdadc07a7 Merge branch 'sprint/176_mayue_45544' into 'master'
* Finish a task #45544.

See merge request easycorp/zentaopms!928
2021-12-14 05:34:42 +00:00
mayue
35a7df0974 * Optimize code. 2021-12-14 11:02:15 +08:00
mayue
ccf82f6226 * Modify annotation. 2021-12-14 10:18:35 +08:00
mayue
77d36b7467 * Finish a task #45544. 2021-12-14 09:49:46 +08:00
xieqiyu
e13665ecfb * Fix bug: edit build error. 2021-12-09 11:18:10 +08:00
mayue
99e725ef37 * Finish task #45544. 2021-12-08 13:25:50 +08:00
hufangzhou
d876550d96 * Add the traditional Chinese language item. 2021-12-07 09:22:58 +08:00
tianshujie
6507be61d8 * Fix bug #17108. 2021-12-06 09:20:22 +08:00
xieqiyu
a944ec7ccd * Fix bug#17075. 2021-12-03 14:46:12 +08:00
李玉春
befdfa2eb4 Merge branch 'sprint/174_tianshujie_16927' into 'master'
* Fix bug #16927.

See merge request easycorp/zentaopms!730
2021-12-02 07:39:36 +00:00
tianshujie
895db10fc4 * Delete redundant judgments. 2021-12-02 15:23:45 +08:00
tianshujie
2f962aafcf * Remove useless code. 2021-12-02 11:05:38 +08:00
tianshujie
4ac099088e * Fix bug #16927. 2021-12-02 11:01:06 +08:00
tianshujie
ee60476724 * Fix bug #16925. 2021-12-02 10:19:21 +08:00
songchenxuan
cb00625795 * Finish task #45040. 2021-12-01 08:45:25 +08:00
孙广明
5ad303eca9 Merge branch 'sprint/174_xieqiyu_45080' into 'master'
Sprint/174 xieqiyu 45080

See merge request easycorp/zentaopms!644
2021-11-29 06:58:17 +00:00
xieqiyu
93ae2728f9 * Code for task#45082. 2021-11-29 14:03:32 +08:00
xieqiyu
763ae6ea87 * Code for task#45082. 2021-11-28 19:54:47 +08:00
王怡栋
c15bf759b9 * code for task #44937. 2021-11-26 10:40:54 +08:00
王怡栋
9a80f35962 Merge branch 'sprint/app10' 2021-11-25 10:25:05 +08:00
xieqiyu
c82113ab84 * Modify the drop-down range of versions when submitting tests. 2021-11-21 11:33:43 +08:00
xieqiyu
13a0788f37 * Fix bug#16435. 2021-11-21 02:06:38 +08:00
xieqiyu
1fe78e5771 * Fix bug#16489. 2021-11-21 00:55:33 +08:00
孙广明
8ffbccc050 Merge branch 'sprint/170_songchenxuan_16411' into 'sprint/170'
* Fix bug 16411.

See merge request easycorp/zentaopms!546
2021-11-19 02:36:47 +00:00
songchenxuan
0a351a6280 * Fix bug 16411. 2021-11-19 10:32:37 +08:00
songchenxuan
029c0e4dca * Fix bug 16411 2021-11-19 10:20:58 +08:00
songchenxuan
71a2ba3f3d * Fix bug 16411. 2021-11-19 10:11:37 +08:00
孙广明
08496ebe70 Merge branch 'sprint/170_zhengrunyu_BUG_16368' into 'sprint/170'
*Finish task #16368.

See merge request easycorp/zentaopms!541
2021-11-19 01:53:45 +00:00
zhengrunyu
b959253bdf *Finish task #16368. 2021-11-19 09:48:57 +08:00
王怡栋
b475712690 * code for task #44322. 2021-11-19 09:41:18 +08:00
李玉春
9143b15390 Merge branch 'sprint/173_xieqiyu_fixbug' into 'sprint/170'
* Fix bug: add loadLang.

See merge request easycorp/zentaopms!537
2021-11-19 00:54:51 +00:00
xieqiyu
8112a6e985 * Fix bug: add loadLang. 2021-11-19 08:45:26 +08:00
李玉春
7c9add376d Merge branch 'sprint/170_songchenxuan_16376' into 'sprint/170'
Sprint/170 songchenxuan 16376

See merge request easycorp/zentaopms!530
2021-11-18 09:20:35 +00:00
李玉春
36e39591be Merge branch 'sprint/173_wangjianhua_44503' into 'sprint/170'
* finish task 44503

See merge request easycorp/zentaopms!516
2021-11-18 09:19:19 +00:00
songchenxuan
f92a67b62a * Fix bug 16376 2021-11-18 17:09:42 +08:00
songchenxuan
1f9f382aa0 * Fix bug 16376 2021-11-18 17:06:44 +08:00
李玉春
644abad1fb Merge branch 'sprint/170_tianshujie_16431' into 'sprint/170'
* Fix bug #16431.

See merge request easycorp/zentaopms!523
2021-11-18 07:37:37 +00:00
tianshujie
662a1960f5 * Fix bug #16431. 2021-11-18 15:35:54 +08:00