Commit Graph
12397 Commits
Author SHA1 Message Date
yfl b770ef4ebf * Modify action module lang 2019-05-07 16:43:46 +08:00
yfl fba2b6ce8f *Action lang 2019-05-07 16:38:32 +08:00
reneeteng ae0e35b2a1 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-05-07 15:28:31 +08:00
wangyidong d20b485935 Merge branch 'master' of github.com:easysoft/zentaopms 2019-05-07 15:27:55 +08:00
reneeteng ec413172c9 * Lang file update. 2019-05-07 15:27:38 +08:00
wangyidong db00e46eb5 * adjust for merge xuanxuan. 2019-05-07 15:27:24 +08:00
yfl a5de92262e * dynamic search filter by action where 2019-05-07 15:25:38 +08:00
yfl 07e7b725fb Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-05-07 15:24:09 +08:00
reneeteng 05d169eead * Lang changed for new realease. 2019-05-07 15:20:07 +08:00
yfl e84d11b603 * add action lang 2019-05-07 14:50:29 +08:00
wangyidong 5a6a91b21b * adjust for action lang. 2019-05-07 13:43:15 +08:00
wangyidong 134f2fb68c Merge branch 'master' of github.com:easysoft/zentaopms 2019-05-07 13:36:05 +08:00
wangyidong 7fdfe38de1 * add for en lang. 2019-05-07 13:35:48 +08:00
yfl 4f485c6dfb * Fix bug dynation 2019-05-07 11:25:03 +08:00
yfl 9312d9edd6 * Fix bug of dynamic action 2019-05-07 11:03:53 +08:00
wangyidong e2fd154aca Merge branch 'master' of github.com:easysoft/zentaopms 2019-05-07 10:49:36 +08:00
yfl e144fe8e37 * Fix bug of dynamic 2019-05-07 08:50:34 +08:00
wangyidong 58701fb54a * adjust for update last edit time. 2019-05-07 08:50:25 +08:00
wangyidong 4baf52bb81 * adjust for merge xuanxuan. 2019-05-06 18:25:35 +08:00
yfl 4a2f7199bb Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-05-06 16:34:18 +08:00
yfl 6db8a4e7b2 Merge branch 'master' of https://github.com/easysoft/zentaopms
* Task #5423
2019-05-06 16:33:10 +08:00
Yagami f4c923b9dc Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-05-06 13:05:19 +08:00
Yagami 50023bec34 * Fix export parent task bug. 2019-05-06 13:04:47 +08:00
wangyidong 5c1574b844 * change db and finish task #5431. 2019-05-06 10:24:28 +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 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 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