Commit Graph
26242 Commits
Author SHA1 Message Date
hufangzhou 57bf580fa5 * Finish task #40835. 2021-08-03 09:30:05 +08:00
hufangzhou ae24ad59a1 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-08-03 09:25:02 +08:00
hufangzhou 49aa90f84c * Finish task #40816. 2021-08-03 09:24:58 +08:00
holan20180123 4e578bf78f * Finish task #40819. 2021-08-03 09:23:24 +08:00
hufangzhou ace9f69bba Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-08-03 09:21:32 +08:00
hufangzhou 8940b75637 * Finish task #40848. 2021-08-03 09:21:27 +08:00
tianshujie98 9e99084add * Finish task #40839. 2021-08-03 09:20:50 +08:00
holan20180123 1d51ae04a6 * Finish task #40824. 2021-08-03 09:18:03 +08:00
tianshujie98 9f04b9540d * Finish task #40840. 2021-08-03 09:16:24 +08:00
tianshujie98 02a4add87c Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-08-03 09:13:53 +08:00
tianshujie98 b3e9198bd9 * Finish task #40853. 2021-08-03 09:13:32 +08:00
hufangzhou 0580d76434 * Finish task #40856. 2021-08-03 09:13:27 +08:00
qiyu-xie 4492bb2f0c * Finish task#40852. 2021-08-03 09:10:37 +08:00
tianshujie98 d47b7efdcb * Finish task #40857. 2021-08-03 09:08:27 +08:00
tianshujie98 44081d1fba * Resolved issue #373. 2021-08-03 09:06:27 +08:00
qiyu-xie e7cbc05a1e * Finish task#40855. 2021-08-03 09:04:44 +08:00
tianshujie98 612c6d9aee * Resolved issue #372. 2021-08-03 09:02:54 +08:00
tianshujie98 133eac3fb6 * Resolved issue #368. 2021-08-03 08:57:44 +08:00
qiyu-xie 3574dd2f00 * Finish task#40851. 2021-08-03 08:54:04 +08:00
holan20180123 559c1679b5 Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms 2021-08-03 08:28:23 +08:00
holan20180123 6424ffd442 * Adjust review code. 2021-08-03 08:27:48 +08:00
tianshujie98 c319f176c0 * Code modified when submitting code review. 2021-08-03 08:15:12 +08:00
Hao Sun b6dbfeaedb * bug #13993, fix z-index for dropmenu of chosen. 2021-08-02 17:35:43 +08:00
wangyidong 7f6170c77e Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-08-02 16:59:33 +08:00
wangyidong 7b0a8a5bb0 * fix bug for loadModel. 2021-08-02 16:59:14 +08:00
qiyu-xie 4bfe1e413a * Delete empty line. 2021-08-02 16:51:24 +08:00
dingguodong 9cc4e07ee0 * Correct wrong codes for checkCompileStatus func. 2021-08-02 16:42:45 +08:00
dingguodong f7ac8b9678 * Change order when creating repo, choose gitlab first. 2021-08-02 16:33:41 +08:00
wangyidong 46b576255c Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-08-02 16:31:51 +08:00
wangyidong bbe793a8aa Merge branch '15.2' 2021-08-02 16:31:42 +08:00
dingguodong 6b73cfc0bc * Optimize back button. 2021-08-02 16:28:15 +08:00
dingguodong 7b8d9695ce * Reformat codes for syncGitlabTaskStatus after code review. 2021-08-02 16:26:18 +08:00
dingguodong 867b7a5612 * Correct wrong variable when editing a job. 2021-08-02 16:24:11 +08:00
wangyidong 4dd58196d7 * adjust for upgrade. 2021-08-02 16:02:10 +08:00
Guan Xiying 111758fa4f * Add document ready. 2021-08-02 14:32:59 +08:00
wangyidong 545d611d56 - delete null row. 2021-08-02 14:31:59 +08:00
qiyu-xie 8856ad6cc4 * Modify create project and program button style. 2021-08-02 14:31:30 +08:00
wangyidong 0f231bbf80 * adjust for change subStatus when finish task by effort. 2021-08-02 13:47:28 +08:00
holan20180123 c43c53d1b6 * Adjust review codes. 2021-08-02 13:42:02 +08:00
wangyidong 89b439d1da Merge branch '15.2' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.2 2021-08-02 13:12:47 +08:00
wangyidong 7f9e7623e1 * add api in build. 2021-08-02 13:12:27 +08:00
holan20180123 222997d166 * Fix bug #13823. 2021-08-02 09:14:55 +08:00
tianshujie98 6cf5b67feb * Add format judgment to the exchange rate. 2021-08-02 09:01:11 +08:00
holan20180123 4ac9ca105d * Fix bug #13909. 2021-08-02 08:30:02 +08:00
holan20180123 f313706851 Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms 2021-08-02 08:02:14 +08:00
holan20180123 6dab95a734 * Adjust review codes. 2021-08-02 08:01:59 +08:00
qiyu-xie eaffdc7a50 * Fix bug#13816. 2021-08-01 14:40:54 +08:00
qiyu-xie 7e85b9f2e3 * Fix bug#13966,#13965. 2021-08-01 14:18:08 +08:00
tianshujie98 5550d0009a * Adjust project card style. 2021-08-01 12:05:38 +08:00
qiyu-xie e8b6b2d68b * Fix bug#13960. 2021-08-01 10:50:25 +08:00