 zhujinyong
|
5f8c33d682
|
* Move chinese to $lang->api.
|
2021-11-22 08:10:05 +08:00 |
|
|
zhujinyong
|
39b22de67b
|
Merge branch 'sprint/170' of https://gitlab.zcorp.cc/easycorp/zentaopms into 170
|
2021-11-19 08:42:40 +08:00 |
|
|
王怡栋
|
fde5cb61da
|
Merge branch 'sprint/app10' into sprint/170
|
2021-11-19 08:41:00 +08:00 |
|
|
李玉春
|
68d5d5e903
|
Merge branch 'sprint/170_hufangzhou_16385' into 'sprint/170'
* Fix bug #16385 and fix an error.
See merge request easycorp/zentaopms!534
|
2021-11-19 00:35:13 +00:00 |
|
|
孙广明
|
92b7515069
|
Merge branch 'sprint/170_zhouxin_16408' into 'sprint/170'
Fix bug 16408.
See merge request easycorp/zentaopms!526
|
2021-11-19 00:33:29 +00:00 |
|
|
hufangzhou
|
4a07c2324f
|
* Fix bug #16385 and fix an error.
|
2021-11-18 21:41:48 +08:00 |
|
|
李玉春
|
40b0b05a3e
|
Merge branch 'sprint/170_mayue_16407' into 'sprint/170'
* Fix bug #16407.
See merge request easycorp/zentaopms!525
|
2021-11-18 09:33:43 +00:00 |
|
|
zhouxin
|
b8783ecd5c
|
Fix bug 16408.
|
2021-11-18 17:32:02 +08:00 |
|
|
李玉春
|
dc8dc55534
|
Merge branch 'sprint/170_mayue_16406' into 'sprint/170'
* Fix bug #16406.
See merge request easycorp/zentaopms!528
|
2021-11-18 09:29:29 +00:00 |
|
|
mayue
|
1d9fc9d476
|
* Fix bug #16407.
|
2021-11-18 17:26:27 +08:00 |
|
|
李玉春
|
8a1ab522bd
|
Merge branch 'sprint/173_wangjianhua_44491' into 'sprint/170'
Finish task 44491. Load branch lang before using.
See merge request easycorp/zentaopms!532
|
2021-11-18 09:24:07 +00:00 |
|
|
mayue
|
bff4aebfd4
|
* Fix bug #16406.
|
2021-11-18 17:24:00 +08:00 |
|
|
李玉春
|
ba8ec26e96
|
Merge branch 'sprint/170_zhouxin_44486,44487,44488' into 'sprint/170'
Add realBegan for program.
See merge request easycorp/zentaopms!529
|
2021-11-18 09:21:25 +00:00 |
|
|
李玉春
|
7c9add376d
|
Merge branch 'sprint/170_songchenxuan_16376' into 'sprint/170'
Sprint/170 songchenxuan 16376
See merge request easycorp/zentaopms!530
|
2021-11-18 09:20:35 +00:00 |
|
|
李玉春
|
36e39591be
|
Merge branch 'sprint/173_wangjianhua_44503' into 'sprint/170'
* finish task 44503
See merge request easycorp/zentaopms!516
|
2021-11-18 09:19:19 +00:00 |
|
|
wangjianhua
|
1e57264ff4
|
* finish task 44491. Load branch lang before using.
|
2021-11-18 09:16:07 +00:00 |
|
|
王怡栋
|
adc2aa1c9b
|
* code for task #44312.
|
2021-11-18 17:10:01 +08:00 |
|
|
songchenxuan
|
f92a67b62a
|
* Fix bug 16376
|
2021-11-18 17:09:42 +08:00 |
|
|
songchenxuan
|
1f9f382aa0
|
* Fix bug 16376
|
2021-11-18 17:06:44 +08:00 |
|
|
wangjianhua
|
e011da6fd2
|
- Finish task 44503. Remove usless variable.
|
2021-11-18 09:02:45 +00:00 |
|
|
孙广明
|
640eb3a48b
|
Merge branch 'sprint/170_tianshujie_16429' into 'sprint/170'
* Fix bug #16429.
See merge request easycorp/zentaopms!527
|
2021-11-18 08:57:25 +00:00 |
|
|
王怡栋
|
084dc50d15
|
* convert to array.
|
2021-11-18 16:57:21 +08:00 |
|
|
王怡栋
|
fa3fa5d9ca
|
* fix for program progress.
|
2021-11-18 16:54:42 +08:00 |
|
|
zhouxin
|
88938892b0
|
Add realBegan for program.
|
2021-11-18 16:49:11 +08:00 |
|
|
李玉春
|
936f56e325
|
Merge branch 'sprint/173_wangjianhua_44491' into 'sprint/170'
* finish task 44491
See merge request easycorp/zentaopms!505
|
2021-11-18 08:47:29 +00:00 |
|
|
马跃
|
8b7f409645
|
Update control.php
|
2021-11-18 08:45:20 +00:00 |
|
|
mayue
|
3a48a57047
|
* Fix bug #16406.
|
2021-11-18 16:42:27 +08:00 |
|
|
王怡栋
|
5dd63cd021
|
* fix doclibs order and fix loadModule testcase.
|
2021-11-18 16:31:27 +08:00 |
|
|
tianshujie
|
9c6c4dfc9c
|
* Fix bug #16429.
|
2021-11-18 16:30:45 +08:00 |
|
|
mayue
|
d03b905ffd
|
* Fix bug #16407.
|
2021-11-18 16:30:07 +08:00 |
|
|
zhouxin
|
e55bc34ee6
|
Fix bug 16408.
|
2021-11-18 16:26:29 +08:00 |
|
|
mayue
|
940e79bf1f
|
* Fix bug #16406.
|
2021-11-18 16:08:28 +08:00 |
|
|
mayue
|
8bf4523777
|
* Fix bug #16407.
|
2021-11-18 16:03:19 +08:00 |
|
|
王怡栋
|
27bd5770b1
|
* code for task #44332.
|
2021-11-18 16:03:06 +08:00 |
|
|
王怡栋
|
75b3876193
|
* adjust for bug changed status.
|
2021-11-18 15:47:54 +08:00 |
|
|
李玉春
|
644abad1fb
|
Merge branch 'sprint/170_tianshujie_16431' into 'sprint/170'
* Fix bug #16431.
See merge request easycorp/zentaopms!523
|
2021-11-18 07:37:37 +00:00 |
|
|
tianshujie
|
662a1960f5
|
* Fix bug #16431.
|
2021-11-18 15:35:54 +08:00 |
|
|
李玉春
|
3f52d7ce47
|
Merge branch 'sprint/170_mayue_code_error' into 'sprint/170'
* Fix code error.
See merge request easycorp/zentaopms!520
|
2021-11-18 07:26:45 +00:00 |
|
|
mayue
|
039784e212
|
* Fix code error.
|
2021-11-18 15:24:15 +08:00 |
|
|
李玉春
|
af6d5e4ca0
|
Merge branch 'sprint/170_tianshujie_16396' into 'sprint/170'
* Fix bug #16396.
See merge request easycorp/zentaopms!518
|
2021-11-18 07:13:15 +00:00 |
|
|
tianshujie
|
eac30e4699
|
* Modify code.
|
2021-11-18 15:12:38 +08:00 |
|
|
liyuchun
|
8fa3ad39c1
|
Merge branch 'sprint/170_mayue_16364' into sprint/170
|
2021-11-18 15:09:52 +08:00 |
|
|
李玉春
|
bf47fb620b
|
Merge branch 'sprint/170' into 'sprint/170_mayue_16364'
# Conflicts:
# module/project/control.php
|
2021-11-18 07:09:28 +00:00 |
|
|
tianshujie
|
0a03aea29a
|
* Fix bug #16396.
|
2021-11-18 15:07:51 +08:00 |
|
|
mayue
|
c26fb97685
|
* Fix bug #16364.
|
2021-11-18 15:07:42 +08:00 |
|
|
李玉春
|
12b6f58053
|
Merge branch 'sprint/170_songchenxuan_16377' into 'sprint/170'
Sprint/170 songchenxuan 16377
See merge request easycorp/zentaopms!514
|
2021-11-18 07:06:26 +00:00 |
|
|
songchenxuan
|
073deec215
|
* Fix bug 16377
|
2021-11-18 15:05:56 +08:00 |
|
|
李玉春
|
c4e9dc5a4e
|
Merge branch 'sprint/170_zhengrunyu_BUG_16378' into 'sprint/170'
*Finish task #16378.
See merge request easycorp/zentaopms!512
|
2021-11-18 07:03:43 +00:00 |
|
|
孙广明
|
6085ad3089
|
Merge branch 'sprint/170_tianshujie_44496' into 'sprint/170'
*Finish task #44496
See merge request easycorp/zentaopms!511
|
2021-11-18 06:59:45 +00:00 |
|
|
songchenxuan
|
504e284d63
|
* Fix bug 16377.
|
2021-11-18 14:48:41 +08:00 |
|