Commit Graph
797 Commits
Author SHA1 Message Date
zhujinyong 7e67e54fe9 * Define table. 2022-08-15 11:10:09 +08:00
hufangzhou e97a5a7361 * Add the new version. 2022-08-11 10:55:29 +08:00
tanghucheng 36b07367c9 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into importExport 2022-08-08 12:07:23 +08:00
王怡栋 ec328f7432 Merge branch 'master' into 'sprint/hufangzhou_createdoc'
# Conflicts:
#   config/zentaopms.php
2022-08-08 03:05:17 +00:00
tanghucheng 28f896e84c Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into importExport 2022-08-05 08:11:14 +08:00
dongli bcd6fd0c0f * Finish task #62948 2022-08-04 06:10:02 +00:00
hufangzhou 48f500e5a8 * Code for task #62951. 2022-08-03 09:37:36 +08:00
tanghucheng cb6339024e Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into importExport 2022-07-27 17:17:39 +08:00
hufangzhou 9bfb42cffd * Add the new version. 2022-07-27 15:01:41 +08:00
tanghucheng d0694aae7e Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into importExport 2022-07-20 16:02:00 +08:00
hufangzhou fab8fedf10 * Adjust the judgment condition to a configuration item. 2022-07-20 14:15:43 +08:00
liyuchun 07f8b57e68 * Fix bug #25153. 2022-07-15 05:28:09 +00:00
tanghucheng 7d351a4c3d * Code for import . 2022-07-14 15:49:52 +08:00
hufangzhou d133a2b5e8 * Add the new version. 2022-07-13 13:28:45 +08:00
孙广明 105ac0b70f Merge branch 'stagetasktree' 2022-07-13 08:48:30 +08:00
孙广明 8dc58ed292 * Code for project-task url. 2022-07-12 15:47:29 +08:00
caoyanyi 8267cfaa94 * Fix bug #25032. 2022-07-08 13:50:23 +08:00
liumengyi 3fd52a833f * Fix bug #24892. 2022-07-06 16:33:53 +08:00
孙广明 d175ae0f5e Merge branch 'master' into 'liyuchun_59437'
# Conflicts:
#   module/repo/control.php
2022-07-05 09:20:43 +00:00
liyuchun 8a3d924e2b * Finish task #59451. 2022-07-05 08:42:48 +00:00
孙广明 25028997fa * Finish task #59701. 2022-07-05 15:03:15 +08:00
hufangzhou cb49804253 * Add the new version. 2022-06-29 13:18:20 +08:00
王怡栋 748f1ffedf Merge branch 'master' into 'sgm_prjadmin'
# Conflicts:
#   db/update17.1.sql
2022-06-23 05:00:48 +00:00
孙广明 a58607bbaa * Code for task #58217. 2022-06-22 18:25:02 +08:00
王怡栋 03c76b1565 Merge branch 'master' into 'sprint/206'
# Conflicts:
#   db/update17.1.sql
2022-06-22 07:26:11 +00:00
wangyidong 1e7ec30f10 * fix bug for build url in PATH_INFO. 2022-06-22 11:45:26 +08:00
wangyidong c219ffdc7c * adjust for upgrade lite version. 2022-06-22 09:53:27 +08:00
tianshujie 7372f7f936 * Finish story #32623. 2022-06-22 08:51:05 +08:00
tianshujie 30bff5f852 * Finish task #57894. 2022-06-21 11:15:16 +08:00
tianshujie 837849a41a * Finish task #57895. 2022-06-20 14:38:48 +08:00
hufangzhou 64a0dab834 * Add the new version. 2022-06-16 18:04:47 +08:00
liyuchun 08b36c0418 * Finish task #57065. 2022-06-16 07:50:39 +00:00
caoyanyi 0486181ed7 * Add api for jobs and repos. 2022-06-15 15:51:37 +08:00
孙广明 b896377846 * Change zentao license. 2022-06-08 10:02:29 +08:00
孙广明 b528156589 * Change license. 2022-06-08 09:34:46 +08:00
李玉春 bd8ecb4f1c Merge branch 'sprint/196_leiyong_fix_bug' into 'master'
* Fix bug#23204.

See merge request easycorp/zentaopms!3719
2022-06-02 07:55:36 +00:00
孙广明 61ad544156 Merge branch 'zentaopms_198' 2022-06-02 15:04:56 +08:00
孙广明 23d19bd6b3 * Code for export users. 2022-06-02 14:52:16 +08:00
孙广明 9fe2c296a5 Merge branch 'sprint/198_mayue_task#55852' into 'master'
* Finish task #55852.

See merge request easycorp/zentaopms!3716
2022-06-02 06:16:12 +00:00
leiyong 5539a1ec17 * Adjust code. 2022-06-02 06:13:04 +00:00
leiyong 70db40b821 * Fix bug#23204. 2022-06-02 06:10:46 +00:00
mayue 1965426827 * Finish task #55852. 2022-06-02 13:22:13 +08:00
孙广明 c2791dbb4c Merge branch 'sprint/196_leiyong_task_55622' into 'master'
Sprint/196 leiyong task 55622

See merge request easycorp/zentaopms!3697
2022-06-02 01:59:24 +00:00
hufangzhou b4fd618491 * Add the new version. 2022-06-02 09:10:04 +08:00
leiyong 449d092eb2 * Update language items. 2022-06-01 09:31:17 +00:00
leiyong 967861a589 * Finish task#55622. 2022-06-01 07:22:32 +00:00
hufangzhou 27ec156f88 * Add the new version. 2022-05-26 09:52:33 +08:00
wangyidong d6cf08b9d7 Merge branch 'tid' 2022-05-18 10:20:48 +08:00
mayue 46c555fb3f * Add max code. 2022-05-12 02:38:33 +00:00
hufangzhou 90265f93d8 * Add the new version. 2022-05-06 13:48:21 +08:00