Commit Graph

420 Commits

Author SHA1 Message Date
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
滔哥
029150bb5b Merge branch 'master' of https://github.com/easysoft/zentaopms 2017-10-25 09:49:32 +08:00
滔哥
2d0dbe98e0 * + score sql 2017-10-25 09:49:28 +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
滔哥
492bf6e956 * Task Bug 2017-10-23 16:50:48 +08:00
滔哥
9ba2bbdb9e add database change 2017-10-20 14:12:39 +08:00
liugang
912548e494 * Add update sql. 2017-10-16 16:52:10 +08:00
wangyidong
f4828cf504 * adjust for db. 2017-09-26 16:44:45 +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
848f5b4664 * Finish task #3121. 2017-08-15 10:19:31 +08:00
pengjiangxiu
184fbce147 + Add update9.4.sql 2017-08-14 14:32:20 +08:00
pengjiangxiu
ca2a3528de * finish task #3076. 2017-07-15 10:13:41 +08:00
wangyidong
12c288a4e7 * change for upgrade. 2017-05-16 14:27:53 +08:00
daitingting
0f69430683 * Adjust time of the daily remind. 2017-04-27 14:08:11 +08:00
daitingting
10bb432212 * Add sort function for doclib. 2017-04-25 14:10:08 +08:00
wangyidong
94842924b4 * change whitelist field to text. 2017-04-19 13:23:00 +08:00
wangyidong
4c12bcb111 * change for upgrade. 2017-04-19 11:23:00 +08:00