Commit Graph

15142 Commits

Author SHA1 Message Date
Yagami
7b41c11c32 * Finish task #5804. 2019-06-21 14:08:23 +08:00
Yagami
df6b60bd53 * Fix php wraning. 2019-06-20 16:06:33 +08:00
Yagami
c54c18924b * Finish task #5816. 2019-06-20 13:22:03 +08:00
Yagami
7e805210d2 * Finish task #5817. 2019-06-20 10:44:56 +08:00
Yagami
76c29a4316 * Finish task #5821. 2019-06-20 09:48:30 +08:00
Yagami
7157e51ea6 * Finish task #5815. 2019-06-20 09:18:18 +08:00
Yagami
e56cdbebae * Finish task #5811. 2019-06-19 15:58:03 +08:00
Yagami
adbd46fce6 * finish task 5810. 2019-06-19 13:50:20 +08:00
wangyidong
50cb4f7ea1 * fix bug. 2019-06-18 10:52:46 +08:00
wangyidong
fe5866bea0 + add new version and upgrade. zentaopms_11.5.stable_20190508 2019-05-08 16:09:29 +08:00
wangyidong
f8bf771562 * adjust for xuanxuan. 2019-05-08 14:32:33 +08:00
wangyidong
610a19d880 Merge branch 'master' of github.com:easysoft/zentaopms 2019-05-08 13:27:02 +08:00
wangyidong
5bebd42783 * add for xuanxuan priv. 2019-05-08 13:26:25 +08:00
yfl
9205c7d685 *Modify action lang 2019-05-08 13:02:47 +08:00
wangyidong
821cfb2b4b * add xxb index. 2019-05-08 12:00:49 +08:00
Yagami
8203570b89 * Change save zentaoclient dir. 2019-05-08 10:38:35 +08:00
yfl
f2b2e99e6c Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-05-08 10:09:30 +08:00
yfl
478c9dd1f5 * Modify action lang 2019-05-08 10:08:44 +08:00
Yagami
f35eefa307 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-05-08 09:57:51 +08:00
Yagami
f8d42efeec * Fix admin menu order. 2019-05-08 09:57:15 +08:00
wangyidong
920855f5df * adjust for manage actions. 2019-05-08 09:02:09 +08:00
yfl
bd1e152306 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-05-07 19:05:54 +08:00
yfl
9a846c0a93 * Modify lang 2019-05-07 19:04:48 +08:00
wangyidong
093a1ab171 Merge branch 'master' of github.com:easysoft/zentaopms 2019-05-07 17:13:18 +08:00
wangyidong
861115d3b7 * adjust for all checker. 2019-05-07 17:09:35 +08:00
yfl
38c6241b12 * Modify action lang 2019-05-07 16:57:13 +08:00
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
b0f8172d46 * adjust for key width. 2019-05-07 14:08:56 +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
wangyidong
7cf950a2eb * hide update xuanxuan. 2019-05-07 10:49:03 +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
wangyidong
583a194eda * merge xuanxuan. 2019-05-06 13:45:31 +08:00