Commit Graph
7063 Commits
Author SHA1 Message Date
wangyidong e4946b529e * finish task #2736. 2016-12-01 13:44:52 +08:00
wangyidong a78ff866cb Merge branch 'master' of github.com:easysoft/zentaopms 2016-12-01 13:39:50 +08:00
wangyidong 0f232e6d8f * finish task #2735. 2016-12-01 13:39:29 +08:00
chenfeiCF fc7cbe828b * adjust task #2704. 2016-12-01 13:06:10 +08:00
wangyidong 5062e5af5c Merge branch 'master' of github.com:easysoft/zentaopms 2016-12-01 11:33:39 +08:00
wangyidong 88167e8151 Merge branch 'master' of github.com:easysoft/zentaopms 2016-12-01 11:33:03 +08:00
chenfeiCF 20443bd8ec * adjust task #2701. 2016-12-01 11:31:04 +08:00
wangyidong c153cece0c * finish task #2732. 2016-12-01 11:25:28 +08:00
chenfeiCF 18cd65f939 Merge branch 'master' of github.com:easysoft/zentaopms 2016-12-01 11:23:34 +08:00
chenfeiCF 8720e886e8 * adjust task #2696. 2016-12-01 11:23:04 +08:00
wangyidong 45d37f489e * revert for task #2730. 2016-12-01 11:22:35 +08:00
wangyidong 777dee7f6b * finish task #2712. 2016-12-01 10:44:10 +08:00
wangyidong 531f63e562 Merge branch 'master' of github.com:easysoft/zentaopms 2016-12-01 10:32:59 +08:00
wangyidong 9fac0a464c * finish task #2710. 2016-12-01 10:31:47 +08:00
wangyidong 80ad4ce758 * finish task #2699. 2016-12-01 10:15:24 +08:00
chenfeiCF 901c40a6fb * make name or title nowrap in table. 2016-12-01 09:38:51 +08:00
chenfeiCF 34cd16c329 Merge branch 'master' of github.com:easysoft/zentaopms 2016-11-30 17:35:14 +08:00
chenfeiCF 2029f1ce34 * adjust task #2695. 2016-11-30 17:33:08 +08:00
wangyidong feb0e70608 * finish task #2689. 2016-11-30 17:13:40 +08:00
tengfei ef7e7fda15 Merge branch 'master' of github.com:easysoft/zentaopms 2016-11-30 17:02:28 +08:00
tengfei c1c7966674 *minor editing 2016-11-30 17:00:58 +08:00
chenfeiCF a4b337fe8a * adjust task #2683. 2016-11-30 15:51:57 +08:00
chenfeiCF bbed2e599c * adjust task #2681. 2016-11-30 15:32:08 +08:00
Catouse 05356fab8b * fix canvas chart for ie8. 2016-11-30 14:59:46 +08:00
Catouse ef3d5cabdf * change pie chart radius size to 20. 2016-11-30 14:26:04 +08:00
Catouse 147c76d99f Merge branch 'master' of https://github.com/easysoft/zentaopms 2016-11-30 14:23:03 +08:00
Catouse 462abed288 * show task progress in project task list with pie chart. 2016-11-30 14:22:51 +08:00
Catouse 413e80a3d5 * adjust code format. 2016-11-30 14:22:01 +08:00
wangyidong 964ebebc54 Merge branch 'master' of github.com:easysoft/zentaopms 2016-11-30 11:05:17 +08:00
tengfei ae1b3f9080 * Delete useless files. 2016-11-30 10:35:14 +08:00
tengfei 6b8f460ede * bak. 2016-11-30 10:28:54 +08:00
tengfei b7c509aa09 * verification->acceptance 2016-11-30 09:22:47 +08:00
wangyidong 95f028cbbb Merge branch 'master' of github.com:easysoft/zentaopms 2016-11-30 09:01:57 +08:00
wangyidong f0548adfd3 * adjus for bind zentao. 2016-11-30 09:01:30 +08:00
tengfei 2e4b6d22b6 language review on 11/29. 2016-11-29 15:37:28 +08:00
tengfei 81800e7cec * language review. 2016-11-29 14:58:38 +08:00
chenfeiCF 9e92401815 * if isonlybody do not display subdivide and create testcase button. 2016-11-29 13:18:57 +08:00
wangyidong 8e4c380397 * code for task #2773. 2016-11-29 13:05:14 +08:00
wangyidong c833cfd203 * adjust for task #2712. 2016-11-29 09:03:26 +08:00
wangyidong ee7204c10c * finish task #2712. 2016-11-28 16:55:02 +08:00
wangyidong 3baf0ab280 * finish task #2703. 2016-11-28 16:27:39 +08:00
wangyidong a3b75f5df3 * code for task #2773. 2016-11-28 14:21:23 +08:00
wangyidong c5d68e5305 Merge branch 'master' of github.com:easysoft/zentaopms 2016-11-28 13:56:17 +08:00
wangyidong 92711b1a2e * finish task #2689,2746. 2016-11-28 13:53:15 +08:00
chenfeiCF 8975592ed2 * finish task #2715. 2016-11-28 10:05:01 +08:00
chenfeiCF 79445db85b * finish task #2720. 2016-11-28 09:37:51 +08:00
chenfeiCF 6c0d60dd49 * finish task #2711. 2016-11-28 09:37:17 +08:00
chenfeiCF f3aef78223 Merge branch 'master' of github.com:easysoft/zentaopms
Conflicts:
	module/project/css/task.css
2016-11-28 09:11:57 +08:00
chenfeiCF be29473333 * finish task #2770, #2771, #2767. 2016-11-28 09:01:45 +08:00
Catouse ec4804aff9 * finish task #2763. 2016-11-26 18:20:53 +08:00