Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
9,955 Commits 2 Branches 292 Tags
129834b30fae3ceb2b8fb87a118e018d15eb2321
Commit Graph
1294 Commits
Author SHA1 Message Date
wangyidong 06752d4cb3 * add new version and upgrade. 2017-09-26 13:45:32 +08:00
wangyidong 50460830e2 * adjust for limited user. 2017-09-26 11:08:11 +08:00
pengjiangxiu 41a2fc9a8f * Finish task #3210. 2017-09-19 13:56:39 +08:00
pengjiangxiu 16f87e721d * Finish task #3213. 2017-09-12 14:02:07 +08:00
pengjiangxiu a1570d6b75 * Finish task #3204. 2017-09-08 14:21:12 +08:00
wangyidong fc5ceafb4b Merge branch 'master' of github.com:easysoft/zentaopms 2017-09-04 14:46:41 +08:00
wangyidong ded7a07ad7 * adjust for oa. 2017-09-04 14:46:02 +08:00
sgm0422 c81685eaec Merge branch 'master' of https://github.com/easysoft/zentaopms 2017-08-28 17:06:13 +08:00
sgm0422 cdc0fb9707 *Fix Bug #1207. 2017-08-28 16:53:33 +08:00
wangyidong 49f8f606f6 * fix bug for ajax form. 2017-08-25 16:31:23 +08:00
pengjiangxiu ea306d3f3b * change lang file. 2017-08-24 14:03:58 +08:00
pengjiangxiu a96bb17752 * * Adjust for bug batch activate. 2017-08-24 09:40:53 +08:00
wangyidong 34b794e39a * fix error. 2017-08-22 13:44:34 +08:00
pengjiangxiu 7f6274c07d * Finish task #1201. 2017-08-18 15:10:07 +08:00
pengjiangxiu 282d166ac5 * Finish task #3131. 2017-08-16 16:26:46 +08:00
wangyidong bd622e3d23 * finish task #3086. 2017-08-16 09:36:51 +08:00
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