Commit Graph
774 Commits
Author SHA1 Message Date
caoyanyi 935c713a2e * Modify commit param. 2022-07-22 09:31:55 +08:00
caoyanyi 272cef7585 * Fix bug #25583. 2022-07-22 09:28:20 +08:00
caoyanyi a146a7633a * Modify data display. 2022-07-20 16:49:01 +08:00
李玉春 ca8b69dbea Merge branch 'liyuchun_gitea_commit' into 'zenops_38'
* Finish task #60568.

See merge request easycorp/zentaopms!4557
2022-07-15 00:25:53 +00:00
caoyanyi d520908952 Merge branch 'master' into zenops_38 2022-07-15 08:24:57 +08:00
liyuchun e48c1a42e3 * Finish task #60568. 2022-07-14 09:02:35 +00:00
李玉春 4ef6a71580 Merge branch 'cyy_bug' into 'zenops_38'
* Modify diff files.

See merge request easycorp/zentaopms!4556
2022-07-14 08:47:37 +00:00
caoyanyi d6314a23a9 * Modify diff files. 2022-07-14 16:43:47 +08:00
李玉春 35b040e0b7 Merge branch 'cyy_bug' into 'zenops_38'
* Fix bug #25152.

See merge request easycorp/zentaopms!4548
2022-07-14 08:33:45 +00:00
liyuchun 7568168616 * Finish task #60454. 2022-07-14 08:04:34 +00:00
caoyanyi 8051256ee9 * Fix bug #25152. 2022-07-14 15:31:26 +08:00
caoyanyi 3e4e7d6b8a * Modify user get. 2022-07-14 12:07:32 +08:00
liyuchun c2f36659eb Merge branch 'zenops_38' of https://gitlab.zcorp.cc/easycorp/zentaopms into zenops_38 2022-07-14 00:53:20 +00:00
liyuchun 6102e2df6a * Modify gitlab to git service in repo module. 2022-07-14 00:53:13 +00:00
xieqiyu fcb1e2fd93 * Fix bug#25198. 2022-07-14 08:40:53 +08:00
李玉春 85f2d7235a Merge branch 'cyy_diff' into 'zenops_38'
* Modify diff function.

See merge request easycorp/zentaopms!4514
2022-07-14 00:40:51 +00:00
caoyanyi c8527bdea4 Merge branch 'master' into zenops_38 2022-07-14 08:37:24 +08:00
caoyanyi 25b3e08bd5 * Modify diff function. 2022-07-13 14:12:58 +08:00
朱金勇 ca9adecd3f Merge branch 'sprint/xuanxuan_108' into 'master'
合并小喧喧通知卡片相关代码

See merge request easycorp/zentaopms!4452
2022-07-13 05:58:05 +00:00
caoyanyi 991e5c8260 * Adjust codes. 2022-07-13 13:45:53 +08:00
caoyanyi 9e60a21351 * Adjust code. 2022-07-13 13:33:09 +08:00
caoyanyi 4fb4041f5e * Adjust code. 2022-07-13 13:25:46 +08:00
caoyanyi cd82039cb8 * Adjust codes. 2022-07-13 13:21:50 +08:00
caoyanyi feff23ca7f * Adjust codes. 2022-07-13 11:18:03 +08:00
caoyanyi 7da00676b4 * Modify repo load. 2022-07-13 10:20:56 +08:00
caoyanyi 5b4bdf9dc7 * Finish task #60454. 2022-07-12 17:01:11 +08:00
caoyanyi b2b8da2e09 * Adjust code. 2022-07-12 16:09:59 +08:00
caoyanyi 513ef26523 * Adjust code. 2022-07-12 16:08:37 +08:00
caoyanyi 75bf140f6d * Modify repo page data. 2022-07-12 15:37:16 +08:00
liyuchun 625631c625 * Adjust scm. 2022-07-11 08:59:50 +00:00
liyuchun 23de383c83 * Finish task #60452. 2022-07-11 08:57:24 +00:00
wangyidong bb0fdc74c9 * code for bug #24927. 2022-07-08 17:35:06 +08:00
liyuchun 18c28227bb * Finish task #59432. 2022-07-07 09:00:25 +00:00
liyuchun 92988c9386 * Finish task #59432,59434. 2022-07-07 05:53:56 +00:00
daitingting e06b64e997 * Add fetchModule to distinguish rawModule. 2022-07-06 08:42:21 +00:00
李玉春 ae0722b146 Merge branch 'liyuchun_fixbug' into 'master'
* Fix bug #23945.

See merge request easycorp/zentaopms!4247
2022-06-30 05:18:15 +00:00
tianshujie 7528cdfdcf * Fix bug #24554. 2022-06-30 13:16:31 +08:00
liyuchun 6dd69c055a * Fix bug #23945. 2022-06-30 02:21:03 +00:00
dingyongliang d01dd34431 * electron/zentao: fix confirm. 2022-06-30 01:47:45 +00:00
tanghucheng 0a9f2056ee * Fix bug . 2022-06-28 10:47:25 +08:00
孙广明 66ab8da1b2 Merge branch 'leiyong_adjust_feishu' into 'master'
* Fix bug#24192.

See merge request easycorp/zentaopms!4136
2022-06-27 02:49:22 +00:00
李玉春 c12226f606 Merge branch 'cyy_style' into 'master'
* Modify style for select.

See merge request easycorp/zentaopms!4124
2022-06-24 06:29:55 +00:00
caoyanyi a0993d719a * Modify js set error. 2022-06-24 13:27:15 +08:00
leiyong f7d7d7f5c6 * Fix bug#24192. 2022-06-24 03:37:18 +00:00
leiyong f1d9e3375f * Fix bug#24031. 2022-06-23 01:16:26 +00:00
王怡栋 9ffdc942c2 Merge branch 'master' into 'sprint/205'
# Conflicts:
#   module/execution/lang/en.php
#   module/execution/lang/zh-cn.php
2022-06-22 09:21:12 +00:00
leiyong 0feed34baa * Finish task#57901. 2022-06-21 09:54:50 +00:00
liyuchun 76a318cb30 * Finish task #57656. 2022-06-20 06:10:33 +00:00
wangyidong 11e6edcd22 Merge branch 'zdoo18' 2022-06-08 17:06:07 +08:00
孙广明 b896377846 * Change zentao license. 2022-06-08 10:02:29 +08:00