Commit Graph
7316 Commits
Author SHA1 Message Date
tengfei f6aea7992e *update 2017-02-09 13:52:03 +08:00
tengfei 2b3fbcd497 *update 2017-02-09 13:50:22 +08:00
tengfei 2de2af1d5c *adjust password 2017-02-09 13:47:00 +08:00
wangyidong 357f0216d7 * finish task #2888. 2017-02-09 10:39:43 +08:00
wangyidong 33f8c7dbd1 * finish task #2887. 2017-02-09 10:11:01 +08:00
wangyidong eab8af2e8c * finish task #2886. 2017-02-08 10:57:27 +08:00
wangyidong 217c6c4795 * finish task #2885. 2017-02-08 10:23:33 +08:00
wangyidong 3d380fa3a3 * adjust for bug. 2017-02-08 09:34:39 +08:00
wangyidong 5b0f01462a * fix bug for comment story. 2017-02-04 16:25:19 +08:00
wangyidong e37578024e Merge branch 'master' of github.com:easysoft/zentaopms 2017-02-04 16:23:34 +08:00
wangyidong 99952acab0 * change for close lang. 2017-02-04 16:23:10 +08:00
Catouse 7e7a334e39 Merge branch 'master' of https://github.com/easysoft/zentaopms
Conflicts:
	module/project/css/tree.css
	module/project/lang/en.php
	module/project/view/tree.html.php
2017-02-03 15:45:42 +08:00
tengfei ff018ec831 *adjust relate to link:wq 2017-02-03 14:53:18 +08:00
tengfei d1c5293d04 *adjust relate to link 2017-02-03 14:39:57 +08:00
wangyidong 86a26f6b1c Merge branch 'master' of github.com:easysoft/zentaopms 2017-02-03 09:56:43 +08:00
wangyidong 18df8b6d88 * fix for upgrade. 2017-02-03 09:56:23 +08:00
wangyidong 37a82dd952 * fix bug. 2017-01-22 15:38:45 +08:00
tengfei d63e337672 *adjust ext note 2017-01-18 14:51:27 +08:00
wangyidong 34a5414b35 * change doc lang. 2017-01-18 10:19:28 +08:00
wangyidong 6212cd4155 * fix for burn. 2017-01-17 16:26:33 +08:00
wangyidong 7905394d88 * change for upgrade. 2017-01-17 13:51:06 +08:00
wangyidong bfefa7b88b * adjust for check url. 2017-01-17 13:15:49 +08:00
wangyidong 475eaf90f7 * fix select all user when no story. 2017-01-17 11:20:13 +08:00
wangyidong 4c48ab2491 Merge branch 'master' of github.com:easysoft/zentaopms 2017-01-17 10:53:48 +08:00
wangyidong 96968faad8 * finish task #2862. 2017-01-17 10:53:21 +08:00
chenfeiCF b1d42dbc78 Merge branch 'master' of github.com:easysoft/zentaopms 2017-01-17 09:40:05 +08:00
chenfeiCF f09d337df3 * adjust code for task #2883. 2017-01-17 09:39:14 +08:00
wangyidong 54962074fc * finish task #2884,2872. 2017-01-17 09:19:52 +08:00
chenfeiCF 319389a496 * adjust code for task #2881. 2017-01-17 09:04:56 +08:00
chenfeiCF 3b177feb10 * adjust code for task #2873. 2017-01-17 09:02:32 +08:00
chenfeiCF 15b83b3536 * adjust code for task #2869. 2017-01-17 08:40:28 +08:00
tengfei 4362d10e8a Merge branch 'master' of github.com:easysoft/zentaopms 2017-01-16 17:03:19 +08:00
tengfei efae75ae7f * added newly translated content 2017-01-16 17:01:45 +08:00
chenfeiCF 117fe64412 * adjust for task #2868. 2017-01-16 16:52:44 +08:00
wangyidong c6e6d9e1a5 * adjust for project tree. 2017-01-16 15:13:44 +08:00
wangyidong 8af5e74ad4 * copy zh-cn lang to en. 2017-01-16 14:47:43 +08:00
wangyidong f23b840d7f Merge branch 'master' of github.com:easysoft/zentaopms 2017-01-16 14:41:59 +08:00
wangyidong 2692fc2983 * change case icon. 2017-01-16 14:41:34 +08:00
chenfeiCF 3216ab447d * adjust the distance between operate icons in cases page. 2017-01-16 14:28:45 +08:00
wangyidong 453074044c * adjust for priv. 2017-01-16 14:15:41 +08:00
wangyidong 392e2d6aa1 * adjust qq for zentao user. 2017-01-16 13:36:57 +08:00
wangyidong 79b9c8bf58 Merge branch 'master' of github.com:easysoft/zentaopms 2017-01-16 11:38:20 +08:00
wangyidong 42ded183b5 * finish task #2878. 2017-01-16 11:37:38 +08:00
wangyidong 5678a2937c * adjust icon. 2017-01-16 10:46:45 +08:00
wangyidong cf3677bfa9 * add copy lang for task. 2017-01-16 10:44:57 +08:00
chenfeiCF 5e44401a10 * fix bug #992. 2017-01-16 08:57:53 +08:00
chenfeiCF 456e36e57f * fix bug #993. 2017-01-13 16:34:19 +08:00
chenfeiCF 8525150295 * adjust code for task #2883. 2017-01-13 13:53:31 +08:00
chenfeiCF 8510ac3fea * adjust code for task #2881. 2017-01-13 13:44:17 +08:00
wangyidong fb1902200e Merge branch 'master' of github.com:easysoft/zentaopms 2017-01-13 13:32:02 +08:00