Commit Graph

9135 Commits

Author SHA1 Message Date
chenfeiCF
3698443bc5 * finish task #2853. 2017-01-12 22:08:20 +08:00
chenfeiCF
184d40cc78 * fix bug #990. 2017-01-12 13:23:26 +08:00
tengfei
a301cd10a1 Merge branch 'master' of github.com:easysoft/zentaopms 2017-01-11 16:45:10 +08:00
tengfei
15042bbeb5 *adjust relate story note 2017-01-11 16:44:26 +08:00
wangyidong
3286faf10b Merge branch 'master' of github.com:easysoft/zentaopms 2017-01-11 16:42:42 +08:00
wangyidong
3c85e54038 * finish task #2872. 2017-01-11 16:42:13 +08:00
chenfeiCF
3686f4e4e5 * finish task #2881. 2017-01-11 16:40:57 +08:00
chenfeiCF
9167409f99 * finish task #2873. 2017-01-11 16:16:39 +08:00
tengfei
addcdc8332 Merge branch 'master' of github.com:easysoft/zentaopms 2017-01-11 15:54:06 +08:00
tengfei
cfb79eb257 *adjust for interface 2017-01-11 15:53:17 +08:00
wangyidong
15a02bab8b Merge branch 'master' of github.com:easysoft/zentaopms 2017-01-11 14:55:55 +08:00
wangyidong
4f4dfe068c * finish task #2871. 2017-01-11 14:55:27 +08:00
chenfeiCF
8bd7160dfc * finish task #2875. 2017-01-11 14:25:19 +08:00
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
45c30e6417 * refactor ueditor UI. 2017-01-09 14:39:20 +08:00
Catouse
f809da9931 * update zui files. 2017-01-09 14:39:08 +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
Catouse
108bd040cc * update zui. 2017-01-09 13:10:18 +08:00
chenfeiCF
7261dc6c54 * finish task #2864. 2017-01-09 13:07:11 +08:00
Catouse
2664c32f28 Merge branch 'master' of https://github.com/easysoft/zentaopms 2017-01-09 10:29:53 +08:00
Catouse
2afae21446 * finish task #2858 and fix bug #860. 2017-01-09 10:29:43 +08:00
wangyidong
f6b10a3088 Merge branch 'master' of github.com:easysoft/zentaopms 2017-01-09 10:22:25 +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
Catouse
bcde9454d5 * finish task #2857 and fix bug #870. 2017-01-09 09:39:43 +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
wangyidong
0fc5d7a778 Merge branch 'master' of github.com:easysoft/zentaopms 2017-01-06 14:05:33 +08:00
wangyidong
2df587ccf5 * finish task #2841. 2017-01-06 14:04:48 +08:00
chenfeiCF
e8103e089b * finish task #2843. 2017-01-06 13:29:23 +08:00