 孙广明
|
021b08995f
|
Merge branch 'sprint/180_xieqiyu_18241' into 'master'
* Fix bug#18241.
See merge request easycorp/zentaopms!1308
|
2022-01-07 01:33:48 +00:00 |
|
|
xieqiyu
|
0d9b03dbfb
|
* Fix bug#18241.
|
2022-01-07 09:27:48 +08:00 |
|
|
孙广明
|
069f119566
|
Merge branch 'code_review/001_mayue' into 'master'
* Optimize code.
See merge request easycorp/zentaopms!1302
|
2022-01-07 01:20:56 +00:00 |
|
|
mayue
|
7e3e42edaa
|
* Optimize code format.
|
2022-01-07 09:19:26 +08:00 |
|
|
mayue
|
91ff44d32e
|
* Optimize code.
|
2022-01-07 09:14:27 +08:00 |
|
|
孙广明
|
d5efab2baf
|
Merge branch 'master' into 'sprint/180_xieqiyu_18166'
# Conflicts:
# module/project/config.php
|
2022-01-07 00:46:43 +00:00 |
|
|
xieqiyu
|
af54ab16c6
|
* Fix bug#18242,18241,18240,18239.
|
2022-01-07 08:35:18 +08:00 |
|
|
孙广明
|
bff2f36c90
|
Merge branch 'sprint/181_liumengyi_fixbug' into 'master'
* Finish task #47090 #47098.
See merge request easycorp/zentaopms!1303
|
2022-01-06 09:25:15 +00:00 |
|
|
liumengyi
|
b6ea0afcb4
|
* Finish task #47090 #47098.
|
2022-01-06 16:56:27 +08:00 |
|
|
mayue
|
f151953a49
|
* Optimize code.
|
2022-01-06 15:55:49 +08:00 |
|
|
tianshujie
|
127b69d4c7
|
* Fix bug #18095.
|
2022-01-06 13:47:18 +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 |
|
|
李玉春
|
d7a9f2fd67
|
Merge branch 'sprint/180_mayue_46526' into 'sprint/180'
* Finish task #46526.
See merge request easycorp/zentaopms!1249
|
2022-01-04 07:32:59 +00:00 |
|
|
mayue
|
e955bc4518
|
* Optimize code.
|
2022-01-04 15:30:41 +08:00 |
|
|
mayue
|
1d28df0e30
|
* Optimize code.
|
2022-01-04 15:27:07 +08:00 |
|
|
mayue
|
0cd9411371
|
* Finish task #46526.
|
2022-01-04 10:28:53 +08:00 |
|
|
xieqiyu
|
5c4609d302
|
* Modify review problem.
|
2021-12-31 15:43:27 +08:00 |
|
|
mayue
|
3e3741796e
|
* Finish task #46526.
|
2021-12-31 13:03:18 +08:00 |
|
|
tanghucheng
|
9f341e49ed
|
* Finish task #46677.
|
2021-12-30 15:10:54 +08:00 |
|
|
mayue
|
7ac03ddd38
|
* Optimized code.
|
2021-12-28 17:14:32 +08:00 |
|
|
mayue
|
3aeb86e36d
|
* Finish task #46526.
|
2021-12-28 15:22:08 +08:00 |
|
|
xieqiyu
|
cac3878f12
|
* Add return value.
|
2021-12-28 14:56:04 +08:00 |
|
|
xieqiyu
|
b6e0307110
|
* Modify review problem.
|
2021-12-28 14:05:58 +08:00 |
|
|
xieqiyu
|
5ab26fee54
|
* Finish task#46543.
|
2021-12-28 13:38:35 +08:00 |
|
|
mayue
|
521cb5654a
|
* Optimize code.
|
2021-12-22 11:10:37 +08:00 |
|
|
mayue
|
11a989307b
|
* Fix a bug #16292.
|
2021-12-22 10:07:01 +08:00 |
|
|
mayue
|
a978eff5f0
|
* Fix bug #16292.
|
2021-12-20 15:32:36 +08:00 |
|
|
hufangzhou
|
6da1c0d285
|
* Fix bug #17263.
|
2021-12-08 16:20:08 +08:00 |
|
|
孙广明
|
13f162edd2
|
* Merge 169 untrack file to master.
|
2021-12-08 11:07:06 +08:00 |
|
|
xieqiyu
|
bccefb7751
|
* Fix bug#17188.
|
2021-12-07 14:22:56 +08:00 |
|
|
李玉春
|
199577f068
|
Merge branch 'sprint/29_zhouxin_16905' into 'master'
Fix bug #16905.
See merge request easycorp/zentaopms!709
|
2021-12-02 03:19:57 +00:00 |
|
|
李玉春
|
b1cd56f4b3
|
Merge branch 'sprint/174_hufangzhou_45079' into 'master'
Sprint/174 hufangzhou 45079
See merge request easycorp/zentaopms!715
|
2021-12-02 02:53:09 +00:00 |
|
|
hufangzhou
|
3c8e265ab7
|
* Fix bug #16986.
|
2021-12-02 10:04:14 +08:00 |
|
|
tanghucheng
|
8164998a64
|
* Code task #45101.
|
2021-12-01 14:56:45 +08:00 |
|
|
zhouxin
|
126cc84b31
|
Finish task #16905.
|
2021-12-01 06:27:24 +00:00 |
|
|
tanghucheng
|
df91b19a57
|
* Code for task #45101.
|
2021-12-01 14:24:32 +08:00 |
|
|
tanghucheng
|
ff0b8d0c9c
|
* Finish task #45101.
|
2021-12-01 13:01:54 +08:00 |
|
|
孙广明
|
c42cca1249
|
Merge branch 'sprint/168'
|
2021-11-30 14:38:32 +08:00 |
|
|
zhouxin
|
e732fd1a51
|
Finish task 45102.
|
2021-11-26 02:25:56 +00:00 |
|
|
王怡栋
|
01e9096140
|
* code for task #44946.
|
2021-11-25 17:00:24 +08:00 |
|
|
王怡栋
|
90a913ca4b
|
Merge branch 'sprint/170'
|
2021-11-22 16:59:40 +08:00 |
|
|
王怡栋
|
fde5cb61da
|
Merge branch 'sprint/app10' into sprint/170
|
2021-11-19 08:41:00 +08:00 |
|
|
王怡栋
|
75b3876193
|
* adjust for bug changed status.
|
2021-11-18 15:47:54 +08:00 |
|
|
王怡栋
|
26b110b73a
|
* code for task #44331.
|
2021-11-18 13:45:32 +08:00 |
|
|
王怡栋
|
3510f6ef63
|
* code for task #44321.
|
2021-11-18 11:20:39 +08:00 |
|
|
孙广明
|
9c8c16a476
|
* Fix bug #16234.
|
2021-11-16 09:30:39 +08:00 |
|
|
李玉春
|
68653946e5
|
Merge branch 'sprint/171_sgm_sortwiki' into 'sprint/168'
Sprint/171 sgm sortwiki
See merge request easycorp/zentaopms!435
|
2021-11-12 05:24:19 +00:00 |
|
|
孙广明
|
4bc3f4c03a
|
* Fix details.
|
2021-11-12 13:17:37 +08:00 |
|
|
孙广明
|
7130de00a8
|
Merge branch 'sprint/168_sunhao/doc_tree_sortable' into 'sprint/168'
* Fix drop shadow element position.
See merge request easycorp/zentaopms!433
|
2021-11-12 05:13:54 +00:00 |
|