Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
29,285 Commits 2 Branches 292 Tags
fa32609ca09129d48ce43f774fe25d253aa040be
Commit Graph
1654 Commits
Author SHA1 Message Date
王怡栋 fde5cb61da Merge branch 'sprint/app10' into sprint/170 2021-11-19 08:41:00 +08:00
王怡栋 5f9b3ed654 * adjust for lang for api. 2021-11-05 13:11:42 +08:00
孙广明 5812a1e510 Merge branch 'sprint/170_tianshujie_43903' into 'sprint/170' 
* Finish task  #43903

See merge request easycorp/zentaopms!319
 2021-11-05 03:22:17 +00:00
tianshujie 0fa14065b2 * Modify the constant name of the branch trunk. 2021-11-05 11:20:22 +08:00
tianshujie 6cb70ab01d * Finish task #43903. 2021-11-05 08:59:55 +08:00
zhouxin 8fe8ad90af Finish task 43877. 2021-11-04 13:22:09 +08:00
王怡栋 3cdf3b3395 Merge branch 'sprint/167_wangyidong_api' into sprint/app10 2021-11-01 15:35:49 +08:00
root 6db04fa88e bug_15467 2021-11-01 09:29:45 +08:00
王怡栋 076f328914 * add lang for zentaoapp and adjust api. 2021-10-27 19:58:50 +08:00
liyuchun b32541f20f * Fix bug #15639. 2021-10-19 20:32:06 +08:00
zhujinyong fc2e75eeb8 * Fix languages. 2021-10-19 15:59:07 +08:00
王怡栋 6ee64dffe7 Merge branch 'api_doc' into sprint/167 2021-10-19 11:36:19 +08:00
hufangzhou c4824ba3d7 * Check the code for upgrade. 2021-10-18 13:11:07 +08:00
liyuchun cfdce3652f * Finish task #43187. 2021-10-14 13:51:47 +08:00
thanatos cb1613604f fix header action 2021-10-12 09:41:21 +08:00
zhujinyong 0c6c024bb1 * Fix menu vars. 2021-10-08 13:48:10 +08:00
zhujinyong 83d598745f * Finish task#43059. 2021-10-08 08:01:53 +08:00
thanatos 8a44a6dc95 fix bug 2021-09-17 13:25:40 +08:00
thanatos 0d116021db finish api doc. first commit 2021-09-16 16:10:49 +08:00
王怡栋 d2403a6b8e * add new version and upgrade. 2021-09-08 16:00:42 +08:00
Guan Xiying cef4ce5e1c * Add $lang->mr to common module. 2021-09-08 13:57:19 +08:00
dingguodong 314c3c593e Merge branch 'jihuMR' 2021-09-07 20:47:10 +08:00
lichengjun 7ca5893ce2 * Cancel GitLab SYNC Settings. 2021-09-07 00:44:34 +00:00
lichengjun 7e8705afcd Merge branch 'jihuMR' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihuMR 2021-09-06 05:26:41 +00:00
lichengjun f16eba5b09 * Add GitLab Merge Request Permission configuration. 2021-09-06 05:22:27 +00:00
dingguodong e664627f12 * Add en lang for MR in DevOps menu. 2021-09-06 11:31:56 +08:00
liyuchun f7aeb1da12 * Finish task #42133. 2021-09-03 13:25:20 +08:00
xieqiyu 29c4191416 * Fix bug#14781. 2021-09-01 13:10:18 +08:00
tianshujie 42db6b50eb * Fix bug #14820. 2021-08-31 16:02:11 +08:00
tianshujie 2305c6c5b2 * Fix bug #14726. 2021-08-31 09:50:57 +08:00
xieqiyu cea6248bc0 * Finish task#41684. 2021-08-27 21:28:29 +08:00
xieqiyu 9638d2ff94 * Code for task#41787. 2021-08-27 19:37:54 +08:00
sgm0422 d5589f7157 * Finish task #41727. 2021-08-27 15:01:55 +08:00
王怡栋 0a9b1f42ac * fix bug #14682. 2021-08-27 10:20:27 +08:00
孙广明 4b230745c1 * Code for task #41775. 2021-08-26 15:45:59 +08:00
liyuchun 23704ad6a5 * Fix bug #14666. 2021-08-26 10:08:42 +08:00
holan20180123 491f2df2dd * Finish task #41774. 2021-08-24 14:07:01 +08:00
qiyu-xie b304b97f61 * Finish task#41780. 2021-08-24 08:50:28 +08:00
hufangzhou 4f51d890b1 * Finish task #41779. 2021-08-23 16:09:19 +08:00
hufangzhou 7ea1822892 * Finish task #41784. 2021-08-23 15:08:09 +08:00
dingguodong 615ba5eac4 * Correct menu display of MR. 2021-08-23 15:00:33 +08:00
王怡栋 75f004f38a * add new version and upgrade. 2021-08-23 10:24:12 +08:00
sgm0422 fb56ac9301 * Finish task #41778. 2021-08-23 09:33:03 +08:00
reneeteng 8dc96ee49b Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-08-18 15:42:22 +08:00
reneeteng 354b119a2c Merge branch 'master' of https://github.com/easysoft/zentaopms 2021-08-17 10:03:12 +08:00
qiyu-xie 479edc3eff * Distinguish the name of the execution library. 2021-08-16 17:58:00 +08:00
holan20180123 1b4eba82ba * Finish task #41439. 2021-08-16 13:46:31 +08:00
qiyu-xie 40f1d0e5d7 * Finish task#41427. 2021-08-16 13:40:46 +08:00
qiyu-xie 152d774391 * Task#41216. 2021-08-12 18:13:55 +08:00
dingguodong 685f11f3e5 * Add MR to DevOps menu. 2021-08-12 12:15:01 +08:00