Commit Graph
1072 Commits
Author SHA1 Message Date
tianshujie 06701aa5a0 * Fix style issues when raising bugs. 2022-03-09 09:34:52 +08:00
孙广明 7b962c4e38 Merge branch 'pailei' 2022-03-07 10:56:26 +08:00
liumengyi 65fc1b9ca9 * Fix bug #20255. 2022-03-04 09:08:54 +08:00
孙广明 6873b1061f Merge branch 'sprint/185_xieqiyu_49304' into 'pailei'
Sprint/185 xieqiyu 49304

See merge request easycorp/zentaopms!2007
2022-03-01 07:04:26 +00:00
xieqiyu 5cd1872e93 * Modify edit bug and batch edit bug. 2022-02-28 17:04:12 +08:00
xieqiyu 9fa66c3d0f * Code for task#49304. 2022-02-24 14:40:14 +08:00
zhengrunyu 0805d25735 * Finish task 49283. 2022-02-21 10:47:27 +08:00
李玉春 2a5b157a7f Merge branch 'sprint/fixbug_zxd_19460' into 'master'
*Fux bug #19460 #19458.

See merge request easycorp/zentaopms!1784
2022-02-14 06:40:59 +00:00
zhouxudong a13a78f7bb *Fux bug #19460 #19458.*Fux bug #19460 #19458.*Fux bug #19460 #19458.*Fux bug #19460 #19458.*Fux bug #19460 #19458.*Fux bug #19460 #19458.*Fux bug #19460 #19458.*Fux bug #19460 #19458. 2022-02-14 13:17:45 +08:00
liyuchun 5583b62fc9 Merge branch 'devops21' 2022-02-14 10:20:11 +08:00
周旭东 a1529b8b5a Update linkbugs.html.php 2022-02-11 08:14:20 +00:00
zhouxudong 0e5f623acc *Finish task #48844. 2022-02-11 16:10:32 +08:00
zhouxudong 8af167a379 *Finish task #48844. 2022-02-11 13:04:08 +08:00
liyuchun e556307ba4 * Finish task #48612. 2022-02-11 08:13:20 +08:00
zhangzilong a4e02734f6 * Code for bug 19255. 2022-02-09 15:03:33 +08:00
zhangzilong ec4003a9a0 * Fix bug #19255. 2022-02-08 15:50:12 +08:00
zhangzilong fb8708557d * Fix bug #19161. 2022-02-08 08:42:16 +08:00
xieqiyu e35fa62b97 * Fix bug: Branch error when click header. 2022-01-18 14:01:46 +08:00
tianshujie 1ee5fb522f * Fix bug #18287. 2022-01-10 12:15:19 +08:00
xieqiyu af54ab16c6 * Fix bug#18242,18241,18240,18239. 2022-01-07 08:35:18 +08:00
孙广明 c8db935f34 Merge branch '180' 2022-01-04 22:41:23 +08:00
songchenxuan 5e7c715efb *Finish task #46519. 2021-12-29 17:42:41 +08:00
liyuchun 2b44879ba2 * Adjust code style. 2021-12-29 10:24:39 +08:00
liyuchun 8e98e9831e * Finish task #46551. 2021-12-29 10:02:25 +08:00
liyuchun 9da21e20f0 * Finish task #46550. 2021-12-28 15:45:09 +08:00
xieqiyu 5ab26fee54 * Finish task#46543. 2021-12-28 13:38:35 +08:00
songchenxuan 1d7882d51f *Finish task #46100. 2021-12-23 10:06:54 +08:00
songchenxuan a7258e471b *Finish task #46100. 2021-12-22 14:28:28 +08:00
朱金勇 d5d4cfe049 Merge branch 'sprint/176_mayue_45544' into 'master'
* Optimize code.

See merge request easycorp/zentaopms!936
2021-12-14 07:43:32 +00:00
mayue 7deea0d588 * Optimize code. 2021-12-14 13:42:54 +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 77d36b7467 * Finish a task #45544. 2021-12-14 09:49:46 +08:00
zhujinyong 45cdfc8f59 Merge branch 'xuan' 2021-12-14 09:08:15 +08:00
朱金勇 5ee11088b8 Merge branch 'sprint/176_songchenxuan_45539' into 'master'
Sprint/176 songchenxuan 45539

See merge request easycorp/zentaopms!870
2021-12-10 06:04:23 +00:00
孙广明 13f162edd2 * Merge 169 untrack file to master. 2021-12-08 11:07:06 +08:00
songchenxuan 3f132af95b *Finish task #45539. 2021-12-07 14:51:23 +08:00
songchenxuan dde57a36cc *Finish task #45539. 2021-12-07 14:03:20 +08:00
chaideqing 9a2148a540 * fix xuanxuan 84's bug 2021-12-07 09:27:40 +08:00
songchenxuan 417c625c84 *Fix bug #17109. 2021-12-06 10:02:17 +08:00
liumengyi cbf1fe21ac * Remove empty lines. 2021-12-02 16:16:03 +08:00
liumengyi 9d7cd3b29e * Fix bug #17031,#17029. 2021-12-02 16:08:17 +08:00
Wenrui LI 24440ff526 * replace link title text with lang items. 2021-12-02 15:30:31 +08:00
Wenrui LI fac5fc6b22 * remove console.log. 2021-12-02 15:22:12 +08:00
chaideqing 57b31c8612 * modify card style when in xuanxuan notice 2021-12-02 14:56:05 +08:00
liyuchun f6301e4c9a Merge branch 'sugon' 2021-12-01 16:48:00 +08:00
chaideqing 45e127be6e * add linkButton tips in card and card do not show cross scroll 2021-12-01 14:59:33 +08:00
liyuchun c8c954a3fd * Fix bug #16911. 2021-12-01 13:53:13 +08:00
chaideqing 17ba1ea184 * add jump-link in xuanxuan_card which can jump to zentao_extension_page 2021-12-01 11:10:22 +08:00
孙广明 c42cca1249 Merge branch 'sprint/168' 2021-11-30 14:38:32 +08:00
chaideqing 74f7a95902 * optimize zentao buglist/storylist/tasklist show when in xuanxuan card 2021-11-29 14:55:14 +08:00