Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
9,772 Commits 2 Branches 292 Tags
b91e47c2e706ae5e32d5e5cf405ae14fc91acaae
Commit Graph
1278 Commits
Author SHA1 Message Date
wangyidong da39880a1c * adjust code for zentaobiz and fix bug. 2017-08-08 08:21:58 +08:00
sgm0422 c0a3efe859 * Fix bug: change 'limit' to 'LIMIT'. 2017-08-03 15:09:52 +08:00
wangyidong f77214be22 * adjust for merge ext model. 2017-07-28 13:37:05 +08:00
pengjiangxiu 361521adee * Adjust code. 2017-07-25 13:35:16 +08:00
pengjiangxiu bc5f724eaa * Fix bug #1127. 2017-07-24 17:02:57 +08:00
pengjiangxiu 472c167bbd * Adjust code. 2017-07-20 16:03:10 +08:00
pengjiangxiu fcd9281b12 * Adjust code. 2017-07-19 11:16:26 +08:00
pengjiangxiu 1b5465b57b * Finish task #3078. 2017-07-17 10:54:17 +08:00
wangyidong 5924091515 * adjust for framework and fix bug for search use today. 2017-07-05 13:17:45 +08:00
wangyidong c27f1f7d34 * merge zentaophp to zentao. 2017-06-09 17:05:37 +08:00
wangyidong 02bd73a67b * change for upgrade. 2017-05-22 09:53:16 +08:00
daitingting fc5c2a964c * Adjust conflict. 2017-05-16 14:55:06 +08:00
daitingting 58b0e33efc Merge branch 'master' of https://github.com/easysoft/zentaopms 
Conflicts:
	module/common/lang/en.php
	module/common/lang/zh-cn.php
 2017-05-16 14:51:26 +08:00
daitingting d49867fc20 * Add english language. 2017-05-16 14:43:45 +08:00
wangyidong 12c288a4e7 * change for upgrade. 2017-05-16 14:27:53 +08:00
daitingting 07cebfea4a * Adjust fixed menu. 2017-05-16 13:03:04 +08:00
daitingting 917fc19011 * Adjust high light. 2017-05-16 09:53:51 +08:00
wangyidong aa02e6a8c3 * fix bug. 2017-05-15 16:25:08 +08:00
wangyidong 954539c4c8 * adjust for safe. 2017-05-15 16:22:43 +08:00
daitingting 954a16cd15 * Revert loadConfigFromDB function. 2017-05-15 11:30:24 +08:00
daitingting b378b53307 * Adjust menu for onlyTest. 2017-05-12 14:45:57 +08:00
daitingting 0d819537d0 * Adjust codes. 2017-05-11 16:19:20 +08:00
daitingting 0cdba9950f Merge branch 'master' of https://github.com/easysoft/zentaopms 2017-05-10 14:48:18 +08:00
daitingting b1fea69e50 * Unset index of product. 2017-05-10 14:48:03 +08:00
Catouse 95a46cfa91 * update datatable files and change default option. 2017-05-10 10:29:26 +08:00
Catouse fee91475f7 * fix datatable cells height. 2017-05-10 09:26:34 +08:00
Catouse 1070b1ebc3 * improve pie chart perfermance. 2017-05-09 17:27:18 +08:00
daitingting 35ca3e4479 * Add english lang. 2017-05-09 17:11:45 +08:00
daitingting 28ce46a835 * Display todo module all the time. 2017-05-09 16:41:53 +08:00
daitingting 2aea5825e7 * Adjust menus. 2017-05-09 15:40:23 +08:00
daitingting ea576aec26 * Disabled novice when working is not full. 2017-05-09 14:30:29 +08:00
daitingting d78dcc6e45 * Adjust codes. 2017-05-09 14:03:17 +08:00
daitingting 8624ceb224 * Adjust codes for test working. 2017-05-08 15:08:42 +08:00
daitingting ce174f973c * Set as working as only test. 2017-05-05 12:09:19 +08:00
daitingting fa4671b824 Merge branch 'master' of https://github.com/easysoft/zentaopms 2017-05-03 17:36:20 +08:00
daitingting 2e5e8ec5a4 * Set working. 
* Set as only task.
 * Set as only story.
 2017-05-03 17:35:37 +08:00
wangyidong 842c811c75 * code for task #2982. 2017-05-03 16:45:34 +08:00
wangyidong 2c0696ba21 * code for task #2994. 2017-05-03 15:53:21 +08:00
wangyidong 099bd94ebb Finish task#2994 禅道如果和然之集成后，样式做调整,cost:3 left:0 2017-05-03 14:39:38 +08:00
wangyidong 01163fe166 Fix bug#1045 kindeditor.html.php 单词拼写错误 2017-04-21 15:40:26 +08:00
wangyidong 5b39baaade * adjust for print mobile order link. 2017-04-18 10:13:03 +08:00
wangyidong 2d18b2945c * change for add new version and upgrade it. 2017-04-10 09:30:24 +08:00
wangyidong df32a9cc94 Merge branch 'master' of github.com:easysoft/zentaopms 2017-04-05 10:02:54 +08:00
wangyidong 0f1d1dd275 * change for web. 2017-04-05 09:51:33 +08:00
chenfeiCF f3a62a9e30 * add lang item for 'required'. 2017-03-30 13:07:01 +08:00
chenfeiCF 1fdea7c0c6 * add lang item for sort. 2017-03-29 15:17:48 +08:00
chenfeiCF 0b544fad55 * add lang item for pager object. 2017-03-29 14:27:03 +08:00
chenfeiCF e7bad1c238 * adjust code for code refactoring of mobile web. 2017-03-28 16:19:35 +08:00
chenfeiCF 3b6ab707ff * delete useless mobile web file. 2017-03-28 09:43:12 +08:00
wangyidong 65cffaf22b * fix bug #1024. 2017-03-24 16:58:46 +08:00