Commit Graph

17135 Commits

Author SHA1 Message Date
wangyidong
e94de08b07 * code for task #6863. 2020-02-25 08:40:28 +08:00
wangyidong
d9f45acdb5 * code for task #6893. 2020-02-24 17:32:11 +08:00
wangyidong
17107567a5 * code for task #6893. 2020-02-24 17:24:29 +08:00
wangyidong
73c47578bf Merge branch 'master' of github.com:easysoft/zentaopms 2020-02-24 17:11:12 +08:00
wangyidong
c4dc4b6545 * finish task #6893. 2020-02-24 17:10:35 +08:00
Yagami
6e046a1671 Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-02-24 14:12:45 +08:00
Yagami
7b2949916b * Fix for sql injection attack. 2020-02-24 14:09:11 +08:00
wangyidong
c001e75780 * finish task #6856. 2020-02-21 12:27:05 +08:00
wangyidong
c99bc8209e * code for task #6889. 2020-02-21 10:06:30 +08:00
wangyidong
cb6d24b7ff * code for task #6888. 2020-02-20 15:34:00 +08:00
wangyidong
928147ac91 * finish task #6891. 2020-02-20 15:09:25 +08:00
reneeteng
310c31b8ec * License contact changed. 2020-02-18 17:18:31 +08:00
Yagami
08858a2255 * Fix my-task list width. 2020-02-18 15:32:56 +08:00
wangyidong
a7120e1e4d * code for task #6890. 2020-02-18 13:15:06 +08:00
wangyidong
d0652826ac * finish task #6905,6895. 2020-02-18 11:37:37 +08:00
wangyidong
205245f86f * add blame link. 2020-02-14 13:36:50 +08:00
wangyidong
cb642cff44 * code for task #6870. 2020-02-14 11:48:47 +08:00
wangyidong
d8d4cbf890 * finish task #6871. 2020-02-14 10:45:35 +08:00
wangyidong
bf705c1f1c * finish task #6872. 2020-02-14 09:29:43 +08:00
wangyidong
24f67c7441 * change for priv. 2020-02-13 17:18:44 +08:00
wangyidong
ec536afaa0 * finish task #6859. 2020-02-13 17:07:37 +08:00
wangyidong
3b577dcc98 * finish task #6863. 2020-02-13 16:52:10 +08:00
wangyidong
785a479c5b * finish task #6863. 2020-02-13 16:50:11 +08:00
Catouse
e2454a097b * update zui.js. 2020-02-12 11:13:05 +08:00
wangyidong
097e2af3a0 Merge branch 'master' of github.com:easysoft/zentaopms 2020-02-11 15:13:47 +08:00
wangyidong
5d97280b3a * Fix error. 2020-02-11 15:12:58 +08:00
aaronchen2k
da7eb8d364 fix issues report when code review 2020-02-11 14:56:25 +08:00
aaronchen2k
bad736c081 Merge remote-tracking branch 'origin/master' 2020-02-11 14:48:24 +08:00
aaronchen2k
777d34a30f fix issues report when code review 2020-02-11 14:47:55 +08:00
wangyidong
6a91d77a31 * adjust code. 2020-02-11 12:04:24 +08:00
aaronchen2k
b7f1e002c7 Merge remote-tracking branch 'origin/master' 2020-02-11 09:35:46 +08:00
aaronchen2k
8705944e92 fix issues report when code review 2020-02-11 09:35:36 +08:00
wangyidong
1a36b088c6 Merge branch 'master' of github.com:easysoft/zentaopms 2020-02-11 09:26:11 +08:00
wangyidong
3111c7e36b * change for build zentaoxx. 2020-02-11 09:25:38 +08:00
aaronchen2k
e0ae913838 fix issues report when code review 2020-02-11 09:03:09 +08:00
aaronchen2k
cf2ad7c12d Merge remote-tracking branch 'origin/master' 2020-02-11 08:46:35 +08:00
aaronchen2k
ac4248fbe8 fix issues report when code review 2020-02-11 08:46:17 +08:00
aaronchen2k
95b46e92fd update 2020-02-10 15:27:20 +08:00
wangyidong
5b4c2874e8 * fix error. 2020-02-10 15:15:08 +08:00
aaronchen2k
22a510b5fa update 2020-02-10 15:08:52 +08:00
aaronchen2k
77eddecece update 2020-02-10 15:06:52 +08:00
wyd621
457c6dd578 Merge pull request #44 from easysoft/zentaopms_ci_dev
Zentaopms ci dev
2020-02-10 14:41:18 +08:00
wyd621
ac0edaa7b9 Merge branch 'master' into zentaopms_ci_dev 2020-02-10 14:40:44 +08:00
wangyidong
383538685b * fix bug for repo-view. 2020-02-07 14:11:23 +08:00
wangyidong
68b0fa26f3 * marge from master. 2020-02-07 10:58:58 +08:00
wangyidong
00799f1f7b * fix error. 2020-02-07 09:12:41 +08:00
leiyong
ab65bcd24f Merge branch 'master' of github.com:easysoft/zentaopms 2020-02-06 14:12:54 +08:00
leiyong
03e06b6e7d Fix bug #2941,#2937. 2020-02-06 14:12:23 +08:00
wangyidong
6560eff7d2 * finish task #9790 for zentaobiz. 2020-02-06 10:59:04 +08:00
wangyidong
92f366b767 * code for task #6849. 2020-02-06 09:01:41 +08:00