Commit Graph
13314 Commits
Author SHA1 Message Date
滔哥 d3f8dac3d4 * Fix bug. 2018-09-13 11:25:21 +08:00
滔哥 020b26d2d9 * Fix bug. 2018-09-13 09:52:28 +08:00
wangyidong 74f956c522 Merge branch 'master' of github.com:easysoft/zentaopms 2018-09-12 17:13:56 +08:00
wangyidong 24cb0d757e * finish task #4724. 2018-09-12 17:12:58 +08:00
Yagami b9d608d902 * Fix detail-content margin. 2018-09-12 17:09:46 +08:00
Yagami 56f49c64fe Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-09-12 16:58:22 +08:00
Yagami c22696976c * Finish task #4721. 2018-09-12 16:52:42 +08:00
wangyidong 464e8ebadf * code for task #4743. 2018-09-12 16:51:56 +08:00
wangyidong 3c50648d3b * code for task #4701. 2018-09-12 16:51:27 +08:00
wangyidong c2d3aa9662 * code for task #4702. 2018-09-12 16:05:33 +08:00
wangyidong f9c77a1a69 * finish task #4719. 2018-09-12 16:03:43 +08:00
wangyidong bd7e6c0d0f * finish task #4705. 2018-09-12 16:01:05 +08:00
wangyidong 78a5318cae Merge branch 'master' of github.com:easysoft/zentaopms 2018-09-12 15:00:47 +08:00
wangyidong 2d30ee8a97 * finish task #4725. 2018-09-12 15:00:21 +08:00
Yagami 518ac856c9 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-09-12 13:54:29 +08:00
Yagami 976b7770fc * Finish task #4782. 2018-09-12 13:53:08 +08:00
wangyidong 39afe7c3fc * finish task #4743. 2018-09-12 13:34:28 +08:00
wangyidong 8fb91427a5 * finish task #4718. 2018-09-12 13:19:28 +08:00
wangyidong d83493953b * finish task #4698. 2018-09-12 13:10:50 +08:00
wangyidong 60fe102e21 Merge branch 'master' of github.com:easysoft/zentaopms 2018-09-12 13:09:39 +08:00
wangyidong 23023030c0 * finish task #4702. 2018-09-12 13:07:17 +08:00
Catouse c6ce4c9e39 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-09-12 11:38:13 +08:00
Catouse 3558d47333 * fix chosen not focus search input on open drop menu. 2018-09-12 11:38:07 +08:00
wangyidong e934f95c36 Merge branch 'master' of github.com:easysoft/zentaopms 2018-09-12 11:31:23 +08:00
wangyidong 87b9ed502a * fix bug. 2018-09-12 11:31:11 +08:00
Yagami 0742e37f89 * Finish task #4715. 2018-09-12 11:02:40 +08:00
Yagami dcce714fdc Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-09-12 10:41:04 +08:00
Yagami 586a9265ac * Finish task #4713. 2018-09-12 10:40:47 +08:00
wangyidong 4eccc84fbf Merge branch 'master' of github.com:easysoft/zentaopms 2018-09-12 10:25:13 +08:00
wangyidong d82e59ead9 * finish task #4706. 2018-09-12 10:24:12 +08:00
Yagami 451a2f3e41 * Fix common lang. 2018-09-12 09:46:07 +08:00
Yagami 8373b4649d Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-09-12 09:45:03 +08:00
Yagami a6f4cb1227 * Finish task #4694,#4693. 2018-09-12 09:43:11 +08:00
wangyidong c4e473df14 * finish task #4712. 2018-09-12 09:32:24 +08:00
wangyidong 8c5a015c6c Merge branch 'master' of github.com:easysoft/zentaopms 2018-09-12 09:28:28 +08:00
wangyidong 7883005c1f * finish task #4737. 2018-09-12 09:28:02 +08:00
Yagami 694c2976e6 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-09-12 09:13:57 +08:00
Yagami 8a4cf98a21 * Finish task #4692. 2018-09-12 09:13:28 +08:00
滔哥 2c249e3c8c Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-09-11 17:43:55 +08:00
滔哥 83b6c68be4 * Finish task#4660 2018-09-11 17:43:46 +08:00
wangyidong 0e47ac3bbd Merge branch 'master' of github.com:easysoft/zentaopms 2018-09-11 17:25:09 +08:00
wangyidong 831fdfdeb0 * finish task #4689. 2018-09-11 17:24:18 +08:00
滔哥 52b22fa382 * Finished task#4658 2018-09-11 17:14:21 +08:00
滔哥 9b2d30e440 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-09-11 17:08:23 +08:00
滔哥 841de31266 * Fix bug for php7.2 2018-09-11 17:08:03 +08:00
Yagami cd3b8ce746 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-09-11 16:48:47 +08:00
Yagami e699098db4 * Finish task #4714. 2018-09-11 16:48:25 +08:00
滔哥 59c66f81c4 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-09-11 16:45:18 +08:00
滔哥 2e908786f3 * Finished Task#4805. 2018-09-11 16:44:45 +08:00
wangyidong 33e48bb6a5 * finish task #4707. 2018-09-11 16:42:32 +08:00