Commit Graph
13606 Commits
Author SHA1 Message Date
Catouse 3d68e51ec1 * finish task #4914. 2018-09-27 15:23:24 +08:00
Catouse 9e262c512f * finish task #4951. 2018-09-27 15:12:08 +08:00
Catouse 499eee1fa1 * refactor code for task #4912. 2018-09-27 14:54:02 +08:00
Catouse 85fd278ea7 Merge branch 'master' of https://github.com/easysoft/zentaopms
# Conflicts:
#	www/theme/default/style.css
2018-09-27 14:47:28 +08:00
Catouse f921f8fc69 * refactor code for task #4912. 2018-09-27 14:46:51 +08:00
wangyidong 41d058bd2b Merge branch 'master' of github.com:easysoft/zentaopms 2018-09-27 14:40:20 +08:00
wangyidong 401123654c * finish task #4911. 2018-09-27 14:39:29 +08:00
Catouse 6277a12f3f Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-09-27 14:29:58 +08:00
Catouse 90242f5d6b * refactor code for task #4769. 2018-09-27 14:29:53 +08:00
Yagami 1d1abd0cfc * Fix craete case view pri span border. 2018-09-27 14:04:34 +08:00
Yagami 4f718b3796 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-09-27 14:00:02 +08:00
Yagami bb3c7e82e3 * Fix create case view pri span border. 2018-09-27 13:59:21 +08:00
Catouse b4407c7529 * refactor code for task #4918. 2018-09-27 13:42:11 +08:00
Catouse 7652f8bc1c * refactor code for task #4769. 2018-09-27 13:33:58 +08:00
Catouse 389b7d77c0 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-09-27 11:27:22 +08:00
Catouse f8064bb042 * finish task #4950. 2018-09-27 11:27:17 +08:00
wangyidong 059ed26f8d * code for task #4943. 2018-09-27 11:22:22 +08:00
wangyidong ef550c58fa * finish task #4943. 2018-09-27 11:19:03 +08:00
wangyidong cc8c0a4344 Merge branch 'master' of github.com:easysoft/zentaopms 2018-09-27 10:53:26 +08:00
wangyidong 25c19f97b3 * finish task #4948. 2018-09-27 10:52:54 +08:00
Catouse 6e0554f970 * fix table style on fixed footer on page bottom. 2018-09-27 10:42:00 +08:00
Catouse 235d88576a * fix line-height of '<a>' element in table. 2018-09-27 10:34:43 +08:00
Catouse 9656fdd2ba * fix modal-iframe with double scrollbar. 2018-09-27 09:46:50 +08:00
Catouse e23a6e61d5 * code for task #4910. 2018-09-27 09:40:01 +08:00
Catouse 3e881d281b Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-09-27 09:09:15 +08:00
Catouse 4ec5a294c1 * fix dynamic block style. 2018-09-27 09:09:09 +08:00
wangyidong f8f85fd857 * finish task #4949. 2018-09-26 17:09:27 +08:00
wangyidong 6ccd172703 * finish task #4909. 2018-09-26 17:01:14 +08:00
wangyidong bc75d03326 * finish task #4925. 2018-09-26 16:13:45 +08:00
wangyidong e0950c3e8b * finish task #4940. 2018-09-26 15:11:54 +08:00
wangyidong d9810596bc * finish task #4922. 2018-09-26 14:34:35 +08:00
wangyidong ce9d11cef5 * finish task #4919. 2018-09-26 14:26:11 +08:00
wangyidong 2d637bed39 Merge branch 'master' of github.com:easysoft/zentaopms 2018-09-26 14:20:01 +08:00
wangyidong 9401b9b250 * finish task #4932. 2018-09-26 14:19:30 +08:00
Yagami 8534f7b26d Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-09-26 14:16:26 +08:00
Yagami 373741ee78 * Change report default button icon. 2018-09-26 14:15:33 +08:00
wangyidong e9282d1410 * finish task #4933. 2018-09-26 14:10:26 +08:00
wangyidong f22139501a Merge branch 'master' of github.com:easysoft/zentaopms 2018-09-26 14:08:25 +08:00
wangyidong 07377dd65a * finish task #4924. 2018-09-26 14:08:00 +08:00
Yagami 56ff1b8d09 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-09-26 14:07:47 +08:00
Yagami 73108b8261 * Finish task #4942. 2018-09-26 14:07:34 +08:00
wangyidong 1ad541dd7e Merge branch 'master' of github.com:easysoft/zentaopms 2018-09-26 14:06:06 +08:00
wangyidong a9540d8443 * adjust style for misc-about. 2018-09-26 14:05:18 +08:00
Yagami f149100e71 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-09-26 14:00:16 +08:00
Yagami 55511987f1 * Finish task #4946. 2018-09-26 13:59:57 +08:00
wangyidong e6fee33490 * finish task #4937. 2018-09-26 13:57:03 +08:00
wangyidong e79e05665b * finish task #4941. 2018-09-26 13:53:53 +08:00
wangyidong 267a659fea Merge branch 'master' of github.com:easysoft/zentaopms 2018-09-26 13:50:38 +08:00
Yagami d836b77324 * Finish task #4944. 2018-09-26 13:49:16 +08:00
wangyidong 556af243fa * finish task #4912. 2018-09-26 13:49:02 +08:00