 王怡栋
|
9f778e38b5
|
Merge branch 'revert-3e9bcdb8' into 'master'
Revert "Merge branch 'sprint/182_hufangzhou_47331' into 'master'"
See merge request easycorp/zentaopms!1328
|
2022-01-11 00:43:35 +00:00 |
|
|
孙广明
|
1cae18380b
|
Revert "Merge branch 'sprint/182_hufangzhou_47330' into 'master'"
This reverts merge request !1324
|
2022-01-11 00:39:37 +00:00 |
|
|
孙广明
|
b57562e99e
|
Revert "Merge branch 'sprint/182_hufangzhou_47331' into 'master'"
This reverts merge request !1326
|
2022-01-11 00:35:04 +00:00 |
|
|
hufangzhou
|
0b9e2c0fa3
|
* Finish task #47331.
|
2022-01-10 17:18:18 +08:00 |
|
|
hufangzhou
|
075ac6efc5
|
* Adjust the lang item order.
|
2022-01-10 15:58:01 +08:00 |
|
|
hufangzhou
|
63226a2e84
|
* Finish task #47330.
|
2022-01-10 15:45:24 +08:00 |
|
|
tianshujie
|
85773e58cd
|
* Fix bug #18280.
|
2022-01-07 11:01:47 +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
|
91ff44d32e
|
* Optimize code.
|
2022-01-07 09:14:27 +08:00 |
|
|
xieqiyu
|
3186827004
|
* Modify name.
|
2022-01-07 08:53:18 +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 |
|
|
李玉春
|
05ec5dad47
|
Merge branch 'code_review/001_mayue' into 'master'
* Optimize code.
See merge request easycorp/zentaopms!1301
|
2022-01-06 08:01:30 +00:00 |
|
|
mayue
|
1980e18d38
|
* Optimize code.
|
2022-01-06 16:00:28 +08:00 |
|
|
mayue
|
f151953a49
|
* Optimize code.
|
2022-01-06 15:55:49 +08:00 |
|
|
liumengyi
|
42e9076e66
|
* Finish task #47081 #47092 #47093 #47111.
|
2022-01-06 15:25:09 +08:00 |
|
|
mayue
|
fcb699c84d
|
* Fix bug #18147,18149.
|
2022-01-06 13:38:10 +08:00 |
|
|
zhouxin
|
7c1d29f971
|
Fix bug.
|
2022-01-06 05:12:36 +00:00 |
|
|
zhouxin
|
b74b175a9a
|
Do some little change.
|
2022-01-06 05:01:18 +00:00 |
|
|
朱金勇
|
cb699a9f5a
|
Merge branch 'sprint/181_tianshujie_lang' into 'master'
* Modify the English language item of the currency.
See merge request easycorp/zentaopms!1277
|
2022-01-06 04:53:49 +00:00 |
|
|
李玉春
|
a19708adeb
|
Merge branch 'master' into 'sprint/32_zhouxin_fixbugs'
# Conflicts:
# module/project/config.php
|
2022-01-06 04:01:16 +00:00 |
|
|
zhouxin
|
0b08489176
|
Fix bug.
|
2022-01-06 03:57:50 +00:00 |
|
|
李玉春
|
0943f58b83
|
Merge branch 'sprint/32_zhouxin_fixbugs' into 'master'
Fix bug.
See merge request easycorp/zentaopms!1282
|
2022-01-06 03:27:12 +00:00 |
|
|
zhouxin
|
520f6077bd
|
Add testtask and release table.
|
2022-01-06 03:25:52 +00:00 |
|
|
zhouxin
|
05192bdb3e
|
Fix bug.
|
2022-01-06 03:21:03 +00:00 |
|
|
tianshujie
|
5929a4fc32
|
* Modify the English language item of the currency.
|
2022-01-06 10:35:25 +08:00 |
|
|
zhouxin
|
ee431f18e3
|
Fix bug #18199.
|
2022-01-05 05:09:08 +00:00 |
|
|
zhujinyong
|
ff9ceaccad
|
* Check auth.
|
2022-01-05 09:05:32 +08:00 |
|
|
孙广明
|
c8db935f34
|
Merge branch '180'
|
2022-01-04 22:41:23 +08:00 |
|
|
孙广明
|
a2bd7cfcf3
|
Merge branch 'sprint/32_zhouxin_fixbugs' into 'master'
Fix bug #18199.
See merge request easycorp/zentaopms!1266
|
2022-01-05 05:15:13 +00:00 |
|
|
孙广明
|
2ad05dd024
|
Merge branch 'sprint/180_hufangzhou_closeModel' into 'master'
* Compatible with Firefox browser.
See merge request easycorp/zentaopms!1262
|
2022-01-05 05:11:43 +00:00 |
|
|
hufangzhou
|
4d78e4b9d3
|
* Compatible with Firefox browser.
|
2022-01-05 10:54:34 +08:00 |
|
|
mayue
|
15d588491f
|
* Revert code.
|
2022-01-04 17:19:45 +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
|
1d28df0e30
|
* Optimize code.
|
2022-01-04 15:27:07 +08:00 |
|
|
mayue
|
0cd9411371
|
* Finish task #46526.
|
2022-01-04 10:28:53 +08:00 |
|
|
朱金勇
|
24ad4bc48c
|
Merge branch 'sprint/180_xieqiyu_46520' into 'sprint/180'
Sprint/180 xieqiyu 46520
See merge request easycorp/zentaopms!1228
|
2021-12-31 07:53:33 +00:00 |
|
|
xieqiyu
|
5c4609d302
|
* Modify review problem.
|
2021-12-31 15:43:27 +08:00 |
|
|
zhujinyong
|
e944c4a428
|
Merge branch 'sprint/180_sunhao/task46524' into sprint/180
|
2021-12-31 11:21:25 +08:00 |
|
|
Hao Sun
|
1bdc313562
|
* Task #46524, refactor some pages with user-picker.
|
2021-12-30 17:35:41 +08:00 |
|
|
孙广明
|
286c772523
|
Merge branch 'sprint/180_xieqiyu_46543' into 'sprint/180'
* Modify the problems.
See merge request easycorp/zentaopms!1214
|
2021-12-30 09:26:57 +00:00 |
|
|
xieqiyu
|
ed73332c41
|
* Modify the problems.
|
2021-12-30 17:17:46 +08:00 |
|
|
Hao Sun
|
dff300cf88
|
* Task #46524, refactor user selector for page "project/managemembers".
|
2021-12-30 17:02:32 +08:00 |
|
|
Hao Sun
|
d41525719b
|
* refactor.
|
2021-12-30 17:01:49 +08:00 |
|
|
mayue
|
64d6d35a87
|
* Optimize code.
|
2021-12-30 17:01:13 +08:00 |
|
|
孙广明
|
355665690b
|
Merge branch 'sprint/32_zhouxin_46674' into 'master'
Sprint/32 zhouxin 46674
See merge request easycorp/zentaopms!1195
|
2021-12-30 08:15:39 +00:00 |
|
|
zhouxin
|
50dabf7bd7
|
Refactor method checkCanChangeModel.
|
2021-12-30 08:09:50 +00:00 |
|
|
Hao Sun
|
4d2010f2be
|
* fix setRole not work.
|
2021-12-30 15:38:21 +08:00 |
|
|
zhouxin
|
e9231b595a
|
Change configuration file.
|
2021-12-30 07:16:28 +00:00 |
|
|
孙广明
|
9ccf3099a0
|
Merge branch 'sprint/32_zhouxin_46679' into 'master'
Finish task #46679 and fix a bug.
See merge request easycorp/zentaopms!1194
|
2021-12-30 06:44:16 +00:00 |
|