Commit Graph
1352 Commits
Author SHA1 Message Date
wangyidong 8de5f93c2b * fix bug #3693. 2020-12-08 09:21:32 +08:00
qiyu-xie 31032dfb66 * Fix bug. 2020-11-20 08:27:36 +08:00
holan20180123 f9995e4362 Merge branch '12.x' of https://github.com/easysoft/zentaopms into 12.x 2020-11-18 11:44:15 +08:00
holan20180123 d1bb42ad3a * Finish task #8376. 2020-11-18 11:34:41 +08:00
tianshujie98 48e4e31a30 * Finish task #8397. 2020-11-18 10:33:34 +08:00
holan20180123 726bbc775b * Finish task #8407. 2020-11-18 09:52:04 +08:00
holan20180123 a34b9be905 * Finish task #8406. 2020-11-17 17:17:38 +08:00
holan20180123 cb8dc1bc3b * Finish task #8389. 2020-11-17 16:11:06 +08:00
holan20180123 4943ce7bbe * Finish task #8387. 2020-11-17 15:25:16 +08:00
tianshujie98 f1423214eb * Finish task #8402. 2020-11-17 15:12:09 +08:00
tianshujie98 bddac7fe2d * Finish task #8404. 2020-11-17 14:59:09 +08:00
tianshujie98 d0c79808c3 * Finish task #8405. 2020-11-17 14:42:50 +08:00
holan20180123 23362073ba * Finish task #8378. 2020-11-17 14:15:32 +08:00
holan20180123 97770dd00f * Finish task #8379. 2020-11-17 13:17:15 +08:00
holan20180123 fd6502b596 * Alignment format. 2020-11-16 11:31:29 +08:00
holan20180123 e9750cfe26 * Finish task #8194. 2020-11-16 11:00:05 +08:00
tianshujie98 c0e6591afe * Adjust code style. 2020-11-16 10:56:02 +08:00
holan20180123 cef356a33b Merge branch '12.x' of https://github.com/easysoft/zentaopms into 12.x 2020-11-15 22:39:48 +08:00
holan20180123 95c2adcdb0 *Finish task #8194. 2020-11-15 22:39:26 +08:00
tianshujie98 7d18efad03 * Adjust code style. 2020-11-13 13:11:39 +08:00
tianshujie98 f08eaf98a1 * Finish task #8203. 2020-11-12 16:50:03 +08:00
holan20180123 3ae9a9189e * Finish task #8194. 2020-11-12 16:25:23 +08:00
holan20180123 4e69741e70 * Finish task #8194. 2020-11-12 14:18:08 +08:00
holan20180123 a7533f722d * Finish task #8194. 2020-11-12 10:09:16 +08:00
holan20180123 547ecde44d * Finish task #8194. 2020-11-11 16:11:27 +08:00
holan20180123 2d0ffc2b4a * Finish task #8194. 2020-11-11 15:40:26 +08:00
holan20180123 15e8463347 * Finish task #8194. 2020-11-11 11:18:08 +08:00
holan20180123 f80458f916 * Finish task #8194. 2020-11-10 14:06:00 +08:00
holan20180123 bff623a7bc * Finish task #8194. 2020-11-10 09:31:52 +08:00
holan20180123 8b1e4808c2 * Finish task #8194. 2020-11-10 08:49:00 +08:00
holan20180123 07d0f7c6d8 Merge branch '12.x' of https://github.com/easysoft/zentaopms into 12.x 2020-11-06 14:01:58 +08:00
holan20180123 09d6f83f85 * Finish task #8194. 2020-11-06 14:01:01 +08:00
tianshujie98 2a4927cfc6 * Adjust code style. 2020-11-06 10:08:46 +08:00
tianshujie98 838a05196d * Adjust code style. 2020-11-06 08:42:48 +08:00
tianshujie98 592a6b6a5c * Finish task #8197. 2020-11-05 13:23:17 +08:00
hufangzhou 0001012632 * Finish task#8156: Optimize the structure of the code. 2020-10-12 16:10:28 +08:00
hufangzhou 1ebc3a9e3f * Finish task#8073: Assign the value to the manage products. 2020-10-10 08:33:20 +08:00
hufangzhou a1d6646276 * Finish bug#3491. 2020-09-28 13:07:46 +08:00
hufangzhou e94b917f66 Merge branch '12.x' of https://github.com/easysoft/zentaopms into 12.x 2020-09-22 09:59:05 +08:00
hufangzhou 8f522653f6 * Add the unit of the horizontal axis of the burn chart. 2020-09-22 09:58:55 +08:00
qiyu-xie bd93c680fa * Change lowercase to uppercase. 2020-09-22 08:52:24 +08:00
z d91c3b1361 Merge branch '12.x' of github.com:easysoft/zentaopms into 12.x 2020-09-21 16:59:14 +08:00
z bcb0e7732c * adjust for low php version. 2020-09-21 16:51:16 +08:00
hufangzhou 7462c9b885 * Finish task#7937. 2020-09-21 09:21:25 +08:00
hufangzhou c189483958 * Finish task#7941. 2020-09-18 15:15:15 +08:00
z 40dbb5b53a * code for task #12372. 2020-09-03 16:32:39 +08:00
z a9df6f3b9c * merge after 12.4.1 changes. 2020-08-31 15:31:55 +08:00
z ad6fdd08dc * fix bug and adjust code. 2020-08-10 11:12:04 +08:00
tianshujie98 fdf70435de Merge branch 'master' of github.com:easysoft/zentaopms 2020-08-07 17:02:37 +08:00
tianshujie98 548b5655b0 Merge branch 'master' of github.com:easysoft/zentaopms 2020-08-05 17:22:22 +08:00