Commit Graph

1345 Commits

Author SHA1 Message Date
滔哥
1de783bf74 * Fix bug 2017-12-15 15:15:08 +08:00
wangyidong
11d80a5d93 * finish task #3442. 2017-12-14 15:29:09 +08:00
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
滔哥
acf1410e59 * Change style 2017-12-06 16:32:11 +08:00
滔哥
1132bf8c7e * Task #3430 2017-12-06 10:45:38 +08:00
滔哥
ea28589fd9 * Task #3430 2017-12-06 09:42:54 +08:00
滔哥
7358ada1f6 * Task #3464 2017-12-05 22:45:15 +08:00
tengfei
5c8b72ddf0 translation error 12/5 2017-12-05 17:34:48 +08:00
tengfei
ee44254608 Merge branch 'master' of https://github.com/easysoft/zentaopms 2017-12-05 11:26:51 +08:00
tengfei
232d00dbcd translation minor error 2017-12-05 11:24:06 +08:00
wangyidong
e8e24b9109 * fix for datatable check. 2017-12-04 16:37:35 +08:00
tengfei
5a4f5057d6 “minor change 2017-11-27 17:08:29 +08:00
wangyidong
5d63380722 * add commonModel::http method. 2017-11-23 16:52:34 +08:00
Catouse
78b4295e65 * finish task #3342. 2017-11-10 17:04:44 +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
Xiying Guan
f1ba417162 * Format codes. 2017-11-08 13:28:26 +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
wangyidong
27f93a8e7f * fix upgrade. 2017-11-06 09:52:35 +08:00
liugang
58ad5f6374 * Fix bug. 2017-11-03 17:41:48 +08:00
liugang
c5c3f585c4 * Finish task #3303. 2017-11-02 17:38:11 +08:00
liugang
5805beb7ca Merge branch 'master' of https://github.com/easysoft/zentaopms 2017-11-02 11:37:02 +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
滔哥
7aa86734db * fix score module 2017-11-01 19:31:59 +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
wangyidong
48024e6cf8 Finish task#3273 操作受限用户无法创建待办和日志,cost:1 left:0 2017-10-25 10:48:31 +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
滔哥
984f3940c9 change .gitignore 2017-10-20 14:31:55 +08:00
wangyidong
b965b706a8 Finish task#3252 管理员可以将自己的菜单配置作为公共的配置,cost:3 left:0 2017-10-19 14:31:03 +08:00
liugang
29cd0d4b4e * Add entry and webhook module. 2017-10-19 10:41:29 +08:00