Commit Graph
1968 Commits
Author SHA1 Message Date
z a235dd7718 Merge branch 'master' of github.com:easysoft/zentaopms 2020-07-13 16:27:06 +08:00
z a76b09bef2 * adjust code for flow. 2020-07-13 16:21:10 +08:00
tianshujie98 a4b52c7e87 Finish task #7413,7394,7391,7384,7381. 2020-07-13 14:21:29 +08:00
z dd10375298 Merge branch 'master' of github.com:easysoft/zentaopms 2020-07-09 17:38:27 +08:00
z 95d668557e * fix error. 2020-07-09 17:38:04 +08:00
chenfei 7cd810d3d1 * Fix bug #3255. 2020-07-09 13:57:20 +08:00
z 7cd8ff8f4e Merge branch 'master' of github.com:easysoft/zentaopms 2020-07-07 11:25:41 +08:00
z c43f0fd426 * adjust for zh-tw lang. 2020-07-07 11:24:23 +08:00
chenfei 604a766d01 * Fix bug #3192. 2020-07-07 10:03:51 +08:00
z 3aca3ee0cc * finish task #7301. 2020-07-03 13:07:49 +08:00
z 5907a27f8f * finish task #7278. 2020-06-19 16:43:08 +08:00
z ceea9745a1 * finish task #7261. 2020-06-17 14:15:16 +08:00
wangyidong 7a9cc4070a * fix for security weaknesses. 2020-05-28 09:52:41 +08:00
wangyidong 65c64de03a * add new version and upgrade. 2020-05-15 13:03:14 +08:00
wangyidong 0afd583d8f * finish task #7195. 2020-05-13 14:07:20 +08:00
leiyong b3b567bc89 * Finish task#7201,task#7189,task#7188,task#7185. 2020-05-10 23:57:42 -07:00
wangyidong dcbb7e9eb5 + add extension link for en. 2020-05-09 08:36:42 +08:00
leiyong 6a2ce5fade * Finish task#7105. 2020-04-30 01:47:19 -07:00
wangyidong dfc8de0b65 * finish task #7085. 2020-04-30 16:42:52 +08:00
wangyidong 2f3e0b3199 Merge branch 'master' of github.com:easysoft/zentaopms 2020-04-13 11:04:23 +08:00
wangyidong 3aded5bbff * fix vi lang bug. 2020-04-13 11:03:40 +08:00
Catouse 4e54cf859f * fix code syntax highlighter not work. 2020-04-13 10:27:22 +08:00
wangyidong 523162eac5 * add new version and upgrade and add vi lang. 2020-04-10 13:55:45 +08:00
wangyidong 74bd767a6e * adjust for en and zh-tw lang. 2020-04-08 14:36:37 +08:00
wangyidong 54cb29a788 * adjust for highlight and add story reg. 2020-04-08 10:39:28 +08:00
wangyidong 40fc4ad25b * adjust code. 2020-04-08 09:18:45 +08:00
wangyidong c9ce71628f * add priv for commitResult. 2020-04-03 09:01:47 +08:00
wangyidong d649cbcbaa * adjust for show unit. 2020-04-02 16:50:43 +08:00
wangyidong 990e33afcc * add commit result interface. 2020-04-01 13:35:58 +08:00
wangyidong 7749555f92 * code for task #7006. 2020-03-30 16:11:36 +08:00
wangyidong 5c47c2117a * finish task #7001. 2020-03-27 14:01:50 +08:00
wangyidong 36c0406829 Merge branch 'master' of github.com:easysoft/zentaopms 2020-03-18 16:49:01 +08:00
wangyidong 9e83e63996 * code for php7.4. 2020-03-18 16:48:14 +08:00
reneeteng f689b06e76 Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-03-18 15:51:17 +08:00
reneeteng 2ced016c37 * CI compile lang file changed. 2020-03-18 15:50:26 +08:00
Catouse 3f608337a0 * fix js error in french language. 2020-03-18 09:35:35 +08:00
wangyidong 904df3224b * add new version and upgrade. 2020-03-10 15:14:18 +08:00
wangyidong 31aba45ddc * move integration to job. 2020-03-06 17:35:33 +08:00
wangyidong 9ca7867c12 * code for task #6928. 2020-03-04 08:55:45 +08:00
wangyidong 4060222577 * code task #6928. 2020-03-04 08:53:32 +08:00
wangyidong cb25b5af7f * finish task #6956. 2020-03-03 16:11:23 +08:00
wangyidong 154efa0b59 * finish task #6957. 2020-03-02 09:05:30 +08:00
wangyidong d0b2b96283 * finish task #6919. 2020-02-28 16:15:01 +08:00
wangyidong fb8d617515 * finish task #6918. 2020-02-28 16:07:37 +08:00
wangyidong 172a9724e2 * code for task #6912,6913,6914,6916. 2020-02-28 15:05:56 +08:00
wangyidong e2c02c246b Merge branch 'master' into zentaopms_12.0.1 2020-02-26 18:27:08 +08:00
wangyidong e94de08b07 * code for task #6863. 2020-02-25 08:40:28 +08:00
wangyidong 17107567a5 * code for task #6893. 2020-02-24 17:24:29 +08:00
wangyidong 928147ac91 * finish task #6891. 2020-02-20 15:09:25 +08:00
wangyidong 3b577dcc98 * finish task #6863. 2020-02-13 16:52:10 +08:00