Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
10,490 Commits 2 Branches 292 Tags
f7080930b14c2d5e88198f31f60c7e3f9d1468db
Commit Graph
623 Commits
Author SHA1 Message Date
tengfei 7dacfb2f78 action-common 2017-12-13 09:54:06 +08:00
滔哥 e45eb3ab2a * Task#3500 2017-12-07 14:26:57 +08:00
tengfei 522f28dd39 Merge branch 'master' of https://github.com/easysoft/zentaopms 2017-12-06 17:47:50 +08:00
tengfei 8314d813cb 12/6 trans error done 2017-12-06 17:47:31 +08:00
滔哥 1132bf8c7e * Task #3430 2017-12-06 10:45:38 +08:00
滔哥 ea28589fd9 * Task #3430 2017-12-06 09:42:54 +08:00
tengfei 5c8b72ddf0 translation error 12/5 2017-12-05 17:34:48 +08:00
tengfei 232d00dbcd translation minor error 2017-12-05 11:24:06 +08:00
tengfei 5a4f5057d6 “minor change 2017-11-27 17:08:29 +08:00
wangyidong 97d490f008 * change for zh-tw lang. 2017-11-10 15:49:48 +08:00
wangyidong 9c8f506fbe * fix bug #1125. 2017-11-10 14:08:00 +08:00
滔哥 533cc18eb3 * Fix bug 2017-11-10 10:26:30 +08:00
wangyidong 87e4abfcb8 Merge branch 'master' of github.com:easysoft/zentaopms 2017-11-09 16:46:51 +08:00
liugang 90211f67fa * Finish task #3337,3338,3357,3358,3365,3366,3367. 2017-11-09 15:16:22 +08:00
wangyidong c2e05057f5 * finish task #3341. 2017-11-09 15:11:08 +08:00
liugang 6dc6d6126f Merge branch 'master' of https://github.com/easysoft/zentaopms 2017-11-06 10:18:17 +08:00
liugang 130f1f1b33 * Make tmp dir when execute makefile. 2017-11-06 10:17:26 +08:00
wangyidong fbc5b38585 * change for zh-tw lang. 2017-11-06 10:13:16 +08:00
liugang c5c3f585c4 * Finish task #3303. 2017-11-02 17:38:11 +08:00
liugang e8cdfe2bff + Add en lang files. 
* Finish task 3292,3293,3294,3305,3306,3307,3308,3309.
 2017-11-02 11:35:52 +08:00
滔哥 3b246f43f1 Merge branch 'master' of https://github.com/easysoft/zentaopms 2017-10-31 21:15:18 +08:00
liugang 34b3df57e2 * Remove category from module menu. 2017-10-31 16:33:58 +08:00
滔哥 3d0dff1420 * add score auth 2017-10-31 10:03:54 +08:00
liugang 6dd2154233 * Add category to product. 2017-10-30 17:55:55 +08:00
滔哥 d9290cbf9b * + score in all model 2017-10-27 11:15:28 +08:00
liugang c4f435237e Merge branch 'master' of https://github.com/easysoft/zentaopms 2017-10-26 17:55:18 +08:00
liugang 8f6026ca78 + Add api.php as entrance. 2017-10-26 17:54:34 +08:00
滔哥 fc52d683c7 Merge branch 'master' of https://github.com/easysoft/zentaopms 2017-10-26 17:26:12 +08:00
滔哥 001057edb0 * + my score log 2017-10-26 17:26:09 +08:00
wangyidong b4379937b5 Finish task#3278 增加项目->需求看板模式。,cost:4 left:0 2017-10-26 08:55:43 +08:00
liugang 37bb58a23e Merge branch 'master' of https://github.com/easysoft/zentaopms 2017-10-24 18:02:30 +08:00
liugang a259217bdf + Post data when hook is triggered. 
+ Add log.
 2017-10-24 18:01:56 +08:00
滔哥 cf94b99b5b es->ea 2017-10-23 13:37:34 +08:00
liugang 29cd0d4b4e * Add entry and webhook module. 2017-10-19 10:41:29 +08:00
wangyidong 06752d4cb3 * add new version and upgrade. 2017-09-26 13:45:32 +08:00
wangyidong ded7a07ad7 * adjust for oa. 2017-09-04 14:46:02 +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 282d166ac5 * Finish task #3131. 2017-08-16 16:26:46 +08:00
pengjiangxiu 361521adee * Adjust code. 2017-07-25 13:35:16 +08:00
pengjiangxiu 472c167bbd * Adjust code. 2017-07-20 16:03:10 +08:00
wangyidong 5924091515 * adjust for framework and fix bug for search use today. 2017-07-05 13:17:45 +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