Commit Graph
15088 Commits
Author SHA1 Message Date
yfl 6db8a4e7b2 Merge branch 'master' of https://github.com/easysoft/zentaopms
* Task #5423
2019-05-06 16:33:10 +08:00
yfl 9e3477100a * Task #5423 2019-05-06 09:14:32 +08:00
yfl e4952b3eb2 * Task #5423 2019-05-05 18:40:51 +08:00
wangyidong e29bb78fd3 Merge branch 'master' of github.com:easysoft/zentaopms 2019-05-05 17:53:25 +08:00
wangyidong 0936df0edc * adjust for change parent status. 2019-05-05 17:52:54 +08:00
reneeteng 0208e8a975 * Lang changed. 2019-05-05 16:42:11 +08:00
wangyidong 1615686c56 Merge branch 'master' of github.com:easysoft/zentaopms 2019-05-05 16:41:12 +08:00
wangyidong 140984502c * code for task #5428,5379. 2019-05-05 16:40:22 +08:00
reneeteng cb5a219b31 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-05-05 15:36:19 +08:00
reneeteng 17cefd3177 * Lang changed. 2019-05-05 15:19:37 +08:00
wangyidong 3d45499974 Merge branch 'master' of github.com:easysoft/zentaopms 2019-05-05 10:54:49 +08:00
wangyidong 4f1223ca73 * adjust for printAction and fix error. 2019-05-05 10:54:13 +08:00
yfl b860286d04 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-05-05 08:40:25 +08:00
yfl 94aa0ca8a6 * Finish task #5443,#5442,#5441 2019-05-05 08:38:23 +08:00
Yagami 195b8e742a Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-04-30 14:41:04 +08:00
Yagami df4580208e * Fix export sql bug. 2019-04-30 14:40:40 +08:00
wangyidong 7d0494051b - delete useless file. 2019-04-30 14:13:58 +08:00
wangyidong 139021e037 * finish task #5424. 2019-04-30 14:13:03 +08:00
wangyidong 05b35c7391 Merge branch 'master' of github.com:easysoft/zentaopms 2019-04-30 10:54:05 +08:00
wangyidong 1dfd857601 * finish task #5435. 2019-04-30 10:53:38 +08:00
Yagami ce437c6de6 * Fix create todo locate. 2019-04-30 09:07:53 +08:00
wangyidong 83ef9700c4 * finish task #5433. 2019-04-29 16:42:22 +08:00
wangyidong 3463d4bff9 * finish task #5432. 2019-04-29 16:15:10 +08:00
wangyidong 14cde536ec * code for task #5434. 2019-04-29 16:11:27 +08:00
wangyidong 7de6eba772 * finish task #5436. 2019-04-29 16:04:48 +08:00
wangyidong ea8394ad10 * finish task #5437. 2019-04-29 15:54:02 +08:00
wangyidong f08d1deb40 * finish task #5441. 2019-04-29 15:44:17 +08:00
wangyidong 5c90c57f46 * adjust code. 2019-04-29 15:36:17 +08:00
wangyidong 060559f1ae * finish task #5439. 2019-04-29 15:35:04 +08:00
wangyidong 0bedfad8a5 * fix for en lang. 2019-04-29 12:03:17 +08:00
wangyidong 1d1f43d2cd * change for task #5384. 2019-04-29 09:03:04 +08:00
wangyidong 77346a6d66 Merge branch 'master' of github.com:easysoft/zentaopms 2019-04-29 08:57:30 +08:00
wangyidong 726a412270 * code for task #5384. 2019-04-29 08:57:00 +08:00
wangyidong 8c78ea1612 * adjust for task #5387. 2019-04-29 08:52:08 +08:00
yfl b61f20d071 * Modify batchCreate task link 2019-04-29 08:43:54 +08:00
yfl 052ef61fe6 * Fix task #5380 2019-04-29 08:39:53 +08:00
yfl 526e5298b4 * Finish task #5380 2019-04-28 17:44:49 +08:00
wangyidong 3da462675a Merge branch 'master' of github.com:easysoft/zentaopms 2019-04-28 17:16:06 +08:00
wangyidong a7e7e81b32 * adjust for merge xuanxuan. 2019-04-28 09:47:05 +08:00
yfl 6afe04a2b2 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-04-28 08:47:36 +08:00
wangyidong 240c241282 * move sendDownHeader method to model. 2019-04-26 17:58:15 +08:00
wangyidong 9bc0c3d7f2 Merge branch 'master' of github.com:easysoft/zentaopms 2019-04-26 17:54:19 +08:00
wangyidong ab3da55671 * fix bug. 2019-04-26 17:43:55 +08:00
yfl 602a7af067 * Finish task #5399 2019-04-26 15:52:03 +08:00
yfl 43ffe4b49f * Finish task #5401 2019-04-26 15:25:22 +08:00
yfl 92fecca3c6 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-04-26 15:08:00 +08:00
yfl b47d53fee6 * Finish Task #5379,#5398 2019-04-26 15:00:16 +08:00
wangyidong bd90f185d8 * fix bug for doc crumb title. 2019-04-26 14:59:07 +08:00
wangyidong c5920e112a * finish task #5404. 2019-04-26 14:58:30 +08:00
wangyidong dff082a3e7 * code for task #5392. 2019-04-26 14:17:48 +08:00