Commit Graph
7244 Commits
Author SHA1 Message Date
wangyidong 311bb335c4 Merge branch 'master' of github.com:easysoft/zentaopms 2017-01-11 14:13:38 +08:00
wangyidong 2926039122 * finish task #2862. 2017-01-11 14:12:00 +08:00
chenfeiCF 86997cd179 * finish task #2870. 2017-01-11 13:38:49 +08:00
tengfei cc28d65b94 * change parse to paste 2017-01-11 08:14:41 +08:00
wangyidong a079adecc7 Merge branch 'master' of github.com:easysoft/zentaopms 2017-01-10 16:18:54 +08:00
wangyidong 9d3d6d278a * adjust for export with branch. 2017-01-10 16:15:18 +08:00
chenfeiCF ccc1c7d30d Merge branch 'master' of github.com:easysoft/zentaopms 2017-01-10 14:14:06 +08:00
chenfeiCF 61db347702 * finish task #2880. 2017-01-10 14:13:31 +08:00
wangyidong 5129350df0 * finish task #2865. 2017-01-10 11:51:44 +08:00
chenfeiCF f8460d4027 * finish task #2869. 2017-01-10 10:56:58 +08:00
chenfeiCF 0ecaa6306f * finish task 2879. 2017-01-09 15:35:46 +08:00
Catouse ae2199270f * fix search form style for task #2858. 2017-01-09 15:29:35 +08:00
Catouse 232e155578 Merge branch 'master' of https://github.com/easysoft/zentaopms 2017-01-09 14:39:35 +08:00
Catouse 9997c81559 * refactor UI of markdown editor. 2017-01-09 14:38:55 +08:00
chenfeiCF f5c4cdbfe5 * finish task #2868. 2017-01-09 14:36:37 +08:00
chenfeiCF 087e5aed22 * finish task #2867. 2017-01-09 13:47:12 +08:00
wangyidong 5b93bc16e4 Merge branch 'master' of github.com:easysoft/zentaopms 2017-01-09 13:31:11 +08:00
wangyidong 645a6b0ede * finish task # 2849. 2017-01-09 13:30:08 +08:00
chenfeiCF 7261dc6c54 * finish task #2864. 2017-01-09 13:07:11 +08:00
wangyidong f00a45e9dd * finish task #2846. 2017-01-09 10:21:57 +08:00
wangyidong 77b8cb76f8 * finish task #2840. 2017-01-09 09:47:06 +08:00
wangyidong cd25a4216e * fix for save mail queue. 2017-01-09 09:29:09 +08:00
wangyidong eff0ac2d99 * adjust for get tree menu in testtask cases page. 2017-01-09 09:25:51 +08:00
wangyidong 1235530eee Merge branch 'master' of github.com:easysoft/zentaopms 2017-01-06 15:19:59 +08:00
wangyidong 599fa16c64 * finish task #2845. 2017-01-06 15:19:32 +08:00
chenfeiCF 2a26a2fc95 * finish task #2874. 2017-01-06 14:50:54 +08:00
chenfeiCF f26b724ec2 * finish task #2861. 2017-01-06 14:39:02 +08:00
chenfeiCF e8103e089b * finish task #2843. 2017-01-06 13:29:23 +08:00
chenfeiCF d607a34324 * finish task #2839. 2017-01-06 13:10:39 +08:00
wangyidong 9f5591d2ea * adjust for members when edit. 2017-01-05 14:39:03 +08:00
wangyidong 9d643ac3f1 * fix bug for update file. 2017-01-05 14:12:10 +08:00
wangyidong 1d6d3e8cb1 * set company field required. 2017-01-05 11:12:43 +08:00
Zhangxf 2f0fa8df85 Fix bug: An error occurred when adding comment to bug with a picture. 2017-01-05 10:03:21 +08:00
Catouse a940b4a11f Merge branch 'master' of https://github.com/easysoft/zentaopms 2017-01-04 13:40:00 +08:00
Catouse c707519caa * refactor code. 2017-01-04 13:39:52 +08:00
tengfei 05c4cc79db Merge branch 'master' of github.com:easysoft/zentaopms 2017-01-03 11:15:11 +08:00
tengfei a34e4cc7fa *translation new items in Admin, Mail 2017-01-03 11:13:43 +08:00
wangyidong afbe60c77f * readonly when key is null. 2017-01-03 10:41:37 +08:00
wangyidong 141b5c4df0 * change for en lang and zh-tw lang. 2017-01-03 10:18:33 +08:00
wangyidong 147167bee6 Merge branch 'master' of github.com:easysoft/zentaopms 2017-01-03 09:46:40 +08:00
wangyidong 8ba21afa1c * change for upgrade. 2017-01-03 09:45:47 +08:00
wangyidong e8df6cf433 * adjust for upgrade. 2017-01-03 09:35:10 +08:00
Catouse e3ed7817a7 * fixed bug #931. 2016-12-31 16:00:23 +08:00
wangyidong 782ccae3a8 * fix bug #976. 2016-12-30 10:48:42 +08:00
wangyidong 6e374fbd13 * fix bug #966. 2016-12-30 10:32:10 +08:00
wangyidong 0866c20425 * adjust for send by ztcloud. 2016-12-29 16:20:18 +08:00
wangyidong 1b81e01332 Merge branch 'master' of github.com:easysoft/zentaopms 2016-12-29 16:07:14 +08:00
wangyidong 2ab3441386 * fix bug for send mail. 2016-12-28 18:31:53 +08:00
chenfeiCF d77aae1feb * merge two mails subject as the subject. 2016-12-28 14:49:42 +08:00
chenfeiCF 830d409121 * adjust code for task #2808. 2016-12-28 14:31:28 +08:00