 hufangzhou
|
4385eab733
|
* Make the order of products in the product drop-down consistent with the product list.
|
2022-06-09 16:25:29 +08:00 |
|
|
caoyanyi
|
6a93732c19
|
* Modify access check.
|
2022-06-09 15:47:28 +08:00 |
|
|
王怡栋
|
c9a29bb420
|
Merge branch 'master' into 'sprint200_leiyong_task_56384'
# Conflicts:
# module/kanban/view/space.html.php
|
2022-06-09 07:40:03 +00:00 |
|
|
李玉春
|
f8581fd2c4
|
Merge branch 'zentaopms_199' into 'master'
Zentaopms 199
See merge request easycorp/zentaopms!3832
|
2022-06-09 07:38:52 +00:00 |
|
|
leiyong
|
1b511cac59
|
* Handling html tags.
|
2022-06-09 07:33:00 +00:00 |
|
|
王怡栋
|
95fa3f04e1
|
Merge branch 'fixbug' into 'master'
* Fix bug #23474,23474,23441,23374.
See merge request easycorp/zentaopms!3830
|
2022-06-09 07:25:39 +00:00 |
|
|
王怡栋
|
ad0ebf0aa1
|
Merge branch 'master' into 'sprint/201_liumengyi_fixbug'
# Conflicts:
# module/execution/js/kanban.js
|
2022-06-09 07:24:23 +00:00 |
|
|
王怡栋
|
349260a146
|
Merge branch 'master_xieqiyu_56386' into 'master'
* Finish task#56386.
See merge request easycorp/zentaopms!3825
|
2022-06-09 07:20:12 +00:00 |
|
|
liumengyi
|
63717f4fd0
|
* Fix bug of task #56454.
|
2022-06-09 15:18:56 +08:00 |
|
|
leiyong
|
c44b1096c4
|
* Adjust code.
|
2022-06-09 07:06:22 +00:00 |
|
|
朱金勇
|
cb488e5635
|
Merge branch 'sgm_productorder' into 'master'
* Fix product order bug.
See merge request easycorp/zentaopms!3828
|
2022-06-09 06:57:24 +00:00 |
|
|
tanghucheng
|
415542746b
|
* Fix bug #23374.
|
2022-06-09 14:54:54 +08:00 |
|
|
孙广明
|
ecd7f1197f
|
* Fix product order bug.
|
2022-06-09 14:48:56 +08:00 |
|
|
leiyong
|
70ee0323f6
|
* Fix bug#23487.
|
2022-06-09 06:48:21 +00:00 |
|
|
tanghucheng
|
c4765a8431
|
* Fix bug #23441.
|
2022-06-09 14:41:26 +08:00 |
|
|
xieqiyu
|
5d5bc8f927
|
* Finish task#56386.
|
2022-06-09 14:35:20 +08:00 |
|
|
王怡栋
|
ce38afd825
|
Merge branch 'sprint/master_zhouxudong_fixbug' into 'master'
* Fix bug.
See merge request easycorp/zentaopms!3817
|
2022-06-09 06:35:07 +00:00 |
|
|
tanghucheng
|
87e879e047
|
* Fix bug #23474,23474.
|
2022-06-09 14:34:11 +08:00 |
|
|
王怡栋
|
084f66dd51
|
Merge branch 'master' into 'sprint/master_zhouxudong_56362'
# Conflicts:
# module/kanban/model.php
|
2022-06-09 06:32:06 +00:00 |
|
|
leiyong
|
aec5b3612e
|
* Finish task#56384.
|
2022-06-09 06:23:50 +00:00 |
|
|
王怡栋
|
174512c042
|
Merge branch 'sgm_feedback' into 'master'
* Finish task #56546.
See merge request easycorp/zentaopms!3824
|
2022-06-09 06:23:39 +00:00 |
|
|
孙广明
|
4fb2be7c61
|
* Finish task #56546.
|
2022-06-09 14:21:03 +08:00 |
|
|
wangyidong
|
f9a14f40d4
|
* adjust for task #56614.
|
2022-06-09 13:50:18 +08:00 |
|
|
zhouxudong
|
1da6718278
|
* Finish task #56362.
|
2022-06-09 05:30:57 +00:00 |
|
|
孙广明
|
f3f8e20c9b
|
Merge branch 'sprint/201_zhouxin_my_work' into 'master'
* Finish task #56461,56462,56458,56465.
See merge request easycorp/zentaopms!3819
|
2022-06-09 05:23:01 +00:00 |
|
|
zhouxin
|
c056b7e567
|
* Finish task #56461,56462,56458,56465.
|
2022-06-09 05:18:27 +00:00 |
|
|
leiyong
|
a71825d731
|
* Fix bug.
|
2022-06-09 05:08:33 +00:00 |
|
|
zhouxudong
|
89d4ecfd35
|
* Finish task #56362.
|
2022-06-09 03:43:20 +00:00 |
|
|
leiyong
|
38a7d7334a
|
* Fix bug#23481,bug#23466.
|
2022-06-09 03:42:53 +00:00 |
|
|
zhouxudong
|
acf028e0a9
|
* Fix bug.
|
2022-06-09 03:24:15 +00:00 |
|
|
王怡栋
|
fd0cb543ba
|
Merge branch 'master' into 'sprint_200'
# Conflicts:
# module/execution/lang/en.php
# module/execution/lang/zh-cn.php
# module/execution/view/kanban.html.php
# module/kanban/css/space.css
|
2022-06-09 03:16:20 +00:00 |
|
|
zhouxudong
|
ea746e862f
|
* Finish task #56362.
|
2022-06-09 03:04:12 +00:00 |
|
|
孙广明
|
ea2fe3e532
|
Merge branch 'sprint200_leiyong_task_56378' into 'sprint_200'
Sprint200 leiyong task 56378
See merge request easycorp/zentaopms!3801
|
2022-06-09 02:40:35 +00:00 |
|
|
leiyong
|
b471a3cdad
|
* Adjust code.
|
2022-06-09 02:36:56 +00:00 |
|
|
caoyanyi
|
35a857fd38
|
* Adjust code.
|
2022-06-09 10:33:39 +08:00 |
|
|
李玉春
|
3df63e8a2f
|
Merge branch 'sprint/199_mayue_story#9206' into 'master'
* Optimize code.
See merge request easycorp/zentaopms!3814
|
2022-06-09 02:32:04 +00:00 |
|
|
王怡栋
|
be10e69fe1
|
Merge branch 'sprint/201_liumengyi_fixbug' into 'master'
* Fix bug.
See merge request easycorp/zentaopms!3813
|
2022-06-09 01:58:21 +00:00 |
|
|
王怡栋
|
1407272999
|
Merge branch 'sprint/201_liumengyi_56454' into 'master'
* Fix bug #23439.
See merge request easycorp/zentaopms!3812
|
2022-06-09 01:58:01 +00:00 |
|
|
王怡栋
|
b0686ec22f
|
Merge branch 'sprint/201_liumengyi_23459' into 'master'
* Fix bug #23459.
See merge request easycorp/zentaopms!3810
|
2022-06-09 01:57:26 +00:00 |
|
|
王怡栋
|
4591b20bd7
|
Merge branch 'sprint/200-zhouxudong_56383' into 'sprint_200'
Sprint/200 zhouxudong 56383
See merge request easycorp/zentaopms!3809
|
2022-06-09 01:57:00 +00:00 |
|
|
mayue
|
0beaa60d98
|
* Optimize code.
|
2022-06-09 09:55:19 +08:00 |
|
|
王怡栋
|
f1f255feb5
|
Merge branch 'sgm_fixbug' into 'master'
* Fix html tag bug.
See merge request easycorp/zentaopms!3804
|
2022-06-09 01:55:06 +00:00 |
|
|
liumengyi
|
b6073c2220
|
* Fix bug.
|
2022-06-09 09:53:27 +08:00 |
|
|
liumengyi
|
2279c5d602
|
* Fix bug #23439.
|
2022-06-09 09:45:06 +08:00 |
|
|
liumengyi
|
7cb27c5456
|
* Fix bug #23459.
|
2022-06-09 09:41:23 +08:00 |
|
|
孙广明
|
5ba7ac7d8b
|
Merge branch 'sprint/199_mayue_story#9206' into 'master'
* Fix bug.
See merge request easycorp/zentaopms!3807
|
2022-06-09 01:30:53 +00:00 |
|
|
孙广明
|
9d477cc0cf
|
Merge branch 'master' into 'liyuchun_56551'
# Conflicts:
# db/update17.0.sql
|
2022-06-09 01:30:08 +00:00 |
|
|
孙广明
|
cfb3814e86
|
Merge branch 'sprint_201_56468' into 'master'
sprint_201_56468
See merge request easycorp/zentaopms!3806
|
2022-06-09 01:29:18 +00:00 |
|
|
mayue
|
4c0d6836b6
|
* Fix bug.
|
2022-06-09 09:28:00 +08:00 |
|
|
liyuchun
|
d4d24b6e9d
|
* Code for task #56551.
|
2022-06-09 01:24:38 +00:00 |
|