Commit Graph
17118 Commits
Author SHA1 Message Date
wangyidong d8d4cbf890 * finish task #6871. 2020-02-14 10:45:35 +08:00
wangyidong bf705c1f1c * finish task #6872. 2020-02-14 09:29:43 +08:00
wangyidong 24f67c7441 * change for priv. 2020-02-13 17:18:44 +08:00
wangyidong ec536afaa0 * finish task #6859. 2020-02-13 17:07:37 +08:00
wangyidong 3b577dcc98 * finish task #6863. 2020-02-13 16:52:10 +08:00
wangyidong 785a479c5b * finish task #6863. 2020-02-13 16:50:11 +08:00
Catouse e2454a097b * update zui.js. 2020-02-12 11:13:05 +08:00
wangyidong 097e2af3a0 Merge branch 'master' of github.com:easysoft/zentaopms 2020-02-11 15:13:47 +08:00
wangyidong 5d97280b3a * Fix error. 2020-02-11 15:12:58 +08:00
aaronchen2k da7eb8d364 fix issues report when code review 2020-02-11 14:56:25 +08:00
aaronchen2k bad736c081 Merge remote-tracking branch 'origin/master' 2020-02-11 14:48:24 +08:00
aaronchen2k 777d34a30f fix issues report when code review 2020-02-11 14:47:55 +08:00
wangyidong 6a91d77a31 * adjust code. 2020-02-11 12:04:24 +08:00
aaronchen2k b7f1e002c7 Merge remote-tracking branch 'origin/master' 2020-02-11 09:35:46 +08:00
aaronchen2k 8705944e92 fix issues report when code review 2020-02-11 09:35:36 +08:00
wangyidong 1a36b088c6 Merge branch 'master' of github.com:easysoft/zentaopms 2020-02-11 09:26:11 +08:00
wangyidong 3111c7e36b * change for build zentaoxx. 2020-02-11 09:25:38 +08:00
aaronchen2k e0ae913838 fix issues report when code review 2020-02-11 09:03:09 +08:00
aaronchen2k cf2ad7c12d Merge remote-tracking branch 'origin/master' 2020-02-11 08:46:35 +08:00
aaronchen2k ac4248fbe8 fix issues report when code review 2020-02-11 08:46:17 +08:00
aaronchen2k 95b46e92fd update 2020-02-10 15:27:20 +08:00
wangyidong 5b4c2874e8 * fix error. 2020-02-10 15:15:08 +08:00
aaronchen2k 22a510b5fa update 2020-02-10 15:08:52 +08:00
aaronchen2k 77eddecece update 2020-02-10 15:06:52 +08:00
wyd621 457c6dd578 Merge pull request #44 from easysoft/zentaopms_ci_dev
Zentaopms ci dev
2020-02-10 14:41:18 +08:00
wyd621 ac0edaa7b9 Merge branch 'master' into zentaopms_ci_dev 2020-02-10 14:40:44 +08:00
wangyidong 383538685b * fix bug for repo-view. 2020-02-07 14:11:23 +08:00
wangyidong 68b0fa26f3 * marge from master. 2020-02-07 10:58:58 +08:00
wangyidong 00799f1f7b * fix error. 2020-02-07 09:12:41 +08:00
leiyong ab65bcd24f Merge branch 'master' of github.com:easysoft/zentaopms 2020-02-06 14:12:54 +08:00
leiyong 03e06b6e7d Fix bug #2941,#2937. 2020-02-06 14:12:23 +08:00
wangyidong 6560eff7d2 * finish task #9790 for zentaobiz. 2020-02-06 10:59:04 +08:00
wangyidong 92f366b767 * code for task #6849. 2020-02-06 09:01:41 +08:00
wangyidong 12277bda9c Merge branch 'master' of github.com:easysoft/zentaopms 2020-02-05 17:33:58 +08:00
wangyidong 616d01b015 * fix bug. 2020-02-05 17:30:21 +08:00
wangyidong 58f5936bae * finish task #6820. 2020-02-05 17:29:21 +08:00
leiyong 87df6db7ac Merge branch 'master' of github.com:easysoft/zentaopms 2020-02-05 15:55:21 +08:00
leiyong 7a56b4506d Fix bug #2929,#2932,#2943 2020-02-05 15:54:29 +08:00
wangyidong ef1f4483d2 Merge branch 'master' of github.com:easysoft/zentaopms 2020-02-05 15:23:12 +08:00
Catouse cf294a7f10 * task #6807, messager not work. 2020-02-05 14:29:59 +08:00
leiyong 21b04fff1c Merge branch 'master' of github.com:easysoft/zentaopms 2020-02-05 14:23:21 +08:00
leiyong c61f161423 fix bug #2918 and #2922 2020-02-05 14:22:35 +08:00
wangyidong 58685284b8 * finish task #6850. 2020-02-05 13:44:58 +08:00
wangyidong 3a61cc87e8 * finish task #6821. 2020-02-05 11:31:59 +08:00
wangyidong e88f364a0a * finish task #6824. 2020-02-05 11:03:46 +08:00
wangyidong 96adea19b9 * finish task #6837. 2020-02-05 10:57:50 +08:00
wangyidong 4db7034029 * finish task #6849. 2020-02-05 10:06:14 +08:00
aaronchen2k 543ca29c73 ignore to exec jenkins job if not exist 2020-02-04 22:39:50 +08:00
aaronchen2k 038dc34c3b fix a icon bug 2020-02-04 22:24:29 +08:00
aaronchen2k a4081009e8 fix a icon bug 2020-02-04 20:20:30 +08:00