Commit Graph
1093 Commits
Author SHA1 Message Date
zenggang b4553aa11a * Adjust code 2022-07-21 04:12:29 +00:00
zenggang 0655809533 * Fix sprint217 bugs. 2022-07-21 04:06:11 +00:00
zenggang 5def4aef24 * Finish task#61182,61168 2022-07-20 08:28:33 +00:00
王怡栋 80c3b67ee1 Merge branch 'sprint/tianshujie_code' into 'master'
Sprint/tianshujie code

See merge request easycorp/zentaopms!4600
2022-07-20 01:15:46 +00:00
王怡栋 3120ef2aa2 Merge branch 'zenops_38' into 'master'
Zenops 38

See merge request easycorp/zentaopms!4597
2022-07-20 00:28:11 +00:00
tianshujie 7791a30013 * Finish task #61177. 2022-07-19 13:32:03 +08:00
zenggang 773400bb27 * Adjuct code 2022-07-19 01:47:18 +00:00
zenggang cabaedd234 * Finish task#61184,61183,61172 2022-07-19 00:51:32 +00:00
孙广明 425a6f8aa5 Merge branch 'liyuchun_60452' into 'zenops_38'
* Finish task #60453.

See merge request easycorp/zentaopms!4474
2022-07-12 09:24:39 +00:00
liyuchun 6cef93edd9 * Finish task #60453. 2022-07-12 06:30:13 +00:00
caoyanyi e5ffd04c34 * Finish task #60565,60566. 2022-07-12 09:45:31 +08:00
caoyanyi 1aa80a3989 * Modify tips. 2022-07-07 09:05:21 +08:00
caoyanyi 99fa5aaae3 * Add gitea module. 2022-07-07 08:29:46 +08:00
caoyanyi 955b2f0d4c * Modify clone url. 2022-07-06 13:25:28 +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
zhouxudong 0a86bc474f * Fix bug #24417. 2022-06-29 07:10:13 +00:00
zhouxudong a1794e7ef6 * Finish task #24398. 2022-06-29 06:27:01 +00:00
zhouxudong afb37ddeeb * Fix bug #24398. 2022-06-29 06:15:44 +00:00
孙广明 d104fe7e72 * Fix bug #24423. 2022-06-28 15:48:23 +08:00
王怡栋 afae79d45f Merge branch 'sgm_fixbug' into 'master'
* Fix bug #24406.

See merge request easycorp/zentaopms!4188
2022-06-28 06:31:17 +00:00
孙广明 56a5488efc * Fix bug #24406. 2022-06-28 14:25:02 +08:00
王怡栋 956c806cf9 Merge branch 'master' into 'sprint/208_liumengyi_58561'
# Conflicts:
#   db/update17.1.sql
2022-06-28 05:08:18 +00:00
liumengyi cca9efbb77 * Finish task #58561. 2022-06-28 10:33:05 +08:00
孙广明 c3cf1eab05 * Add de/fr lang. 2022-06-28 09:45:47 +08:00
孙广明 bc47df0018 * Finish task #59081. 2022-06-28 09:23:27 +08:00
孙广明 4f8fc5f122 * Code css file. 2022-06-24 11:07:17 +08:00
孙广明 00f264d26c * Fix bugs. 2022-06-24 09:30:56 +08:00
wangyidong 439f555e45 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-06-23 14:23:43 +08:00
孙广明 6d88c0c22b * Code for code error. 2022-06-23 14:16:01 +08:00
孙广明 a2b913d05f * Add upgrade logic. 2022-06-23 13:33:25 +08:00
王怡栋 748f1ffedf Merge branch 'master' into 'sgm_prjadmin'
# Conflicts:
#   db/update17.1.sql
2022-06-23 05:00:48 +00:00
孙广明 65a162536a * Fix details. 2022-06-23 11:27:55 +08:00
王怡栋 77d1ab4daf Merge branch 'master' into 'sprint/206_liumengyi_58288'
# Conflicts:
#   db/update17.1.sql
2022-06-23 01:46:35 +00:00
孙广明 458688e636 * Code for project admin. 2022-06-23 09:46:34 +08:00
王怡栋 c69384617a Merge branch 'master_xieqiyu_57850' into 'master'
* Code for task#57850.

See merge request easycorp/zentaopms!4083
2022-06-23 00:39:25 +00:00
孙广明 a67ba3e0aa * Code for project admin. 2022-06-22 23:07:27 +08: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
liumengyi 8f0073050f * Finish task #58288. 2022-06-22 15:23:38 +08:00
xieqiyu 21b0217aa8 * Code for task#57850. 2022-06-22 13:15:44 +08:00
liumengyi 2fce450bb8 * Fix bug for task #58063. 2022-06-22 09:54:08 +08:00
tianshujie 7372f7f936 * Finish story #32623. 2022-06-22 08:51:05 +08:00
mayue d97b5aeb97 * Fix bug #23765. 2022-06-21 13:30:00 +08:00
tianshujie 837849a41a * Finish task #57895. 2022-06-20 14:38:48 +08:00
liyuchun e447ec9a11 * Remove unused code. 2022-06-16 08:57:09 +00:00
孙广明 089662bd5e * Finish task #56629. 2022-06-14 10:20:29 +08:00
tianshujie 450ecef008 * Fix bug #23201. 2022-06-13 10:12:29 +08:00
zhouxudong 94c8b0a523 * Finish task #56374. 2022-06-10 01:32:52 +00:00