Commit Graph
1651 Commits
Author SHA1 Message Date
Catouse 22644614e6 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-11-15 10:18:41 +08:00
Catouse f724c7ddb6 * fix ajaxform not work. 2018-11-15 10:18:14 +08:00
reneeteng 37e2c1205a Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-11-15 09:57:57 +08:00
reneeteng b9e4f1c766 * Lang optimized. 2018-11-15 09:57:30 +08:00
Yagami 43816350b0 * Fix project menu order. 2018-11-15 09:10:17 +08:00
Yagami e6feb5f675 * Fix project menu. 2018-11-15 09:08:01 +08:00
Yagami 2d26caad2e * Finish task #5084. 2018-11-14 14:10:23 +08:00
Yagami 1024ca6376 * Fix task main menu. 2018-11-14 10:51:40 +08:00
chenfeiCF 7c348ba665 Merge branch 'master' of github.com:easysoft/zentaopms 2018-11-13 13:49:29 +08:00
chenfeiCF 424a98db4a * Finish task #5111. 2018-11-13 13:49:08 +08:00
wangyidong 834dc8e2fa Merge branch 'master' of github.com:easysoft/zentaopms 2018-11-13 09:51:50 +08:00
wangyidong 3f5f48fd50 * finish task #5078. 2018-11-13 09:51:17 +08:00
chenfeiCF 2b47dbed37 * Finish task #5085. 2018-11-12 14:20:59 +08:00
Yagami 222009a2c3 * Finish task #5102. 2018-11-12 11:05:28 +08:00
reneeteng cabb96f338 * Change date prep. 2018-11-05 11:25:11 +08:00
reneeteng 1cad1f72b4 *Lang change. 2018-11-02 15:51:30 +08:00
reneeteng 396c02a4d1 * optimize lang. 2018-11-01 09:49:34 +08:00
wangyidong 2cd31f731e * change version and upgrade. 2018-10-25 09:30:44 +08:00
wangyidong 8b483f751c * fix for appendOrder when orderby is empty. 2018-10-24 17:36:40 +08:00
chenfeiCF 7973e341e4 * Finish task #5048, #5049, #5050, #5054. 2018-10-24 11:06:17 +08:00
Catouse 94547ee4c7 * update kindeditor, finish task #5014 and fix bug #2082. 2018-10-15 14:27:08 +08:00
Catouse f1317bd1d8 * finish task #4990 and fix bug #2199. 2018-10-12 15:16:26 +08:00
wangyidong 8f7c3f8c4e Merge branch 'master' of github.com:easysoft/zentaopms 2018-10-12 14:16:04 +08:00
wangyidong 0558da4e38 * finish task #4967. 2018-10-12 14:00:09 +08:00
滔哥 c368bd0e7c * Finished task#4995. 2018-10-12 11:48:32 +08:00
wangyidong d98adeccba * finish task #4976. 2018-10-12 09:08:12 +08:00
wangyidong 75e0e6555b * finish task #4976. 2018-10-11 15:38:26 +08:00
Catouse f8dc98b196 * change theme names. 2018-10-09 14:16:31 +08:00
wangyidong cce187c7e4 * fix for upgrade. 2018-09-29 14:44:04 +08:00
wangyidong 2d25ad825a * adjust code for upgrade. 2018-09-28 09:35:12 +08:00
wangyidong 3423acdcc3 * adjust code. 2018-09-28 09:03:52 +08:00
Catouse f8064bb042 * finish task #4950. 2018-09-27 11:27:17 +08:00
wangyidong f8f85fd857 * finish task #4949. 2018-09-26 17:09:27 +08:00
Yagami 73108b8261 * Finish task #4942. 2018-09-26 14:07:34 +08:00
滔哥 f4c684a481 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-09-26 10:50:58 +08:00
滔哥 5fa19b78ca * Finish task#4926. 2018-09-26 10:50:52 +08:00
wangyidong f6cb04cd44 * change http to https. 2018-09-25 13:11:06 +08:00
Catouse 94adf90943 * improve UI of table. 2018-09-25 09:36:50 +08:00
Catouse 7e70839e21 * change scrollbar position in datatable. 2018-09-25 09:22:34 +08:00
Catouse e45a1e4d34 * finish task #4791. 2018-09-21 16:39:10 +08:00
wangyidong 40d662e996 Merge branch 'master' of github.com:easysoft/zentaopms 2018-09-19 16:01:07 +08:00
wangyidong 1148ff0f7c * finish task #4892. 2018-09-19 16:00:38 +08:00
滔哥 c6bef0c536 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-09-19 13:42:49 +08:00
Catouse 8bcac87dc1 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-09-19 10:26:36 +08:00
Catouse 9983b0ff19 * improve UI of table, datatable and tablesorter. 2018-09-19 10:23:29 +08:00
wangyidong 53b046a698 * finish task #4880. 2018-09-19 09:36:23 +08:00
滔哥 000c08e943 * Finished task#4890 2018-09-19 08:11:25 +08:00
滔哥 946dd1d9ce * Fix task#4854. 2018-09-19 07:52:35 +08:00
Catouse 60ec826bd9 * refactor codes. 2018-09-18 17:02:34 +08:00
wangyidong ad5c25e843 * adjust for code format. 2018-09-17 09:19:16 +08:00