Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
38,950 Commits 2 Branches 292 Tags
e71094decc62221da5fc2e4aff3a548806e905ca
Commit Graph
376 Commits
Author SHA1 Message Date
wangyidong 50ec57b390 * code for story #32387. 2022-05-12 19:04:44 +08:00
孙广明 700b2d6bb1 Merge branch 'master' into 'liyuchun_fixbug_22074' 
# Conflicts:
#   lib/filter/filter.class.php
 2022-04-28 10:34:02 +00:00
liyuchun 83fa4afc83 * Fix bug #17968. 2022-04-28 09:02:44 +00:00
tianshujie 1546b92f17 * Delete extra blank lines. 2022-04-28 11:16:18 +08:00
tianshujie c8bae4538a * Restore code. 2022-04-28 11:15:29 +08:00
tianshujie 7f7a50ea12 * Fix bug #2795. 2022-04-28 11:02:38 +08:00
王怡栋 004b18989b Merge branch 'sprint/fixbug_hufangzhou_19260' into 'master' 
* Fix bug #19260.

See merge request easycorp/zentaopms!2849
 2022-04-11 08:02:24 +00:00
hufangzhou c214a1f5e3 * Fix bug #19260. 2022-04-11 11:14:24 +08:00
songchenxuan 419c95e8f9 * Translate lang. 2022-04-11 11:10:32 +08:00
tanghucheng f1449d3b6b * Fix bug. 2022-03-30 09:09:04 +08:00
zenggang 1d9f6dd503 * Adjust code 2022-03-23 08:27:30 +00:00
zenggang 1357480ac6 * Finish task#51109,51108,51128 2022-03-23 07:54:03 +00:00
caoyanyi 203a3607d8 * Adjust codes. 2022-03-23 11:32:56 +08:00
caoyanyi 290ff3677c * Fix bug #18018. 2022-03-23 09:37:53 +08:00
liyuchun 0187fb80c7 Merge branch 'devops24' 2022-03-22 08:28:32 +08:00
caoyanyi 5865f3ab34 * Fix bug #20588. 2022-03-18 14:26:57 +08:00
王怡栋 b3cca161cc * adjust for install page in lite. 2022-03-18 09:49:05 +08:00
tanghucheng fb78d74984 * Fix bug. 2022-03-11 15:48:25 +08:00
tanghucheng c81a8d5edf * Fix bug. 2022-03-11 15:21:29 +08:00
tanghucheng cd84fb4d54 * Fix bug. 2022-03-11 15:09:17 +08:00
hufangzhou 9eb99fed12 * Fix bug #20442. 2022-03-09 17:13:18 +08:00
孙广明 df55b0af1b Merge branch '185' 2022-02-28 08:58:20 +08:00
tianshujie b7c3e92e95 * Modify version judgment logic. 2022-02-24 16:17:26 +08:00
songchenxuan 50d78a0fa0 *Check api lang. 2022-02-22 14:20:41 +08:00
zhujinyong 002e215a3d * Move die to return. 2022-02-22 09:02:00 +08:00
zhujinyong d02ddc138c Merge branch 'lite' into sprint/185 2022-02-17 10:20:50 +08:00
王怡栋 936e1e21e1 * code for task #48841. 2022-02-15 10:47:50 +08:00
songchenxuan 73207475ae *International lang. 2022-01-25 09:54:31 +08:00
songchenxuan 4ce9f83f06 *Code lang for international ZenTao. 2022-01-20 15:33:12 +08:00
zhujinyong 74a9fedbd2 * Fix install function. 2022-01-19 16:22:44 +08:00
hufangzhou bf119b5cb8 * Hide the other products. 2022-01-14 14:48:24 +08:00
hufangzhou e28dfd6879 * Add the zentao api lib for install. 2021-12-24 11:08:10 +08:00
hufangzhou 8b1b92bdfc * Add the version. 2021-11-02 12:37:51 +08:00
liyuchun 28a87df599 * Fix bug #15164. 2021-10-22 11:11:10 +08:00
xieqiyu 02717dbe64 * Fix bug#15512. 2021-10-14 09:20:32 +08:00
朱金勇 a7b043f7b2 Merge branch 'sprint/165_zenggang_15439' into '15.6' 
Sprint/165 zenggang 15439

See merge request easycorp/zentaopms!52
 2021-10-12 14:01:00 +00:00
hufangzhou bf78fe9be4 * Add the 15.6 version and upgrade. 2021-10-12 09:35:39 +08:00
zenggang e7f819ac53 * Adjust code variable name 2021-10-11 01:16:15 +00:00
zenggang bf16a12c7b * Fix bug#15439 2021-10-09 01:05:07 +00:00
zenggang d4ddac562d * Add code annotation 2021-09-28 15:56:43 +08:00
zenggang 57b48dd406 * Code for bug#15365 2021-09-28 11:20:05 +08:00
liyuchun 96dac5453a * Fix bug #15184. 2021-09-15 09:16:11 +08:00
王怡栋 d2403a6b8e * add new version and upgrade. 2021-09-08 16:00:42 +08:00
liyuchun bcd78639b0 * Finish task #42154. 2021-09-08 08:22:10 +08:00
dingguodong 314c3c593e Merge branch 'jihuMR' 2021-09-07 20:47:10 +08:00
liyuchun 6f9a5c7e67 * Finish task #42155. 2021-09-03 14:37:28 +08:00
liyuchun 58577bb42c * Code for task #42154. 2021-09-03 14:15:05 +08:00
王怡栋 4eee4d5523 Merge branch '15.4' 2021-09-02 19:21:30 +08:00
王怡栋 003f03589c * finish task #42159. 2021-09-02 16:47:50 +08:00
lichengjun 8f4cfb67da * Add Sync MR from GitLab API to Zentao database, default time 5 minutes to execute once. 2021-08-30 06:52:02 +00:00