Commit Graph
13901 Commits
Author SHA1 Message Date
wangyidong 25f860c6ef * fix for upgrade. 2018-10-25 10:48:03 +08:00
wangyidong 0944c9e8c9 * round estimate in browse page. 2018-10-25 10:21:08 +08:00
wangyidong d7e0222b1b * adjust for show queryBox by search. 2018-10-25 10:08:19 +08:00
wangyidong 0a19fbec29 Merge branch 'master' of github.com:easysoft/zentaopms 2018-10-25 09:33:38 +08:00
wangyidong 223db4372e * fix bug for upgrade. 2018-10-25 09:33:16 +08:00
wangyidong 2cd31f731e * change version and upgrade. 2018-10-25 09:30:44 +08:00
Yagami 78182537b1 * Delete doc search condition. 2018-10-25 09:06:31 +08:00
滔哥 4077923c22 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-10-25 07:57:42 +08:00
滔哥 51fb6934f1 * Fix bug. 2018-10-25 07:57:36 +08:00
Catouse 8ddea902dc * improve UI of kanban, finish task #5053. 2018-10-24 20:13:48 +08:00
Catouse e72654b335 * code for task #5039. 2018-10-24 19:59:52 +08:00
Catouse af0e3b1670 * finish task #5039. 2018-10-24 19:48:58 +08:00
wangyidong 8b483f751c * fix for appendOrder when orderby is empty. 2018-10-24 17:36:40 +08:00
wangyidong ca214c3a27 Merge branch 'master' of github.com:easysoft/zentaopms 2018-10-24 17:23:13 +08:00
wangyidong 2a0a11bb92 * add projectID for export tree and calendar. 2018-10-24 17:22:25 +08:00
滔哥 af842dfddb * Format code. 2018-10-24 16:18:41 +08:00
滔哥 033044acca Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-10-24 16:13:56 +08:00
滔哥 8c0940c039 * Fix bug. 2018-10-24 16:13:50 +08:00
Yagami b3540188da Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-10-24 15:21:26 +08:00
Yagami c901155dfa Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-10-24 15:16:50 +08:00
Yagami e83d8e1be9 * Finish task #5040. 2018-10-24 15:16:34 +08:00
wangyidong 3e26c07d0f Merge branch 'master' of github.com:easysoft/zentaopms 2018-10-24 15:16:04 +08:00
wangyidong 657857571b * fix bug for delete lib. 2018-10-24 15:14:16 +08:00
Catouse 02a35cf0a1 * adjust style of custom/ajaxmenu view. 2018-10-24 14:48:12 +08:00
wangyidong fa40b44118 Merge branch 'master' of github.com:easysoft/zentaopms 2018-10-24 14:24:41 +08:00
wangyidong eac9682bd7 * adjust for task #5044. 2018-10-24 14:23:19 +08:00
Catouse a45aeff47e * fix iframe modal auto size not work sometimes. 2018-10-24 14:21:37 +08:00
wangyidong fc480d0a01 Merge branch 'master' of github.com:easysoft/zentaopms 2018-10-24 13:51:02 +08:00
wangyidong b2b5ed0a5e * fix error. 2018-10-24 13:50:42 +08:00
Yagami 346a928562 * Finish task #5043. 2018-10-24 13:29:20 +08:00
Yagami 3b03bc1547 * Delete doc gt lang. 2018-10-24 13:25:26 +08:00
Yagami 9e78e6f8bc Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-10-24 13:19:58 +08:00
Yagami 91596ab288 * Finish task #5047. 2018-10-24 13:19:42 +08:00
wangyidong 12238a6768 Merge branch 'master' of github.com:easysoft/zentaopms 2018-10-24 13:10:37 +08:00
wangyidong 1bfaece647 * finish task #5036. 2018-10-24 13:10:12 +08:00
Yagami 8723563496 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-10-24 13:04:43 +08:00
Yagami 1e95075550 * Finish task #5040. 2018-10-24 13:04:24 +08:00
滔哥 49c61607ef Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-10-24 11:39:08 +08:00
滔哥 7acf9fb3f4 * Finished task#5052. 2018-10-24 11:37:07 +08:00
chenfeiCF 912f125517 * Finish task #5000. 2018-10-24 11:23:06 +08:00
wangyidong 34bc2fedb0 Merge branch 'master' of github.com:easysoft/zentaopms 2018-10-24 11:17:44 +08:00
wangyidong b8a8cfbc6a * finish task #5046,5041. 2018-10-24 11:17:03 +08:00
chenfeiCF 7973e341e4 * Finish task #5048, #5049, #5050, #5054. 2018-10-24 11:06:17 +08:00
滔哥 b048e98b49 * Fix bug. 2018-10-24 10:56:37 +08:00
wangyidong 15effe206d Merge branch 'master' of github.com:easysoft/zentaopms 2018-10-24 10:09:36 +08:00
wangyidong 673549a895 * change for en lang. 2018-10-24 10:09:00 +08:00
wangyidong 3676747f10 * finish task #5044,5045. 2018-10-24 10:06:20 +08:00
Yagami 9495614038 * Delete xuanxuan file. 2018-10-24 09:52:56 +08:00
Yagami 6106c692b9 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-10-24 09:37:29 +08:00
Yagami 5afccb24a5 * Finish task #5037. 2018-10-24 09:36:57 +08:00