Commit Graph
17667 Commits
Author SHA1 Message Date
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
leiyong bda11a547a * Finish task#7369. 2020-07-14 18:28:02 -07:00
sgm0422 e3c5a1106a Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-07-15 09:24:50 +08:00
sgm0422 66081ad48f * Finish task #7450. 2020-07-15 09:24:33 +08:00
leiyong 7eb1dbe6b6 Merge branch 'master' of github.com:easysoft/zentaopms 2020-07-14 02:03:33 -07:00
leiyong 0dddf6deda * Finish task#7346. 2020-07-14 02:02:13 -07:00
leiyong cdcd17b0fe * Finish task#7346. 2020-07-14 01:59:30 -07:00
holan20180123 974f7ec1d6 Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-07-14 16:56:07 +08:00
holan20180123 cd5959d815 * Finish task #7367. 2020-07-14 16:55:05 +08:00
sgm0422 e5550081e6 Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-07-14 16:23:18 +08:00
holan20180123 bbaf3c038e * Finish task #7406. 2020-07-14 16:23:14 +08:00
sgm0422 bd44c7adf3 * Finish task #7446. 2020-07-14 16:23:04 +08:00
chenfei 41e862d5cb * Finish task #5104. 2020-07-14 16:16:47 +08:00
sgm0422 b96bfde2ac Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-07-14 15:56:54 +08:00
sgm0422 701ec00778 * Finish task #7445. 2020-07-14 15:56:36 +08:00
chenfei 570657d4b4 * Finish task #7389. 2020-07-14 15:51:51 +08:00
sgm0422 eeef483203 Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-07-14 15:35:18 +08:00
sgm0422 5e20ecc24c * Finish task #7434. 2020-07-14 15:35:08 +08:00
tianshujie98 9eb723689b * Finish task #7417. 2020-07-14 15:26:11 +08:00
sgm0422 e13c326e59 Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-07-14 15:19:28 +08:00
sgm0422 d746374d83 * Code for dev api config. 2020-07-14 15:19:11 +08:00
leiyong 022c55445f * Finish task#7377. 2020-07-13 23:11:27 -07:00
chenfei 4475db6ccc * Finish task #7420. 2020-07-14 11:27:15 +08:00
sgm0422 b56977c8ff Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-07-14 11:21:23 +08:00
sgm0422 2e454b1415 * Finish task #7429. 2020-07-14 11:21:12 +08:00
holan20180123 1a04618fd1 * Finish task #7419. 2020-07-14 11:01:47 +08:00
chenfei f1a6575325 * Finish task #7435. 2020-07-14 10:33:23 +08:00
chenfei 8c06f97060 * Finish task #7438. 2020-07-14 09:54:31 +08:00
holan20180123 063005a710 Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-07-14 09:44:44 +08:00
holan20180123 ff7730f4bd * Finish task #7444,7441. 2020-07-14 09:43:36 +08:00
leiyong fbab402495 * Finish task#7371. 2020-07-13 18:25:26 -07:00
z 6dec915311 Merge branch 'master' of github.com:easysoft/zentaopms 2020-07-14 08:13:49 +08:00
sgm0422 37d55f1f36 Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-07-13 16:59:48 +08:00
sgm0422 6e151fa735 * Finish task #7421. 2020-07-13 16:51:53 +08:00
leiyong 6f0b0bfb1a * Finish task#7388. 2020-07-13 01:38:31 -07:00
z a235dd7718 Merge branch 'master' of github.com:easysoft/zentaopms 2020-07-13 16:27:06 +08:00
z a76b09bef2 * adjust code for flow. 2020-07-13 16:21:10 +08:00
z 75fe055826 * finish task #11727. 2020-07-13 16:15:35 +08:00
sgm0422 f88acd63b8 * Finish task #7415. 2020-07-13 16:11:26 +08:00
sgm0422 2307463c80 Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-07-13 16:00:52 +08:00
sgm0422 da13e6b50a * Finish task #7404. 2020-07-13 16:00:32 +08:00
chenfei 1870cbcd09 * Finish task #7395. 2020-07-13 14:59:05 +08:00