 zhouxin
|
4efea42989
|
+ Move unit test from test directory to each module.
|
2023-04-24 02:16:47 +00:00 |
|
|
孙广明
|
4e41688eb8
|
* Remove 2.md.
|
2023-04-24 09:40:09 +08:00 |
|
|
孙广明
|
45781a4b62
|
* Remove project.md, add 2.md.
|
2023-04-24 09:24:36 +08:00 |
|
|
liyang
|
81dccead8d
|
* Add group.
|
2023-04-24 09:12:45 +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 |
|
|
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 |
|
|
Lufei
|
99f7f62456
|
* Fix notice switch error in admin safe page.
|
2023-04-23 15:51:35 +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
|
3fb072e393
|
* zin: refactor project-close page
|
2023-04-21 23:34:12 +08:00 |
|
|
Hao Sun
|
ba1b94e3ab
|
* zin: refactor project-close page
|
2023-04-21 23:28:25 +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 |
|
|
刘刚
|
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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
guofeilong
|
2b50e7bd38
|
* Code for fix } mistake .
|
2023-04-21 14:47:37 +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 |
|
|
王怡栋
|
8d2dcf22e0
|
Merge branch 'cyy_fixbug' into 'master'
Cyy fixbug
See merge request easycorp/zentaopms!7544
|
2023-04-21 06:39:25 +00:00 |
|
|
guofeilong
|
e3245bf03c
|
* Code for adjust title width js .
|
2023-04-21 14:38:47 +08:00 |
|
|
guofeilong
|
6ac8651e73
|
* Code for hide scroll in view .
|
2023-04-21 14:38:28 +08:00 |
|
|
guofeilong
|
8dd356b7e1
|
* Code for delete emtpy lines .
|
2023-04-21 14:38:28 +08:00 |
|
|
wangyidong
|
36889a4ea2
|
* fix bug.
|
2023-04-21 14:20:43 +08:00 |
|
|
dingyongliang
|
4c606b9e41
|
* zin: refactor assignto.
|
2023-04-21 14:06:01 +08:00 |
|
|
wangyidong
|
48aa1ce2f7
|
* fix bug.
|
2023-04-21 14:02:24 +08:00 |
|
|
刘刚
|
24f40ceb4d
|
Merge branch 'daitingting_bug_#34553' into 'master'
* Fix bug #34553.
See merge request easycorp/zentaopms!7543
|
2023-04-21 05:50:17 +00:00 |
|
|
caoyanyi
|
bfe3d84233
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into cyy_fixbug
|
2023-04-21 13:43:52 +08:00 |
|
|
caoyanyi
|
e711f42d69
|
* Modify install database set.
|
2023-04-21 13:43:23 +08:00 |
|
|
王怡栋
|
fa40f834ac
|
Merge branch 'sprint/hufangzhou_newVersion' into 'master'
* Add the new version.
See merge request easycorp/zentaopms!7542
|
2023-04-21 05:40:52 +00:00 |
|
|
王怡栋
|
2197f4ab32
|
Merge branch 'cyy_fixbug' into 'master'
Cyy fixbug
See merge request easycorp/zentaopms!7539
|
2023-04-21 05:39:02 +00:00 |
|
|
hufangzhou
|
e0d28390ab
|
* Add the new version.
|
2023-04-21 13:35:49 +08:00 |
|
|
qixinzhi
|
4791f83177
|
* Fix bug#34063 again.
|
2023-04-21 05:29:53 +00:00 |
|
|
daitingting
|
9d8220fdf9
|
* Fix bug #34553.
|
2023-04-21 11:31:32 +08:00 |
|
|
caoyanyi
|
e266ad301a
|
* Fix bug #34473.
|
2023-04-21 11:29:00 +08:00 |
|
|
xieqiyu
|
1d4726faaf
|
* Process dataset update.
|
2023-04-21 03:20:34 +00:00 |
|
|
dingyongliang
|
e056f787b1
|
zin: refactor project close dialog.
|
2023-04-21 11:20:05 +08:00 |
|
|
caoyanyi
|
b4e830a360
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into cyy_fixbug
|
2023-04-21 11:18:48 +08:00 |
|
|
caoyanyi
|
83cf8d0972
|
* Modify install and story report error.
|
2023-04-21 11:18:02 +08:00 |
|