Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
16,739 Commits 2 Branches 292 Tags
ae2c117104763d8cf683dcde6f8a7fec00337651
Commit Graph
16739 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
wangyidong ae2c117104 * finish task #6640. 2019-12-05 14:26:30 +08:00
wangyidong 34fb809d31 * die for apiModel sql method. 2019-12-05 14:25:42 +08:00
wangyidong bedeaaf39e * code for tutorial. 2019-12-05 13:16:27 +08:00
wangyidong 7d6913d91c * finish task #6656. 2019-12-05 11:25:12 +08:00
wangyidong 2115b47e59 * adjust style for edit module. 2019-12-05 10:18:08 +08:00
wangyidong ebde890513 * finish task #6658. 2019-12-05 09:58:47 +08:00
wangyidong 5b2cdc573f * finish task #6659. 2019-12-05 09:33:32 +08:00
wangyidong 3d68e30c67 * finish task #6650. 2019-12-05 09:13:32 +08:00
wangyidong a4cf41780c * fix error. 2019-12-05 08:58:44 +08:00
wangyidong 329fa9056e * fix for pro login. 2019-12-05 08:58:10 +08:00
wangyidong 68de6d0ff2 * code for task #6638. 2019-12-04 17:27:44 +08:00
wangyidong e97a72469e * adjust bug for show task module. 2019-12-04 16:42:25 +08:00
wangyidong ef36818cad * fix sql error. 2019-12-04 16:33:31 +08:00
wangyidong 36c1a6d2c4 * finish task #6647. 2019-12-04 16:10:06 +08:00
wangyidong 7276d8fbf8 * finish task #6646. 2019-12-04 15:43:16 +08:00
wangyidong 2bfbd7b122 * finish task #6641. 2019-12-04 15:12:30 +08:00
wangyidong 71fffa5458 * finish task #6638. 2019-12-04 15:03:29 +08:00
wangyidong de4818c724 * finish task #6637. 2019-12-04 14:47:33 +08:00
wangyidong 32d9b71668 * finish task #6630. 2019-12-04 13:52:35 +08:00
wangyidong 023ae5e5ac Merge branch 'master' of github.com:easysoft/zentaopms 2019-12-04 13:30:02 +08:00
wangyidong 6f205e288b * finish task #6629. 2019-12-04 13:28:51 +08:00
reneeteng d165267bc5 * Update German and French install files. 2019-12-04 13:23:43 +08:00
reneeteng 41479d2d00 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-12-04 13:17:31 +08:00
reneeteng eaf3d47dd0 * Removed whatsapp group info. 2019-12-04 13:17:01 +08:00
wangyidong c844b24c46 * finish task #6625. 2019-12-04 13:15:44 +08:00
wangyidong e8db459f5f * finish task #6622. 2019-12-04 11:33:00 +08:00
wangyidong 9f558c040b Merge branch 'master' of github.com:easysoft/zentaopms 2019-12-04 11:25:38 +08:00
wangyidong abbc224527 * code for task #6621. 2019-12-04 11:18:45 +08:00
wangyidong b404be6e74 * finish task #6621. 2019-12-04 11:16:59 +08:00
reneeteng da0a587cdd * Update twitter account. 2019-12-04 10:57:31 +08:00
wangyidong c7f0afe423 * finish task #6613. 2019-12-04 10:32:42 +08:00
wangyidong fd139c56a1 * finish task #6616. 2019-12-03 16:58:28 +08:00
wangyidong 2241f96e67 * finish task #6617. 2019-12-03 16:53:22 +08:00
wangyidong 5af6fc1218 * finish task #6611. 2019-12-03 11:45:28 +08:00
wangyidong b0ed590dc9 * fix bug. 2019-12-03 11:11:42 +08:00
wangyidong 0d4a3595d5 * finish task #6610. 2019-12-03 10:07:24 +08:00
wangyidong 2af0928cba * code for task #6608. 2019-12-03 10:02:06 +08:00
wangyidong 0826cc3ca3 * finish task #6609. 2019-12-03 09:58:39 +08:00
wangyidong 09a7bb1136 * fix bug #2884. 2019-12-03 09:57:35 +08:00
wangyidong 9621e5e4fa * finish task #6608. 2019-12-03 09:33:12 +08:00
wangyidong d4b9ccbab8 * finish task #6606. 2019-12-02 17:05:26 +08:00
wangyidong e4ce5d1c02 * finish task #4438. 2019-12-02 13:27:43 +08:00
wyd621 d046d52707 Merge pull request #41 from shus521/master 
[bug修复]当计划绑定多个项目时，计划列表显示的总条数(recTotal)不正确，需进行去重处理
 2019-11-29 16:34:23 +08:00
shilei 8a9ece9db2 [bug修复]当计划绑定多个项目时，计划列表显示的总条数(recTotal)不正确，需进行去重处理 2019-11-29 16:16:40 +08:00
wangyidong 01e942c2c9 * adjust for integrate xuanxuan. zentaopms_11.7.stable_20191129 2019-11-29 14:58:20 +08:00
wangyidong 1ff4817d15 * fix for change password in xx. 2019-11-29 14:27:48 +08:00
Catouse e6a04c0a6a * fix getUserByUserID undefined error. 2019-11-29 13:31:11 +08:00
wangyidong 97f125b3b4 * change for merge xuanxuan. 2019-11-29 13:15:21 +08:00
wangyidong 7412623596 * adjust for xuanxuan. 2019-11-29 11:02:15 +08:00
wangyidong a5ef283e58 * adjust for xuanxuan. 2019-11-29 10:19:51 +08:00