Commit Graph
50871 Commits
Author SHA1 Message Date
wangyidong 41ddc2562b * fix bug. 2023-02-14 14:38:21 +08:00
wangyidong ec1d388334 * fix bug. 2023-02-14 14:32:09 +08:00
caoyanyi ff6516dd46 Merge branch 'zentaopms_289' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289 2023-02-14 14:01:34 +08:00
caoyanyi dff2e8a00c * Add search tab. 2023-02-14 14:01:16 +08:00
wangyidong ff5bc056bd * code for replace menu lang. 2023-02-14 13:35:12 +08:00
王怡栋 00e30d7351 Merge branch 'sprint/cyy_84606' into 'zentaopms_289'
* Add section aplit when language get.

See merge request easycorp/zentaopms!6942
2023-02-14 05:02:48 +00:00
王怡栋 4ad481e1ff Merge branch 'zentaopms_289_langItem' into 'zentaopms_289'
Zentaopms 289 lang item

See merge request easycorp/zentaopms!6943
2023-02-14 03:55:04 +00:00
guofeilong 31b8e72a3f * Code for css in langitem. 2023-02-14 11:48:07 +08:00
caoyanyi 00725d482f * Add section aplit when language get. 2023-02-14 10:49:29 +08:00
guofeilong 6bf8c6388e * Code for add menuOrder in langItem . 2023-02-14 08:45:35 +08:00
王怡栋 abb6d4b7a2 Merge branch 'zentaopms_289_langItem' into 'zentaopms_289'
Zentaopms 289 lang item

See merge request easycorp/zentaopms!6936
2023-02-14 00:44:01 +00:00
guofeilong f25bcb9edc - Code for dev/control.php refactors. 2023-02-14 08:39:58 +08:00
guofeilong 14e13dee6f Merge branch 'zentaopms_289' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289_langItem 2023-02-14 08:34:08 +08:00
王怡栋 50f2598c54 Merge branch 'master_xieqiyu_32089' into 'master'
* Code for bug#32089.

See merge request easycorp/zentaopms!6934
2023-02-13 09:24:17 +00:00
王怡栋 665081924d Merge branch 'sprint/hufangzhou_bug_32073' into 'master'
* Fix bug #32073.

See merge request easycorp/zentaopms!6933
2023-02-13 09:24:03 +00:00
王怡栋 67591cc509 Merge branch 'master_xieqiyu_26428' into 'master'
* Code for bug#26428.

See merge request easycorp/zentaopms!6932
2023-02-13 09:23:43 +00:00
王怡栋 a18abcc5c8 Merge branch 'ticket_336' into 'master'
Ticket 336

See merge request easycorp/zentaopms!6931
2023-02-13 09:23:10 +00:00
王怡栋 9b95d6e487 Merge branch 'sprint/hufangzhou_bug_32075' into 'master'
* Fix bug #32075.

See merge request easycorp/zentaopms!6930
2023-02-13 09:22:40 +00:00
孙广明 1d2ef1445c Merge branch 'zenops_61' into 'master'
Fix bugs

See merge request easycorp/zentaopms!6935
2023-02-13 09:11:38 +00:00
xieqiyu b0b04b0144 * Code for bug#32089. 2023-02-13 17:08:33 +08:00
guofeilong b9d288fd23 * Code for add langitem.html.php 2023-02-13 16:56:34 +08:00
hufangzhou 7108816fa5 * Fix bug #32073. 2023-02-13 16:30:13 +08:00
xieqiyu 19c28c527e * Code for bug#26428. 2023-02-13 16:06:20 +08:00
zhaoke 880318bc1b * Move automation btn. 2023-02-13 07:50:50 +00:00
hufangzhou 2335bb50a3 * Fix bug #32075. 2023-02-13 15:35:22 +08:00
liuhong 5a67e1409c * Resolved feedback 2021. 2023-02-13 07:34:00 +00:00
zhaoke 8391cf5679 * Fix bug 31967. 2023-02-13 07:33:10 +00:00
zhaoke 3acbbc90db * Fix bug #31967. 2023-02-13 07:32:55 +00:00
王怡栋 ae947ff614 Merge branch 'sprint/hufangzhou_modifysql' into 'master'
* Move the sql to update18.0.beta3.sql.

See merge request easycorp/zentaopms!6929
2023-02-13 07:28:44 +00:00
王怡栋 b940529b36 Merge branch 'master_xieqiyu_31983' into 'master'
* Code for bug#31983.

See merge request easycorp/zentaopms!6926
2023-02-13 07:28:21 +00:00
hufangzhou 5da5e0070c * Move the sql to update18.0.beta3.sql. 2023-02-13 15:22:59 +08:00
xieqiyu 83737d3e63 * Delete empty line. 2023-02-13 15:04:31 +08:00
王怡栋 6aec4913b8 Merge branch 'fixbug_liumengyi_32064' into 'master'
* Fix bug #32064.

See merge request easycorp/zentaopms!6925
2023-02-13 07:04:28 +00:00
王怡栋 b7ff5493ea Merge branch 'cyy_repo_bug' into 'master'
* Modify error for mr relation.

See merge request easycorp/zentaopms!6928
2023-02-13 07:01:24 +00:00
xieqiyu 40393e3dff * Fix bug#26428. 2023-02-13 15:01:04 +08:00
xieqiyu ebf67b040e * Code for bug#26428. 2023-02-13 14:59:47 +08:00
caoyanyi cfb0327a55 * Modify error for mr relation. 2023-02-13 14:41:56 +08:00
胡方舟 3cb008fbd7 Merge branch 'bugfix/liwenrui/alert' into 'master'
修复禅道客户端里 js::alert 不好使的问题,同时将 front lib 的 self:: 改为 static:: 以保证可扩展性。

See merge request easycorp/zentaopms!6927
2023-02-13 06:11:06 +00:00
liuhong 02b6a7a9ea * Resolved feedback #2021. 2023-02-13 06:01:35 +00:00
Wenrui LI f03bf51121 * use static:: instead of self:: to enable extending static functions, and inject script to make js alert work on zentao client. 2023-02-13 14:00:55 +08:00
Yagami 77134627fc * Fix bug for batch create case. 2023-02-13 13:51:11 +08:00
Yagami 7097550950 * Fix bug #32069. 2023-02-13 13:50:12 +08:00
xieqiyu 6629a458a6 * Code for bug#31983. 2023-02-13 13:41:14 +08:00
liumengyi e9c8ea6d7a * Fix bug #32064. 2023-02-13 13:26:31 +08:00
王怡栋 780b9c26b7 Merge branch 'bug_32024' into 'master'
* Fix bug #32024

See merge request easycorp/zentaopms!6924
2023-02-13 02:54:36 +00:00
zenggang 317ddd5fbc * Fix bug #32024 2023-02-13 02:02:32 +00:00
wangyidong c724e74778 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2023-02-13 09:46:59 +08:00
王怡栋 e630221a20 Merge branch 'dev/gfl_fix_style_problem_in_flowChart' into 'master'
* Code for class refactors in flowChart

See merge request easycorp/zentaopms!6923
2023-02-13 01:46:44 +00:00
wangyidong 11653a8914 * fix bug. 2023-02-13 09:45:43 +08:00
guofeilong 89be39c7e3 * Code for class refactors in flowChart 2023-02-13 09:43:04 +08:00