 sunjun
|
c470946d4e
|
fixbug #17317
|
2022-03-21 14:08:52 +08:00 |
|
|
李玉春
|
f935639cb8
|
Merge branch 'pailei2_zhouxin_fixbugs' into 'pailei2'
Pailei2 zhouxin fixbugs
See merge request easycorp/zentaopms!2375
|
2022-03-18 09:11:32 +00:00 |
|
|
zhouxin
|
6dc51aafc0
|
Adjust code.
|
2022-03-18 09:08:48 +00:00 |
|
|
李玉春
|
09ac8ec0f8
|
Merge branch 'sprint/pailei2_tianshujie_fixbug' into 'pailei2'
Sprint/pailei2 tianshujie fixbug
See merge request easycorp/zentaopms!2376
|
2022-03-18 09:03:37 +00:00 |
|
|
tianshujie
|
fb3f55efd5
|
* Add spaces.
|
2022-03-18 15:29:39 +08:00 |
|
|
tianshujie
|
34c8489218
|
* Fix pending review issues.
|
2022-03-18 15:20:59 +08:00 |
|
|
zhouxin
|
2ab2af045c
|
Fix bug #13855.
|
2022-03-18 07:17:07 +00:00 |
|
|
孙广明
|
fedc6ab93a
|
Merge branch 'pailei2_sunhuawei_16686' into 'pailei2'
Fix bug #16686.
See merge request easycorp/zentaopms!2371
|
2022-03-18 06:42:45 +00:00 |
|
|
孙华伟
|
0031cb63c0
|
更新module/testsuite/view/view.html.php
|
2022-03-18 06:40:36 +00:00 |
|
|
孙广明
|
036b24a26a
|
Merge branch 'pailei2_mayue_bug#6907' into 'pailei2'
* Fix bug #6907.
See merge request easycorp/zentaopms!2372
|
2022-03-18 06:38:55 +00:00 |
|
|
tianshujie
|
c97329fa37
|
* Fix bug #19296.
|
2022-03-18 14:27:25 +08:00 |
|
|
mayue
|
f83ca0241b
|
* Fix bug #6907.
|
2022-03-18 14:25:12 +08:00 |
|
|
tianshujie
|
1622aa31fb
|
* Fix bug #20910.
|
2022-03-18 14:15:08 +08:00 |
|
|
孙华伟
|
6cf386e236
|
*Fix bug#16686.
|
2022-03-18 14:09:14 +08:00 |
|
|
朱金勇
|
c3cf329773
|
Merge branch 'sprint/pailei2_tianshujie_fixbug' into 'pailei2'
Sprint/pailei2 tianshujie fixbug
See merge request easycorp/zentaopms!2367
|
2022-03-18 05:40:59 +00:00 |
|
|
朱金勇
|
678e438a27
|
Merge branch 'sprint/pailei2_zhouxudong_20112' into 'pailei2'
* Fix bug #20112.
See merge request easycorp/zentaopms!2368
|
2022-03-18 05:38:29 +00:00 |
|
|
朱金勇
|
939f7b9944
|
Merge branch 'sprint/pailei2_tianshujie_upgrade' into 'pailei2'
* Delete encrypt module folder when upgrading.
See merge request easycorp/zentaopms!2348
|
2022-03-18 05:25:01 +00:00 |
|
|
zhouxin
|
7bd4cb4418
|
Fix bug #14564.
|
2022-03-18 04:41:31 +00:00 |
|
|
zhouxudong
|
995c88a678
|
* Fix bug #20112.
|
2022-03-18 11:57:22 +08:00 |
|
|
李玉春
|
071f23375d
|
Merge branch 'pailei2_mayue_bug#14184' into 'pailei2'
* Fix bug #14184.
See merge request easycorp/zentaopms!2358
|
2022-03-18 03:29:31 +00:00 |
|
|
李玉春
|
370313f69c
|
Merge branch 'pailei2_mayue_bug#6960' into 'pailei2'
* Fix bug #6960.
See merge request easycorp/zentaopms!2365
|
2022-03-18 03:28:53 +00:00 |
|
|
孙广明
|
d9505fa9fa
|
Merge branch 'pailei2_zhouxin_50796' into 'pailei2'
Pailei2 zhouxin 50796
See merge request easycorp/zentaopms!2341
|
2022-03-18 03:25:54 +00:00 |
|
|
mayue
|
f42471337f
|
* Fix bug #6960.
|
2022-03-18 11:01:55 +08:00 |
|
|
zhouxin
|
f280e32777
|
Fix bug #17415.
|
2022-03-18 02:43:14 +00:00 |
|
|
mayue
|
034daa3bb6
|
* Fix bug #14184.
|
2022-03-18 09:43:22 +08:00 |
|
|
tianshujie
|
8a7b6bcd2f
|
* Modify the upgrade prompt language.
|
2022-03-18 09:39:09 +08:00 |
|
|
tianshujie
|
13102d5b80
|
* Modify the code logic.
|
2022-03-18 09:35:28 +08:00 |
|
|
tianshujie
|
5763c06094
|
* Fix bug #20914.
|
2022-03-17 20:37:53 +08:00 |
|
|
tianshujie
|
6824ee4619
|
* Fix bug #20891.
|
2022-03-17 20:28:49 +08:00 |
|
|
tianshujie
|
aadec120db
|
* Delete encrypt module folder when upgrading.
|
2022-03-17 17:01:40 +08:00 |
|
|
李玉春
|
92045688e8
|
Merge branch 'pailei2_sunhuawei_11010' into 'pailei2'
*Fix bug #11010.
See merge request easycorp/zentaopms!2334
|
2022-03-17 08:38:22 +00:00 |
|
|
李玉春
|
e624900d36
|
Merge branch 'sprint/pailei2_zhouxudong_20358' into 'pailei2'
* Fix bug #20358.
See merge request easycorp/zentaopms!2344
|
2022-03-17 08:37:46 +00:00 |
|
|
zhouxudong
|
c011895995
|
* Fix bug #20121.
|
2022-03-17 16:34:32 +08:00 |
|
|
zhouxin
|
a0956b72d5
|
Adjust code.
|
2022-03-17 08:31:48 +00:00 |
|
|
zhouxin
|
332847783c
|
Adjust code.
|
2022-03-17 08:29:16 +00:00 |
|
|
zhouxin
|
f0c4327371
|
Adjust code.
|
2022-03-17 08:22:09 +00:00 |
|
|
孙华伟
|
ae1bc57c73
|
optimized code.
|
2022-03-17 16:11:53 +08:00 |
|
|
zhouxudong
|
66d4e9d25e
|
* Fix bug #20358.
|
2022-03-17 16:05:13 +08:00 |
|
|
zhouxin
|
78263786ed
|
Move getError from controller to model.
|
2022-03-17 07:50:54 +00:00 |
|
|
孙华伟
|
8f9b5c74e1
|
optimized code.
|
2022-03-17 15:47:52 +08:00 |
|
|
mayue
|
e303b1c45b
|
* Fix bug #15289.
|
2022-03-17 15:47:16 +08:00 |
|
|
孙华伟
|
2c457f6013
|
optimized code.
|
2022-03-17 15:45:51 +08:00 |
|
|
孙华伟
|
f06ccb25da
|
*Fix new bug
|
2022-03-17 15:43:18 +08:00 |
|
|
李玉春
|
0a266251d8
|
Merge branch 'pailei2_zhouxin_50809' into 'pailei2'
Pailei2 zhouxin 50809
See merge request easycorp/zentaopms!2324
|
2022-03-17 07:24:24 +00:00 |
|
|
zhouxin
|
b705f22460
|
Adjust lang.
|
2022-03-17 07:05:36 +00:00 |
|
|
zhouxin
|
95312f6b7b
|
Adjust lang.
|
2022-03-17 07:04:24 +00:00 |
|
|
mayue
|
f48f09fa0d
|
Optimize code.
|
2022-03-17 14:52:02 +08:00 |
|
|
zhouxin
|
9062870343
|
Fix bug #18766.
|
2022-03-17 06:48:33 +00:00 |
|
|
mayue
|
121dc576fb
|
* Fix bug #14363.
|
2022-03-17 14:37:24 +08:00 |
|
|
李玉春
|
19973ac398
|
Merge branch 'sprint/pailei2_zhouxudong_16264' into 'pailei2'
* Fix bug #16264.
See merge request easycorp/zentaopms!2320
|
2022-03-17 06:28:41 +00:00 |
|