Commit Graph
18517 Commits
Author SHA1 Message Date
z f084b382ae Merge branch '12.x' of github.com:easysoft/zentaopms into 12.x 2020-11-19 09:22:02 +08:00
qiyu-xie 861b5e5d95 * Finish task#8421. 2020-11-18 16:51:13 +08:00
qiyu-xie f0e8bee379 Merge branch '12.x' of https://github.com/easysoft/zentaopms into 12.x 2020-11-18 16:38:18 +08:00
z 025e1e039d * adjust for setting xuanxuan. 2020-11-18 16:37:13 +08:00
qiyu-xie 50561f9777 * Finish task#8421. 2020-11-18 16:30:58 +08:00
holan20180123 378d6245e8 * Finish task #8376. 2020-11-18 15:17:30 +08:00
z 38527c2b20 * remove useless file. 2020-11-18 15:03:56 +08:00
holan20180123 0dc6b48d61 * Finish task #8390. 2020-11-18 14:56:58 +08:00
hufangzhou 903044dc3d Merge branch '12.x' of https://github.com/easysoft/zentaopms into 12.x 2020-11-18 14:55:26 +08:00
hufangzhou 4d4bb33d40 * Adjust the code indentation. 2020-11-18 14:55:17 +08:00
Catouse fac726a53c * fix checkbox and radio position. 2020-11-18 14:38:02 +08:00
holan20180123 557a5d5d62 * Finish task #8387. 2020-11-18 14:04:34 +08:00
qiyu-xie 0def3e0b08 * Finish task#8419. Fix bug. 2020-11-18 14:01:27 +08:00
holan20180123 a55a538270 * Finish task #8390. 2020-11-18 13:52:07 +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 4d38c4985d Merge branch '12.x' of https://github.com/easysoft/zentaopms into 12.x 2020-11-18 09:51:58 +08:00
hufangzhou b26569aa2d * Fix a bug. 2020-11-18 09:47:27 +08:00
hufangzhou db13a97dc1 * Finish task#8417. 2020-11-18 09:20:24 +08:00
hufangzhou 55df1f202b * Finish task#8387. 2020-11-18 09:09:16 +08:00
holan20180123 76296225b4 Merge branch '12.x' of https://github.com/easysoft/zentaopms into 12.x 2020-11-18 09:07:56 +08:00
hufangzhou b611a6fdf0 * Finish task#8401. 2020-11-18 08:52:50 +08:00
holan20180123 48d521f958 * Finish task #8392. 2020-11-17 17:21:58 +08:00
holan20180123 a34b9be905 * Finish task #8406. 2020-11-17 17:17:38 +08:00
z 8b15401fc5 * add HttpOnly for cookie. 2020-11-17 17:07:54 +08:00
z c72e9c7664 * adjust for api-sql. 2020-11-17 17:07:54 +08:00
z e19f5296d7 * fix bug. 2020-11-17 17:07:54 +08:00
qiyu-xie 3d85fc9346 * Finish task#8423. 2020-11-17 16:58:46 +08:00
holan20180123 9e7d7aa91a * Finish task #8388. 2020-11-17 16:39:10 +08:00
holan20180123 3aee933db6 * Finish task #8386. 2020-11-17 16:32:41 +08:00
holan20180123 c8cf8ce440 * Finish task #8382. 2020-11-17 16:28:27 +08:00
holan20180123 aa54b07ab3 Merge branch '12.x' of https://github.com/easysoft/zentaopms into 12.x 2020-11-17 16:25:08 +08:00
qiyu-xie ca7070b2cb * Finish task#8419. 2020-11-17 16:22:15 +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 ffc06ae5ad * Finish task #8403. 2020-11-17 15:04:55 +08:00
tianshujie98 bddac7fe2d * Finish task #8404. 2020-11-17 14:59:09 +08:00
holan20180123 5f299ebe40 * Finish task #8377. 2020-11-17 14:49:24 +08:00
qiyu-xie 15c913d828 * Finish task#8410. 2020-11-17 14:45:52 +08:00
qiyu-xie 7c1f6c88f3 * Finish task#8399. 2020-11-17 14:45:52 +08:00
tianshujie98 b96129db79 * Finish task #8420. 2020-11-17 14:42:50 +08:00
tianshujie98 d0c79808c3 * Finish task #8405. 2020-11-17 14:42:50 +08:00
tianshujie98 ed8dcc38cd * Finish task #8422. 2020-11-17 14:42:50 +08:00
tianshujie98 f08fd31a2e * Finish task #8408. 2020-11-17 14:42:50 +08:00
holan20180123 fc6a6d1988 * Finish task #8391. 2020-11-17 14:40:47 +08:00
holan20180123 78afca3653 * Finish task 8391. 2020-11-17 14:34:48 +08:00
z 30228e2613 Merge branch '12.x' of github.com:easysoft/zentaopms into 12.x 2020-11-17 14:32:06 +08:00