Commit Graph
478 Commits
Author SHA1 Message Date
reneeteng cc233d2517 * Lang file update. 2019-06-04 14:16:36 +08:00
reneeteng ecb028a4c3 * Lang file update. 2019-06-04 11:26:20 +08:00
reneeteng eaba2135ad * Finish for proj 100 lang files. 2019-05-30 11:22:13 +08:00
reneeteng aacf02572b * Lang file update. 2019-05-30 10:50:56 +08:00
reneeteng eaa6cc00d4 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-05-29 17:08:34 +08:00
reneeteng 16a92b51cb * Lang file update. 2019-05-29 17:07:58 +08:00
Yagami 74c85776b9 * Finish task #5520. 2019-05-29 15:50:43 +08:00
reneeteng 2b8c9976c8 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-05-28 16:25:24 +08:00
reneeteng 0d85b8c62d * Lang update. 2019-05-28 16:25:04 +08:00
wangyidong 4d4093e703 * finish task #5583. 2019-05-28 13:44:32 +08:00
wangyidong d4a669511b Merge branch 'master' of github.com:easysoft/zentaopms 2019-05-28 11:33:47 +08:00
wangyidong c83902cb92 * finish task #5585. 2019-05-28 11:20:30 +08:00
Yagami 1c0dcf4cfa * Finish task #5549. 2019-05-28 10:21:32 +08:00
Yagami f0f52d3bc6 * Finish task #5558. 2019-05-28 09:21:23 +08:00
Yagami e8a1ee93f3 * Finish task #5560. 2019-05-28 09:08:28 +08:00
Yagami 09245b6f2f * Fix productstatisticblock width. 2019-05-28 08:59:09 +08:00
reneeteng c724ee8fac * Lang file update. 2019-05-24 10:04:23 +08:00
Yagami 787172c3b8 * Fix en lang file. 2019-05-22 14:14:18 +08:00
reneeteng 594501f676 * Lang update. 2019-05-21 10:37:04 +08:00
reneeteng 340636b0b3 * Lang change. 2019-05-17 14:44:40 +08:00
yfl 9e3477100a * Task #5423 2019-05-06 09:14:32 +08:00
reneeteng 9cad7d87d2 * Lang change b. 2019-04-19 10:35:56 +08:00
reneeteng a0dabe51f3 * Lang changed. 2019-04-18 15:25:49 +08:00
reneeteng 676ddf02bf * Lang change. 2019-04-10 15:22:19 +08:00
reneeteng fcf101fa3c Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-04-09 15:48:19 +08:00
reneeteng b557a8c45a Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-04-09 15:47:33 +08:00
wangyidong b554bea1d3 * adjust for change block. 2019-04-08 15:20:53 +08:00
reneeteng 75dc4d1bde * Lang change. 2019-04-03 15:43:20 +08:00
Yagami 0b0882cba8 * Fix block delete. 2019-03-26 15:01:01 +08:00
chenfei fe6d7b1f1e * Adjust code. 2019-03-25 11:18:54 +08:00
Yagami 955bbf3345 * Fix block lang file. 2019-03-22 13:08:23 +08:00
wangyidong a90b924080 * finish task #5371. 2019-03-22 08:54:44 +08:00
chenfei b66c5ec7fa * Finish task #5330. 2019-03-19 17:23:35 +08:00
Yagami 602e8244de * Finish task #5339. 2019-03-19 10:25:17 +08:00
chenfeiCF e171290300 * Adjust code. 2019-02-27 17:03:16 +08:00
reneeteng c05c534b12 * Lang change. 2019-02-26 10:29:53 +08:00
wangyidong 373aedfc0b * finish task #5297. 2019-02-25 14:09:57 +08:00
Yagami 6efbe82455 * Finish task #5309. 2019-02-20 15:53:47 +08:00
wangyidong 6d30d1814f * adjust for count project task. 2019-02-01 14:59:30 +08:00
chenfeiCF 1b83338698 * Finish task #5253. 2019-01-25 18:58:56 +08:00
Yagami c163f11b0f * Finish task #5198. 2019-01-02 09:46:49 +08:00
Yagami 3d850bdc0a * Fix task 5190. 2018-12-29 13:43:29 +08:00
Yagami 3d34eb42e8 * Finish task #5190. 2018-12-29 13:41:36 +08:00
wangyidong 2eb32fd6ba * fix bug for block. 2018-12-14 15:37:15 +08:00
wangyidong 78441e51f9 * adjust for product statistic block. 2018-11-26 10:46:25 +08:00
wangyidong 7bc823d490 * fix bugs. 2018-11-26 09:01:16 +08:00
wangyidong ad0eb0a7ba * add new version and upgrade. 2018-11-20 15:05:36 +08:00
Yagami 1a3c4f7af5 * Fix qa index css and doc lang. 2018-11-20 13:58:29 +08:00
Catouse 652fdcba6e * code for task #5116. 2018-11-20 12:09:01 +08:00
Catouse 001d810984 Merge branch 'master' of https://github.com/easysoft/zentaopms
# Conflicts:
#	module/block/view/productstatisticblock.html.php
#	module/block/view/projectstatisticblock.html.php
2018-11-20 11:57:01 +08:00