Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
55,450 Commits 2 Branches 292 Tags
4b8bafa37083610f1e4153ab55d979154bd04faf
Commit Graph
55450 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
孙广明 4b8bafa370 Merge branch 'master' of https://git.zcorp.cc/easycorp/zentaopms 2023-04-24 08:51:40 +08:00
宋辰轩 e567ab2713 Merge pull request '* Fix bug for api.' (#3) from sprint/scx_testcaseapi into master 
Reviewed-on: https://git.zcorp.cc/easycorp/zentaopms/pulls/3
 2023-04-24 08:51:37 +08:00
孙广明 3f9958a620 * Add project.md. 2023-04-24 08:51:28 +08:00
Hao Sun ed31bffa6c Merge branch 'zin_merge' 
# Conflicts:
#	framework/base/control.class.php
#	framework/control.class.php
 2023-04-23 19:44:40 +08:00
朱金勇 f7829c8ebc Merge branch 'feature/php81' into 'master' 
* Support PHP8.1.

See merge request easycorp/zentaopms!7559
 2023-04-23 11:21:09 +00:00
鲁飞 045289d4c7 * Support PHP8.1. 2023-04-23 11:21:09 +00:00
Hao Sun 2bcc9bdbf4 Merge branch 'zin_dev' 
# Conflicts:
#	module/common/lang/zh-cn.php
#	module/product/lang/de.php
#	module/product/lang/en.php
#	module/product/lang/fr.php
#	module/product/lang/zh-cn.php
#	module/program/js/browse.js
#	module/program/lang/de.php
#	module/program/lang/en.php
#	module/program/lang/fr.php
#	module/program/lang/zh-cn.php
#	module/project/config.php
#	module/project/lang/de.php
#	module/project/lang/en.php
#	module/project/lang/fr.php
#	module/project/lang/zh-cn.php
#	module/search/view/buildform.html.php
#	module/task/control.php
 2023-04-23 19:20:45 +08:00
宋辰轩 bd7b43a1a5 * Fix bug for api. 2023-04-23 18:44:51 +08:00
朱金勇 2ed6472bc8 Merge branch 'fix_safe_notice' into 'master' 
* Fix notice switch error in admin safe page.

See merge request easycorp/zentaopms!7557
 2023-04-23 08:00:43 +00:00
Lufei 99f7f62456 * Fix notice switch error in admin safe page. 2023-04-23 15:51:35 +08:00
Hao Sun 3abba7398a * zin: fix formPanel actions not work 2023-04-23 11:34:07 +08:00
刘刚 8792d9217e Merge branch 'daitingting_bug_#34576' into 'master' 
* Fix bug #34576.

See merge request easycorp/zentaopms!7555
 2023-04-23 03:27:29 +00:00
daitingting ddf2339b06 * Fix bug #34576. 2023-04-23 11:26:27 +08:00
Hao Sun 5b6a76d0ac * zin: openPage support for setting app code 2023-04-23 11:23:35 +08:00
Hao Sun 97223bf1ce * zin: only refresh dtable on click pager links 2023-04-21 23:43:22 +08:00
Hao Sun 3fb072e393 * zin: refactor project-close page 2023-04-21 23:34:12 +08:00
Hao Sun d47f29cad0 * zin: add props to form to set action btns text 2023-04-21 23:33:57 +08:00
Hao Sun ba1b94e3ab * zin: refactor project-close page 2023-04-21 23:28:25 +08:00
Hao Sun 8cefe86fe6 * zin: fix [data-toggle="modal"] not prevent default behavior. 2023-04-21 23:28:12 +08:00
Hao Sun 4760e38613 * zin: use fragment to render partial pages 2023-04-21 23:27:48 +08:00
Hao Sun 56f7a51553 * zin: refactor program-browse page 2023-04-21 23:27:22 +08:00
Hao Sun 298a595d48 * zin: fix project name not render as link 2023-04-21 22:53:12 +08:00
Hao Sun 55d56c4081 * zin: refactor 2023-04-21 22:52:36 +08:00
刘刚 3354e5edf9 Merge branch 'zentaobiz39_bi_wangyuting' into 'master' 
* Fix bug #34582.

See merge request easycorp/zentaopms!7553
 2023-04-21 08:53:46 +00:00
刘刚 323ad9c04b Merge branch 'dev/gfl_fixbug' into 'master' 
* Code for bug #34552 .

See merge request easycorp/zentaopms!7552
 2023-04-21 08:52:03 +00:00
wangyuting2 78daa4faef * Fix bug #34582. 2023-04-21 16:49:52 +08:00
liugang 9434e3f438 * Merge the functions extended in biz. 2023-04-21 08:45:00 +00:00
liugang 08f856a1ab * Move the function from biz extension. 2023-04-21 08:44:39 +00:00
刘刚 0f0342b10a Merge branch 'zentaobiz39_bi_wangyuting' into 'master' 
* Fix bug.

See merge request easycorp/zentaopms!7549
 2023-04-21 08:43:11 +00:00
guofeilong 92157e7236 * Code for bug #34552 . 2023-04-21 16:41:44 +08:00
王怡栋 c728da786e Merge branch 'cyy_fixbug' into 'master' 
* Change date NOT NULL to date NULL.

See merge request easycorp/zentaopms!7551
 2023-04-21 08:33:26 +00:00
王怡栋 95ef308a61 Merge branch 'dev/gfl_fixbug' into 'master' 
* Adjust code for bug #34552 .

See merge request easycorp/zentaopms!7550
 2023-04-21 08:32:26 +00:00
liumengyi f31a870c32 * Change date NOT NULL to date NULL. 2023-04-21 16:31:39 +08:00
guofeilong be9ab3d8e0 * Adjust code for bug #34552 . 2023-04-21 16:31:13 +08:00
王怡栋 7a8b9d13c5 Merge branch 'cyy_fixbug' into 'master' 
Cyy fixbug

See merge request easycorp/zentaopms!7548
 2023-04-21 07:59:25 +00:00
王怡栋 98570ddf8b Merge branch 'dev/gfl_fixbug' into 'master' 
* Code for bug # 34524 .

See merge request easycorp/zentaopms!7547
 2023-04-21 07:59:06 +00:00
wangyuting2 1ef6a08016 * Fix langs bug. 2023-04-21 15:49:06 +08:00
guofeilong 956a320141 * Adjust code for bug #34524 . 2023-04-21 15:37:54 +08:00
wangyuting2 db1cf716f8 * Fix bug. 2023-04-21 15:34:42 +08:00
guofeilong dc050c72d9 * Code for bug #34524. 2023-04-21 15:34:36 +08:00
caoyanyi 7b4491f985 * Modify install sql. 2023-04-21 15:31:10 +08:00
dingyongliang c1e65bdca4 * zin: typo. 2023-04-21 15:30:20 +08:00
guofeilong f17df69fa2 * Code for bug # 34524 . 2023-04-21 15:12:38 +08:00
caoyanyi 2451dbc421 * Fix bug #34590. 2023-04-21 14:55:41 +08:00
王怡栋 27df34722b Merge branch 'dev/gfl_fixbug' into 'master' 
* Code for fix } mistake .

See merge request easycorp/zentaopms!7546
 2023-04-21 06:48:42 +00:00
guofeilong 2b50e7bd38 * Code for fix } mistake . 2023-04-21 14:47:37 +08:00
caoyanyi bc54b04257 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into cyy_fixbug 2023-04-21 14:44:01 +08:00
王怡栋 3e45ac60db Merge branch 'dev/gfl_fixbug' into 'master' 
Dev/gfl fixbug

See merge request easycorp/zentaopms!7545
 2023-04-21 06:43:55 +00:00
caoyanyi 4be7f200dd * Fix bug #34574. 2023-04-21 14:43:36 +08:00
王怡栋 8d2dcf22e0 Merge branch 'cyy_fixbug' into 'master' 
Cyy fixbug

See merge request easycorp/zentaopms!7544
 2023-04-21 06:39:25 +00:00