Commit Graph
100 Commits
Author SHA1 Message Date
王怡栋 9286434da5 * code for task #45297. 2021-12-01 13:59:25 +08:00
王怡栋 5b00079375 * adjust for get view with tab. 2021-12-01 11:14:29 +08:00
王怡栋 fc591306b5 * code for task #45297. 2021-12-01 09:17:20 +08:00
王怡栋 b3cb90e69e * replace processMarkdown method. 2021-11-30 09:58:11 +08:00
王怡栋 ef2385a150 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-11-30 09:38:44 +08:00
王怡栋 85d498c5cb * replace lib for markdown to html. 2021-11-30 09:38:12 +08:00
王怡栋 9b6c38f289 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-11-29 16:45:26 +08:00
王怡栋 3c490f50c7 * adjust for ping. 2021-11-29 16:45:10 +08:00
王怡栋 3050ba859d * add ping for api. 2021-11-29 15:49:26 +08:00
王怡栋 98ab035758 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-11-29 15:29:26 +08:00
王怡栋 21e42772b2 * add lang for api. 2021-11-29 15:29:00 +08:00
王怡栋 ae346dd200 * adjust for set api version. 2021-11-29 14:06:00 +08:00
王怡栋 92eabf46ab Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-11-29 13:38:54 +08:00
王怡栋 029870ccdb * adjust for task team hour. 2021-11-29 13:38:32 +08:00
王怡栋 584ef7aa49 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-11-29 13:07:03 +08:00
王怡栋 8fc78ccd45 * adjust for api. 2021-11-29 13:06:47 +08:00
王怡栋 03f1dd727e * code for task #45184 and adjust api. 2021-11-26 14:18:28 +08:00
王怡栋 d41d6cf262 * adjust for api. 2021-11-26 13:28:45 +08:00
王怡栋 294317ccfe * fix bug for product api. 2021-11-26 11:30:37 +08:00
王怡栋 9b8eea30d9 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-11-26 11:26:48 +08:00
王怡栋 1ac64ab4c1 * code for task #44939. 2021-11-26 11:26:27 +08:00
王怡栋 c15bf759b9 * code for task #44937. 2021-11-26 10:40:54 +08:00
王怡栋 e2503a001c * fix for task view. 2021-11-26 10:19:11 +08:00
王怡栋 73e0f4eaa6 * add bug action fo api. 2021-11-26 09:42:48 +08:00
王怡栋 8b1b0b0da8 * code for task #44955,44954,44953,44952,44951. 2021-11-26 09:37:26 +08:00
王怡栋 2ada8ead0b * code for task #44946. 2021-11-26 09:31:38 +08:00
王怡栋 da513cfd6d * adjust for task #44947. 2021-11-26 08:58:38 +08:00
王怡栋 d188b403d5 * code for task #44958. 2021-11-25 17:28:04 +08:00
王怡栋 01e9096140 * code for task #44946. 2021-11-25 17:00:24 +08:00
王怡栋 396c57f0cb Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-11-25 16:37:46 +08:00
王怡栋 ceded29b95 * code for task #44947,44948,44949,44950,44956. 2021-11-25 16:20:41 +08:00
王怡栋 bcc8081925 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-11-25 14:23:40 +08:00
王怡栋 39327b4b8f * code for task #44940,44941,44942,44943,44944,44945. 2021-11-25 14:22:26 +08:00
王怡栋 385cb41a0e * code for task #44938. 2021-11-25 11:35:46 +08:00
王怡栋 9a80f35962 Merge branch 'sprint/app10' 2021-11-25 10:25:05 +08:00
王怡栋 fb8ff15c2a Merge branch 'sprint/170_package_bug' 2021-11-25 08:34:16 +08:00
王怡栋 d589065650 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-11-25 08:34:08 +08:00
王怡栋 d9ee0bfbf7 Merge branch 'master' into 'sprint/170_package_bug'
# Conflicts:
#   module/mr/model.php
2021-11-25 00:32:52 +00:00
王怡栋 eec4c536f5 Merge branch 'sprint/170' into 'master'
Sprint/170

See merge request easycorp/zentaopms!611
2021-11-25 00:31:51 +00:00
王怡栋 57c6ae78a8 * adjust for search. 2021-11-24 14:24:35 +08:00
王怡栋 11e5d04bf7 * fix bug #16439. 2021-11-23 13:47:12 +08:00
王怡栋 c7d94a770e * add lang for mobile api. 2021-11-23 11:21:02 +08:00
王怡栋 4f50602fda * adjust for progress. 2021-11-23 11:05:00 +08:00
王怡栋 043850220e * adjust for progress. 2021-11-23 10:42:07 +08:00
王怡栋 74a41448dc * add lang for mobile api. 2021-11-23 09:35:16 +08:00
王怡栋 90a913ca4b Merge branch 'sprint/170' 2021-11-22 16:59:40 +08:00
王怡栋 b0b410cb91 Merge branch 'sprint/173_xieqiyu_16548' into 'sprint/170'
* Fix bug#16548.

See merge request easycorp/zentaopms!596
2021-11-22 08:54:19 +00:00
王怡栋 c5c2a9f34a Merge branch 'sprint/170_hufangzhou_package' into 'sprint/170'
* Add the new version.

See merge request easycorp/zentaopms!595
2021-11-22 08:53:38 +00:00
王怡栋 827a5a6529 Merge branch 'sprint/173_xieqiyu_16545' into 'sprint/170'
* Fix bug#16545.

See merge request easycorp/zentaopms!592
2021-11-22 08:19:27 +00:00
王怡栋 b5cc969e0a Merge branch 'sprint/170_zhouxin_16468' into 'sprint/170'
Fix bug 16468.

See merge request easycorp/zentaopms!585
2021-11-22 08:17:09 +00:00
王怡栋 6b32de5910 Merge branch 'sprint/168_qixinzhi_44632' into 'sprint/168'
* fix scroll bar css invalid after merge

See merge request easycorp/zentaopms!582
2021-11-22 08:15:47 +00:00
王怡栋 3d4cff75f7 Merge branch 'sprint/173_xieqiyu_fixbug' into 'sprint/170'
* Fix bug#16542.

See merge request easycorp/zentaopms!590
2021-11-22 08:11:43 +00:00
王怡栋 a452521323 Merge branch 'sprint/170_tianshujie_16541' into 'sprint/170'
* Fix bug #16541.

See merge request easycorp/zentaopms!591
2021-11-22 08:10:48 +00:00
王怡栋 0e6e41d003 * fix bug for get needconfirm case. 2021-11-22 15:21:43 +08:00
王怡栋 73aa790f64 * remove files lib in api. 2021-11-22 14:45:09 +08:00
王怡栋 4ec1fd0f4c * adjust for merge program children. 2021-11-19 15:56:25 +08:00
王怡栋 c849afe0cd * code for task #44324. 2021-11-19 15:55:13 +08:00
王怡栋 7dbcf304d1 * code for task #44334. 2021-11-19 11:04:30 +08:00
王怡栋 e0f2e88048 * code for task #44323. 2021-11-19 10:34:50 +08:00
王怡栋 4f5308aefa * code for task #44320. 2021-11-19 10:17:59 +08:00
王怡栋 b475712690 * code for task #44322. 2021-11-19 09:41:18 +08:00
王怡栋 5afccaf417 * code for task #44314. 2021-11-19 09:22:02 +08:00
王怡栋 eb63a17885 * code for task #44313. 2021-11-19 09:08:03 +08:00
王怡栋 fde5cb61da Merge branch 'sprint/app10' into sprint/170 2021-11-19 08:41:00 +08:00
王怡栋 adc2aa1c9b * code for task #44312. 2021-11-18 17:10:01 +08:00
王怡栋 084dc50d15 * convert to array. 2021-11-18 16:57:21 +08:00
王怡栋 fa3fa5d9ca * fix for program progress. 2021-11-18 16:54:42 +08:00
王怡栋 5dd63cd021 * fix doclibs order and fix loadModule testcase. 2021-11-18 16:31:27 +08:00
王怡栋 27bd5770b1 * code for task #44332. 2021-11-18 16:03:06 +08:00
王怡栋 75b3876193 * adjust for bug changed status. 2021-11-18 15:47:54 +08:00
王怡栋 6df12ce1e9 * fix for bug storyChanged. 2021-11-18 14:41:58 +08:00
王怡栋 26b110b73a * code for task #44331. 2021-11-18 13:45:32 +08:00
王怡栋 15c1ec6c42 * code for task #44330. 2021-11-18 13:16:38 +08:00
王怡栋 3510f6ef63 * code for task #44321. 2021-11-18 11:20:39 +08:00
王怡栋 fc50ece3e2 * code for task #44319. 2021-11-18 08:56:53 +08:00
王怡栋 d4ccff00e3 * fix bug. 2021-11-17 17:13:00 +08:00
王怡栋 0eee3bf282 * code for task #44326. 2021-11-17 16:29:16 +08:00
王怡栋 6f813292f2 * code for task #44318. 2021-11-17 16:19:16 +08:00
王怡栋 f9473570e0 * code for task #44317. 2021-11-17 15:15:18 +08:00
王怡栋 cad1e69298 * finish task #44459. 2021-11-17 14:53:33 +08:00
王怡栋 bcbfdfb8f3 Merge branch 'sprint/172_liyuchun_44367' into sprint/168 2021-11-17 14:41:44 +08:00
王怡栋 b3d6e63430 Merge branch 'sprint/168' into 'sprint/172_liyuchun_44367'
# Conflicts:
#   db/update15.9.sql
2021-11-17 06:38:50 +00:00
王怡栋 c14392a3ac * round for project progress. 2021-11-17 13:31:56 +08:00
王怡栋 3956d6bfd0 * code for task #44310. 2021-11-17 13:00:29 +08:00
王怡栋 03236423ae * code for task #44459. 2021-11-17 11:17:47 +08:00
王怡栋 35cbf3830d * code for task #44309. 2021-11-17 10:36:56 +08:00
王怡栋 7cc9e9f875 * code for task #44308. 2021-11-17 09:59:39 +08:00
王怡栋 217c887499 * code for task #44307. 2021-11-17 09:23:43 +08:00
王怡栋 bc81d745d8 * fix for statistical data. 2021-11-17 09:22:05 +08:00
王怡栋 ba48e8e38f * code for task #43761. 2021-11-16 17:09:15 +08:00
王怡栋 3b4070c2f0 * code for task #44329. 2021-11-16 15:42:53 +08:00
王怡栋 ec558fc04a * code for task #44327. 2021-11-16 15:06:54 +08:00
王怡栋 e9caee64f7 * code for task #44306. 2021-11-16 14:41:36 +08:00
王怡栋 d68ce78a66 * code for task #44325. 2021-11-16 14:40:42 +08:00
王怡栋 41d2fb9a04 * adjust for program list. 2021-11-16 14:38:52 +08:00
王怡栋 77b0b5d61e * code for task #44305. 2021-11-16 09:31:10 +08:00
王怡栋 dff6726c6b * code for task #44305. 2021-11-15 17:11:12 +08:00
王怡栋 86622cc618 * code for task #44304. 2021-11-15 16:24:54 +08:00
王怡栋 6c240f4b38 * code for task #44335. 2021-11-15 16:02:08 +08:00
王怡栋 0c2c05331f * adjust for programs and products api. 2021-11-15 14:56:27 +08:00