Commit Graph
775 Commits
Author SHA1 Message Date
王怡栋 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
= 7d106cf4d3 * Close feedback api. 2022-04-29 16:38:10 +08:00
= 0e372e50b7 * Feedback assign api. 2022-04-29 14:35:28 +08:00
zhengrunyu 38a95abfab * Handle conflict. 2022-04-29 08:45:22 +08:00
zhengrunyu 403d1099f7 * Add api for feedback. 2022-04-29 08:43:03 +08:00
zhengrunyu 5daa800c2c * Fix api for limit. 2022-04-28 09:41:35 +08:00
zhengrunyu 2f1aed748b * Add api for active task. 2022-04-13 14:14:04 +08:00
zhengrunyu d03d8ba2a4 * Add api for record estimate for bug. 2022-04-13 10:48:47 +08:00
朱金勇 e1eb543ed7 Merge branch 'app_zry' into 'master'
App zry

See merge request easycorp/zentaopms!2872
2022-04-12 07:28:24 +00:00
zhengrunyu a13a8ce570 * Fix api. 2022-04-12 15:23:31 +08:00
zhengrunyu 9cb5cb1134 * Add api for resolve bug. 2022-04-12 14:40:48 +08:00
hufangzhou baf4a67ed8 * Fix bug #15633. 2022-04-12 09:51:09 +08:00
李玉春 46a965b02b Merge branch 'cyy_bug_14928' into 'master'
* Fix bug #14928.

See merge request easycorp/zentaopms!2662
2022-04-02 06:05:51 +00:00
王怡栋 4fa721b0bb Merge branch '165_package' 2022-04-01 15:30:36 +08:00
tianshujie f7fd08aaa3 * Fix bug #20789. 2022-04-01 13:27:26 +08:00
caoyanyi 6f7e2000d3 * Fix bug #18284. 2022-04-01 13:08:58 +08:00
zhujinyong 8da5fe3c90 + Add api of ci result. 2022-03-31 16:27:11 +08:00
zhujinyong a91d090845 + Add options api. 2022-03-30 17:08:03 +08:00
zhengrunyu c047d2b422 * Add api for close bug and confirm bug. 2022-03-30 10:01:28 +08:00
朱金勇 fe3cbd34d1 Merge branch 'app_zhengrunyu' into 'master'
* Add api for close bug and confirm bug.

See merge request easycorp/zentaopms!2599
2022-03-29 01:48:20 +00:00
zhengrunyu 4c5be242cd * Add api for close bug and confirm bug. 2022-03-29 09:41:17 +08:00
tianshujie 0194c5b3c7 * Fix bug #21186. 2022-03-28 11:13:23 +08:00
tianshujie 9f3f0bd8c6 * Fix bug #20858. 2022-03-24 16:01:18 +08:00