Commit Graph
613 Commits
Author SHA1 Message Date
chenfeiCF e08ddd12b8 * finish task #2555. 2016-03-31 11:04:17 +08:00
chenfeiCF c9658bc638 * finish task #2554.
* code model.php of product module for task #2553.
2016-03-31 09:39:28 +08:00
wangyidong 2cbcebc17f Merge branch 'master' of github.com:easysoft/zentaopms 2016-03-29 15:10:38 +08:00
wangyidong 647e9bee18 * finish task #2580. 2016-03-29 15:08:46 +08:00
chenfeiCF 590afbf92e * finish task #2569. 2016-03-29 14:27:57 +08:00
chenfeiCF 8cd6978375 * finish task #2567. 2016-03-29 10:34:34 +08:00
chenfeiCF 92f2cb6c5d * finish task #2572. 2016-03-28 16:42:41 +08:00
wangyidong 4c06f689c4 Merge branch 'master' of github.com:easysoft/zentaopms 2016-03-28 09:28:43 +08:00
wangyidong be07c40bf7 * code for task #2561. 2016-03-28 09:27:09 +08:00
chenfeiCF 8d843914d4 * finish task #2543.
* adjust method name createGroupLink to createGroupManageMemberLink.
2016-03-25 17:27:08 +08:00
wangyidong 0f6e89bd70 - rm treeview.html.php. 2016-03-14 11:28:01 +08:00
wangyidong 1a8a8a0be4 * adjust mail style. 2016-03-11 17:31:39 +08:00
chenfeiCF 140a15b0be * change the dao property name for task #2458. 2016-03-09 16:50:36 +08:00
wangyidong e23311969d * change for new framework. 2016-03-01 10:57:53 +08:00
Catouse 334a0b1009 * change UI of mail content for user. 2016-02-23 16:55:50 +08:00
chenfeiCF d9ddbd0450 * finish task #2458. 2016-02-19 13:49:25 +08:00
wangyidong 26e611bee5 * finish task #1799. 2016-02-17 10:16:18 +08:00
chenfeiCF 86ee7a2055 * finish task #2503. 2016-02-15 15:21:29 +08:00
wangyidong 02ce779b65 * adjust code. 2015-11-26 13:29:29 +08:00
wangyidong 3c4c0e137e * finish task #2417. 2015-11-25 10:11:02 +08:00
chenfeiCF aa0b77bf28 * fix bug for task #2403. 2015-11-13 13:25:19 +08:00
wangyidong 603f64a618 * fix bug for tree. 2015-11-13 09:25:36 +08:00
chenfeiCF cb4e84a9da * finish task #2403. 2015-11-13 00:19:43 +08:00
wangyidong 275c833e02 * finish task #2394. 2015-11-12 10:14:43 +08:00
wangyidong 45fb1f0c92 * finish task #2380,2389,2390. 2015-11-11 11:07:59 +08:00
chenfeiCF 86b96a9640 * finish task #2388. 2015-11-10 15:29:41 +08:00
wangyidong e2c77e381c * change for compute password strength. 2015-11-06 14:30:55 +08:00
wangyidong 015401d1e0 * change zpl 1.1 to 1.2. 2015-11-05 14:09:52 +08:00
wangyidong 8593f3ce07 * adjust code for branch. 2015-10-29 15:28:08 +08:00
wangyidong e1d907628c * finish task #2346 2347 2348. 2015-10-28 14:33:06 +08:00
wangyidong 71240b18a7 * finish task #2351. 2015-10-27 14:15:05 +08:00
wangyidong 5029ba6b23 * finish task #2344. 2015-10-26 13:12:00 +08:00
wangyidong 66af5e5183 * finish task #2344. 2015-10-26 09:35:22 +08:00
wangyidong a1625710cb Merge branch 'master' of github.com:easysoft/zentaopms
*finish task #2342.

Conflicts:
	module/bug/control.php
2015-10-22 17:22:21 +08:00
wangyidong df23f3b43e * finish task #2341. 2015-10-22 16:38:39 +08:00
daitingting a56a0bde16 * finish task #2360. 2015-10-20 13:14:58 +08:00
wangyidong c03bce590c * finish task #2327. 2015-10-15 10:08:22 +08:00
wangyidong 0138d6f7f9 * fix a bug. 2015-09-23 11:01:00 +08:00
wangyidong 9cf05383df Merge branch 'master' of github.com:easysoft/zentaopms 2015-09-17 13:57:26 +08:00
Catouse 59fca8a35c * update chartjs. 2015-09-16 18:28:38 +08:00
wangyidong 44fae82506 + add for task #2285. 2015-09-16 16:36:59 +08:00
Catouse c67b0746e0 * change burn chart config. 2015-09-09 14:25:34 +08:00
Catouse 296f0ac78d * finish task #2274. 2015-09-09 12:03:59 +08:00
wangyidong 84d7e49211 * finish task #2278. 2015-09-07 14:10:37 +08:00
wangyidong 08f665a20f * finish task #2281. 2015-09-06 13:32:35 +08:00
wangyidong bf21838118 * finish task #2285. 2015-09-02 13:13:58 +08:00
wangyidong 34cbd724fd * finish task #2287. 2015-09-02 10:41:44 +08:00
wangyidong 0df81600ae * finish task #2296. 2015-08-28 15:55:31 +08:00
wangyidong d83b92be9a * finish task #2319. 2015-08-26 17:01:27 +08:00
wangyidong 5396c4bc3f * fix a bug. 2015-08-14 09:02:48 +08:00