Commit Graph

439 Commits

Author SHA1 Message Date
wangyidong
51ce938acc * adjust code and fix bug. 2018-02-08 08:25:02 +08:00
dajiao007
74adbfa8aa change demo user from 10->3 2018-02-07 13:43:17 +08:00
wangyidong
95ce4d6f70 * change for demo. 2018-01-18 10:16:46 +08:00
wangyidong
277dc2c2ec * change for upgrade. 2018-01-16 14:06:16 +08:00
滔哥
dd0d97a437 * Finish Task#3587. 2018-01-12 10:38:11 +08:00
滔哥
a63770647a * Fix sql. 2018-01-11 21:58:37 +08:00
滔哥
736c265302 * Task#3586. 2018-01-11 21:53:28 +08:00
滔哥
561fd66584 marage sql. 2018-01-10 08:35:02 +08:00
滔哥
70f18180d2 * Task#3576 2018-01-10 08:33:18 +08:00
wangyidong
b10b13b4b8 * finish task #3562. 2018-01-08 15:50:53 +08:00
wangyidong
fad9e34e8d * finish task #3585. 2018-01-03 16:40:27 +08:00
滔哥
345178901a * Finish Task#3552. 2017-12-29 16:21:56 +08:00
滔哥
b4a165b573 * Add install sql for Task#3561 2017-12-29 09:16:58 +08:00
滔哥
e5b312e326 * Add upgrade for Task#3561 2017-12-29 09:11:19 +08:00
滔哥
cbf08b828a * Task#3561 2017-12-28 18:03:48 +08:00
wangyidong
a42b0008c9 * adjust for demo. 2017-12-20 16:46:42 +08:00
wangyidong
32d218b92f * change for english demo. 2017-12-20 15:42:04 +08:00
滔哥
2c896fbe8f * Task #3456 Add SQL 2017-12-14 09:36:39 +08:00
wangyidong
3eba5feb13 * code for task #3476. 2017-12-13 11:33:55 +08:00
wangyidong
a8fb159310 * fix error. 2017-11-29 14:47:40 +08:00
wangyidong
daa396bbcb * fix db sql. 2017-11-17 12:29:12 +08:00
wangyidong
3da2a97b48 * change for 9.6.2 version. 2017-11-17 11:54:19 +08:00
wangyidong
19005ae853 * change for new version. 2017-11-13 09:05:30 +08:00
liugang
a82ce075b0 * Finish task #3325. 2017-11-10 10:51:29 +08:00
liugang
34f4a904fb Merge branch 'master' of https://github.com/easysoft/zentaopms 2017-11-09 15:17:39 +08:00
liugang
90211f67fa * Finish task #3337,3338,3357,3358,3365,3366,3367. 2017-11-09 15:16:22 +08:00
wangyidong
7dd879c8d6 * finish task #3334,3323. 2017-11-09 13:46:10 +08:00
滔哥
2799322a63 * Fix bug 2017-11-09 10:01:50 +08:00
Xiying Guan
f1ba417162 * Format codes. 2017-11-08 13:28:26 +08:00
liugang
e7e5d2501c * Adjust sql. 2017-11-07 10:52:22 +08:00
liugang
3279c1ab71 * Merge sql.Change version to 9.6 2017-11-06 09:18:55 +08:00
滔哥
1e94998fb5 * score rule add btn 2017-11-03 16:00:24 +08:00
滔哥
2feb6fc2a9 * score rule add btn 2017-11-03 15:59:51 +08:00
liugang
7a2487d656 * Upgrade from version 9.5.1. 2017-11-03 14:43:46 +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
滔哥
c5d9187baf * fix score module 2017-11-01 11:29:07 +08:00
滔哥
e3ea70b43a * change score module 2017-10-31 11:13:09 +08:00
滔哥
44bc56d7e0 Merge branch 'master' of https://github.com/easysoft/zentaopms 2017-10-31 10:04:00 +08:00
滔哥
3d0dff1420 * add score auth 2017-10-31 10:03:54 +08:00
wangyidong
b56bacb0e1 Merge branch 'master' of github.com:easysoft/zentaopms 2017-10-31 09:00:39 +08:00
wangyidong
aacff2955f Finish task#3239 项目需求可以拖动排序,cost:4 left:0 2017-10-31 09:00:21 +08:00
滔哥
2dc822ca73 Merge branch 'master' of https://github.com/easysoft/zentaopms 2017-10-31 07:31:32 +08:00
滔哥
d42cf9b277 * add score init 2017-10-31 07:31:28 +08:00
liugang
6dd2154233 * Add category to product. 2017-10-30 17:55:55 +08:00
liugang
7116d5b454 * Add function to avoid error when user cron to async send message. 2017-10-27 10:26:11 +08:00
liugang
14ab071b46 * Fix bugs.
+ Save log when an entry visit zentao.
2017-10-25 17:20:27 +08:00
liugang
9375676a66 * Fix bugs. 2017-10-25 15:06:47 +08:00
liugang
51db6a81b9 * Add api to send message to dingding. 2017-10-25 14:01:34 +08:00
liugang
9f355a2d3d Merge branch 'master' of https://github.com/easysoft/zentaopms 2017-10-25 12:01:12 +08:00
liugang
7212c1a4ac * Adjust sql. 2017-10-25 11:25:11 +08:00