Commit Graph
17708 Commits
Author SHA1 Message Date
chenfei b2f7a2ee17 * Finish task #7401. 2020-07-20 11:23:04 +08:00
holan20180123 bb1d677e25 Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-07-20 10:39:59 +08:00
holan20180123 edfe4ccd97 * Finish task #7433. 2020-07-20 10:39:29 +08:00
Catouse 61105ba53d * update zenicons. 2020-07-20 10:24:17 +08:00
leiyong e6f5d6883f Merge branch 'master' of github.com:easysoft/zentaopms 2020-07-19 19:19:08 -07:00
leiyong e0967b579f * Finish task#7376. 2020-07-19 19:18:02 -07:00
leiyong dcf45911d0 * Finish task#7376. 2020-07-19 18:42:54 -07:00
leiyong 2dbbe8ab36 * Finish task#7481. 2020-07-19 18:14:00 -07:00
chenfei 5819bb69b8 * Finish task for dayup: http://vision.5upm.com/task-view-408.html 2020-07-18 20:08:18 +08:00
holan20180123 3cba60eb57 Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-07-17 17:19:47 +08:00
holan20180123 f574524f3f * Finish task #7407. 2020-07-17 17:19:12 +08:00
chenfei 7768b040d4 * Finish task #7383. 2020-07-17 16:39:49 +08:00
leiyong 9ebffe1e6e * Fix jenkins bug. 2020-07-17 00:08:24 -07:00
sgm0422 2455413bba * Finish task #7485. 2020-07-17 09:21:47 +08:00
sgm0422 8a4d7f9899 Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-07-17 09:06:23 +08:00
sgm0422 3b33a3cb1f * Fix my setMenu bug. 2020-07-17 09:05:21 +08:00
tianshujie98 a1db9d97bf Merge branch 'master' of github.com:easysoft/zentaopms 2020-07-17 09:00:05 +08:00
tianshujie98 a9dcdea00d * Finish task #7472. 2020-07-17 08:58:18 +08:00
leiyong 054ee87fa8 * Fix jenkins exec。 2020-07-16 17:17:36 -07:00
holan20180123 4cb09a3c0d Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-07-16 17:35:39 +08:00
holan20180123 0979eaa590 * Finish task #7475. 2020-07-16 17:34:57 +08:00
sgm0422 c0f4c4108b Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-07-16 17:29:45 +08:00
sgm0422 75837176a3 * Finish task #7139. 2020-07-16 17:29:29 +08:00
chenfei dd3486e6d4 Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-07-16 16:28:47 +08:00
chenfei 85ae968b10 * Finish task #7478. 2020-07-16 16:28:21 +08:00
leiyong fb97666ab2 * Finish task #7378. 2020-07-16 00:48:54 -07:00
leiyong 59d6baede0 * Fix jenkins password cannot contain @. 2020-07-16 14:37:21 +08:00
sgm0422 3faf6b391c * Finish task #7467. 2020-07-16 14:31:00 +08:00
sgm0422 c2f3115c4e Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-07-16 14:12:46 +08:00
sgm0422 c4356f0eaa * Finish task #7466. 2020-07-16 14:11:22 +08:00
holan20180123 fff031bfbb Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-07-16 13:07:58 +08:00
holan20180123 d0a458160f * Finish #7471. 2020-07-16 13:07:23 +08:00
holan20180123 fdc44afd2f * Finish task #7471. 2020-07-16 13:05:53 +08:00
sgm0422 c36872e009 * Fix webhook bug. 2020-07-16 10:46:16 +08:00
sgm0422 5b91986b45 * Finish task #7461. 2020-07-16 10:19:57 +08:00
sgm0422 54097d246d * Finish task #7460. 2020-07-16 09:58:00 +08:00
sgm0422 2fd9dd2290 Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-07-16 09:03:07 +08:00
sgm0422 5b6f1a03e9 * Finish task #7458. 2020-07-16 09:02:58 +08:00
z b2033343b1 Merge branch 'master' of github.com:easysoft/zentaopms 2020-07-15 17:32:26 +08:00
z 1096a6678d * adjust for flow. 2020-07-15 17:31:48 +08:00
sgm0422 725a550aff * Finish task #7428. 2020-07-15 15:06:22 +08:00
sgm0422 4cc4be08e4 * Fix doc view style. 2020-07-15 14:41:48 +08:00
Catouse f682affa25 * fix bug #3059, finish task #7423, fix active require field not work sometimes. 2020-07-15 13:53:10 +08:00
chenfei 9f7cabbed7 * Finish task #7418. 2020-07-15 13:10:13 +08:00
leiyong 936de54183 * Fix bug. 2020-07-14 20:14:24 -07:00
tianshujie98 37f057475d * Finish task #7439,7447. 2020-07-15 10:12:15 +08:00
leiyong f33f5a87ba Merge branch 'master' of github.com:easysoft/zentaopms 2020-07-14 18:56:50 -07:00
leiyong cde7386405 * Adjust style. 2020-07-14 18:55:52 -07:00
sgm0422 64a6053c7e Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-07-15 09:49:32 +08:00
sgm0422 8ae367c73f * Finish task #7368. 2020-07-15 09:49:20 +08:00