孙广明
|
3ab13aa61e
|
Merge branch 'sprint/182_songchenxuan_action_lang' into 'master'
*Case action lang.
See merge request easycorp/zentaopms!1322
|
2022-01-11 00:36:32 +00:00 |
|
songchenxuan
|
bb13431274
|
*Fix bug 18074.
|
2022-01-11 08:34:55 +08:00 |
|
liumengyi
|
cc3c90291d
|
* Finish task #47483.
|
2022-01-10 17:32:31 +08:00 |
|
songchenxuan
|
3e5df731bc
|
*Fix bug #18074.
|
2022-01-06 17:32:48 +08:00 |
|
liumengyi
|
6613dc493f
|
* Finish task #47092.
|
2022-01-06 15:29:45 +08:00 |
|
liumengyi
|
42e9076e66
|
* Finish task #47081 #47092 #47093 #47111.
|
2022-01-06 15:25:09 +08:00 |
|
孙广明
|
c8db935f34
|
Merge branch '180'
|
2022-01-04 22:41:23 +08:00 |
|
zhujinyong
|
ff9ceaccad
|
* Check auth.
|
2022-01-05 09:05:32 +08:00 |
|
xieqiyu
|
5c4609d302
|
* Modify review problem.
|
2021-12-31 15:43:27 +08:00 |
|
hufangzhou
|
1a5adfe15f
|
* Fix bug for compatible php8.0 .
|
2021-12-28 14:46:10 +08:00 |
|
xieqiyu
|
5ab26fee54
|
* Finish task#46543.
|
2021-12-28 13:38:35 +08:00 |
|
mayue
|
77d36b7467
|
* Finish a task #45544.
|
2021-12-14 09:49:46 +08:00 |
|
hufangzhou
|
d876550d96
|
* Add the traditional Chinese language item.
|
2021-12-07 09:22:58 +08:00 |
|
王怡栋
|
7091037194
|
Merge branch 'sprint/175_sgm_upgrade' into 'master'
Sprint/175 sgm upgrade
See merge request easycorp/zentaopms!786
|
2021-12-06 07:14:51 +00:00 |
|
孙广明
|
e24ded1429
|
Merge branch 'sprint/174_hufangzhou_17116' into 'master'
* Fix bug #17116, bug #17117.
See merge request easycorp/zentaopms!789
|
2021-12-06 05:07:38 +00:00 |
|
hufangzhou
|
05d9182e31
|
* Fix bug #17116, bug #17117.
|
2021-12-06 12:09:15 +08:00 |
|
李玉春
|
4a2d21595e
|
Merge branch 'sptint/174_xieqiyu_17079' into 'master'
* Fix bug#17079.
See merge request easycorp/zentaopms!778
|
2021-12-06 03:22:48 +00:00 |
|
孙广明
|
69304124b5
|
* Change for upgrade.
|
2021-12-06 10:58:52 +08:00 |
|
孙广明
|
ad1cc7c04f
|
Merge branch 'sprint/174_hufangzhou_17077' into 'master'
* Fix bug #17077.
See merge request easycorp/zentaopms!774
|
2021-12-06 02:33:35 +00:00 |
|
xieqiyu
|
4de8fc462f
|
* Fix bug#17079.
|
2021-12-06 09:33:41 +08:00 |
|
hufangzhou
|
e1b5dd4642
|
* Add the unitcases method for remove the branch select.
|
2021-12-06 09:12:46 +08:00 |
|
liyuchun
|
5c23642d36
|
* Fix bug #16639.
|
2021-12-06 09:06:50 +08:00 |
|
hufangzhou
|
6eeaa44aa0
|
* Fix bug #17077.
|
2021-12-06 08:58:58 +08:00 |
|
mayue
|
8ba4ebf390
|
* Conflict resolution #17036.
|
2021-12-02 15:40:02 +08:00 |
|
mayue
|
f6676e2757
|
* Conflict resolution #17036.
|
2021-12-02 15:36:31 +08:00 |
|
mayue
|
8c355ac388
|
* Modify style #17036.
|
2021-12-02 15:30:23 +08:00 |
|
tianshujie
|
d33b9ae7e6
|
* Fix bug #17006,16785.
|
2021-12-02 10:11:18 +08:00 |
|
李玉春
|
d258b05fd4
|
Merge branch 'sprint/174_songchenxuan_16798' into 'master'
* Fix bug #16798.
See merge request easycorp/zentaopms!708
|
2021-12-01 06:23:41 +00:00 |
|
songchenxuan
|
98b5a77754
|
* Fix bug #16798.
|
2021-12-01 14:16:24 +08:00 |
|
tianshujie
|
ac27fd80d8
|
* Fix bug #16781.
|
2021-12-01 13:30:10 +08:00 |
|
tianshujie
|
7498352698
|
* Fix bug #16789.
|
2021-12-01 13:13:21 +08:00 |
|
xieqiyu
|
b3e9bd7e61
|
* Delete unused code.
|
2021-12-01 08:42:20 +08:00 |
|
xieqiyu
|
4c0eb137da
|
* Finish task#45004.
|
2021-11-30 19:43:49 +08:00 |
|
李玉春
|
cb03696c8a
|
Merge branch 'sprint/174_songchenxuan_45019' into 'master'
* Finish task #45019.
See merge request easycorp/zentaopms!671
|
2021-11-30 06:45:00 +00:00 |
|
songchenxuan
|
a8b2009bad
|
* Finish task #45019.
|
2021-11-30 14:00:37 +08:00 |
|
tianshujie
|
2a469dc6f7
|
* Modify use case branch query conditions.
|
2021-11-30 11:17:10 +08:00 |
|
tianshujie
|
d2f57affa6
|
* Finish task #45000.
|
2021-11-30 10:30:36 +08:00 |
|
tianshujie
|
826a99a0b7
|
* Finish task #45005,45007.
|
2021-11-30 10:12:47 +08:00 |
|
李玉春
|
a99419f0c5
|
Merge branch 'master' into 'sprint/174_tianshujie_45081'
# Conflicts:
# module/product/control.php
# module/story/view/batchedit.html.php
|
2021-11-29 08:03:38 +00:00 |
|
tianshujie
|
f2b60bda9e
|
* Finish task #45011.
|
2021-11-27 19:17:38 +08:00 |
|
mayue
|
ffaaf3ab6e
|
* Fix bug #16640.
|
2021-11-26 15:23:26 +08:00 |
|
mayue
|
0a3c124b20
|
* Fix bug #16640.
|
2021-11-26 13:34:17 +08:00 |
|
mayue
|
f92ba845a3
|
* Fix bug #16605.
|
2021-11-25 14:35:33 +08:00 |
|
mayue
|
1cf28e1120
|
* Fix bug #16605.
|
2021-11-25 13:20:54 +08:00 |
|
王怡栋
|
d9ee0bfbf7
|
Merge branch 'master' into 'sprint/170_package_bug'
# Conflicts:
# module/mr/model.php
|
2021-11-25 00:32:52 +00:00 |
|
songchenxuan
|
7fc99d65fd
|
* Fix bug 16696.
|
2021-11-24 10:51:49 +08:00 |
|
songchenxuan
|
fc0e55a418
|
* Fix bug #16656.
|
2021-11-24 10:00:59 +08:00 |
|
songchenxuan
|
049ae60320
|
* Fix bug #16642.
|
2021-11-23 17:30:37 +08:00 |
|
王怡栋
|
74a41448dc
|
* add lang for mobile api.
|
2021-11-23 09:35:16 +08:00 |
|
xieqiyu
|
0669e7385b
|
* Fix bug#16519.
|
2021-11-22 12:33:27 +08:00 |
|