Commit Graph
43979 Commits
Author SHA1 Message Date
caoyanyi 7e9454c815 * Modify icon and page style. 2022-08-26 13:37:24 +08:00
caoyanyi a466aa32d7 * Modify editor linked content style. 2022-08-26 09:12:43 +08:00
李玉春 b114bf2f6a Merge branch 'cyy_js' into 'zenops_44'
* Modify page style.

See merge request easycorp/zentaopms!5117
2022-08-25 05:53:07 +00:00
caoyanyi 47e1ebccc6 * Adjust code. 2022-08-25 13:20:33 +08:00
caoyanyi ada9d98f76 * Adjust code. 2022-08-25 13:19:50 +08:00
caoyanyi 6969379db7 * Modify page style. 2022-08-25 13:18:39 +08:00
李玉春 fdf45cf05d Merge branch 'cyy_repo' into 'zenops_44'
* Modify relation fields.

See merge request easycorp/zentaopms!5092
2022-08-25 00:37:19 +00:00
caoyanyi 37bce52f02 * Modify relation fields. 2022-08-24 15:24:33 +08:00
李玉春 9f3545476e Merge branch 'cyy_repo_view' into 'zenops_44'
Cyy repo view

See merge request easycorp/zentaopms!5088
2022-08-24 06:54:48 +00:00
caoyanyi 1e011d9279 * Adjust code. 2022-08-24 14:53:26 +08:00
caoyanyi efd5fbaa99 * Adjust codes. 2022-08-24 14:51:44 +08:00
caoyanyi 78ae278128 * Adjust code. 2022-08-24 14:48:15 +08:00
caoyanyi db654fe25d * Adjust code. 2022-08-24 14:45:51 +08:00
caoyanyi 1c595933e8 * Modify repo commit info. 2022-08-24 14:43:05 +08:00
caoyanyi 006dc90afb * Code for task #65980. 2022-08-24 14:42:39 +08:00
孙广明 2a3b5e376c Merge branch 'liyuchun_65972' into 'zenops_44'
* Finish task #65982.

See merge request easycorp/zentaopms!5081
2022-08-24 06:32:02 +00:00
liyuchun 4c5c2aff37 * Finish task #65982. 2022-08-24 10:40:27 +08:00
李玉春 f5ad738d31 Merge branch 'cyy_repo' into 'zenops_44'
* Add monaco editor to repo view.

See merge request easycorp/zentaopms!5059
2022-08-23 00:29:48 +00:00
caoyanyi 7d130c6bf3 * Adjust codes. 2022-08-23 08:26:52 +08:00
caoyanyi 2664770d14 * Modify monaco page style. 2022-08-22 17:11:31 +08:00
caoyanyi 98fe25b85a * Add monaco editor to repo view. 2022-08-22 16:31:58 +08:00
王怡栋 97fb666982 Merge branch 'sprint/master_zhouxudong' into 'master'
* Optimization task #64884.

See merge request easycorp/zentaopms!5032
2022-08-22 05:55:46 +00:00
zhouxudong 183e45ec05 * Optimization task #64884. 2022-08-22 05:12:58 +00:00
孙广明 aade6c4499 Merge branch 'sprint/231_liumengyi_26723' into 'master'
* Fix bug #26723.

See merge request easycorp/zentaopms!5045
2022-08-22 03:30:03 +00:00
liumengyi 20041ea696 * Fix bug #26723. 2022-08-22 11:12:38 +08:00
王怡栋 e28e4e8981 Merge branch 'importExport' into 'master'
* Fix bug #26714.

See merge request easycorp/zentaopms!5044
2022-08-22 02:47:35 +00:00
tanghucheng 17f08b4b70 * Fix bug #26714. 2022-08-22 10:46:13 +08:00
sunguangming 9d52e47151 Merge branch 'sprint/228_tianshujie_64967' 2022-08-22 10:24:40 +08:00
liumengyi f5f452bb39 Merge branch 'sprint/228_tianshujie_64967' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/228_tianshujie_64967 2022-08-22 10:06:52 +08:00
liumengyi f42d3690c5 * Finish task #64967. 2022-08-22 10:06:05 +08:00
tianshujie 8916862314 Merge branch 'sprint/228_tianshujie_64967' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/228_tianshujie_64967 2022-08-22 10:02:04 +08:00
tianshujie 060a2d9df0 * Finish task #64967. 2022-08-22 10:01:53 +08:00
liumengyi 5137289dd8 * Fix bug for task #64967. 2022-08-22 09:47:53 +08:00
王怡栋 a232caa81b Merge branch 'sprint/lanzongjun_testunit' into 'master'
testcase user and my

See merge request easycorp/zentaopms!5036
2022-08-22 01:40:39 +00:00
王怡栋 25bb8d8810 Merge branch 'notify_email' into 'master'
* Adjust style

See merge request easycorp/zentaopms!5041
2022-08-22 01:39:56 +00:00
王怡栋 81aae6a252 Update model.php 2022-08-22 01:34:24 +00:00
王怡栋 4446295fd7 Merge branch 'sprint_liuhong' into 'master'
Sprint liuhong

See merge request easycorp/zentaopms!5040
2022-08-22 01:31:06 +00:00
王怡栋 a4c474011c Merge branch 'sprint/master_zhouxudong_updateCode' into 'master'
* Optimization task #64887.

See merge request easycorp/zentaopms!5033
2022-08-22 01:29:07 +00:00
tianshujie 6bbff6043e Merge branch 'sprint/228_tianshujie_64967' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/228_tianshujie_64967 2022-08-22 09:24:30 +08:00
tianshujie ee63dc4f17 * Finish task #64967. 2022-08-22 09:24:18 +08:00
王怡栋 f8fa7dc0c9 Merge branch 'spritn/master_zhouxudong_fixbug' into 'master'
* Fix bug.

See merge request easycorp/zentaopms!5034
2022-08-22 01:23:30 +00:00
liumengyi ee19dd6d4a * Fix bug for task #64967. 2022-08-22 09:22:39 +08:00
zenggang 7ebf86134f * Adjust style 2022-08-19 08:37:39 +00:00
liuhong 650d491c44 *Fix bug 2022-08-19 08:30:20 +00:00
tianshujie c990e09f61 * Finish task #64967. 2022-08-19 16:29:53 +08:00
liyuchun f51cd775ef Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-08-19 16:01:03 +08:00
liyuchun 806bc627ed * Remove sql. 2022-08-19 16:00:49 +08:00
王怡栋 4a7b95fbe0 Merge branch 'sprint/228_tianshujie_kanban' into 'master'
* Fixed bug where Kanban prompts for newline under execution.

See merge request easycorp/zentaopms!5038
2022-08-19 07:55:38 +00:00
tianshujie 5eb41bedef * Fixed bug where Kanban prompts for newline under execution. 2022-08-19 15:53:08 +08:00
lanzongjun 74513c5612 * module user testcase 2022-08-19 15:43:52 +08:00