王怡栋
|
7b7d9f545d
|
Merge branch 'sgm_upgrade' into 'kanban'
* Fix locate bug.
See merge request easycorp/zentaopms!1427
|
2022-01-17 02:23:56 +00:00 |
|
tianshujie
|
a42faa10f1
|
* Fix bug.
|
2022-01-17 10:22:51 +08:00 |
|
孙广明
|
5f58ada861
|
* Fix locate bug.
|
2022-01-17 10:20:06 +08:00 |
|
liumengyi
|
fd20384534
|
* Fix bug #18470.
|
2022-01-17 09:21:11 +08:00 |
|
孙广明
|
66515d7ed8
|
Merge branch 'sprint/182_liumengyi_fixbug' into 'kanban'
* FIx bug #18489,#18478,#18466.
See merge request easycorp/zentaopms!1420
|
2022-01-17 00:57:03 +00:00 |
|
liumengyi
|
cdba989f91
|
* Fix bug #18458,#18473.
|
2022-01-17 08:54:22 +08:00 |
|
liumengyi
|
fc5ad0f893
|
* FIx bug #18489,#18478,#18466.
|
2022-01-16 17:11:40 +08:00 |
|
tianshujie
|
a838e62257
|
* Fix bug #18475.
|
2022-01-14 15:12:29 +08:00 |
|
王怡栋
|
25d152f63d
|
Merge branch 'sgm_kanban' into 'kanban'
* Fix details and add upgrade logic.
See merge request easycorp/zentaopms!1411
|
2022-01-14 06:37:28 +00:00 |
|
孙广明
|
19aaf9740c
|
* Fix details and add upgrade logic.
|
2022-01-14 14:31:59 +08:00 |
|
孙广明
|
31492d118b
|
Merge branch 'sprint/182_tianshujie_kanban' into 'kanban'
* Finish task #47359,47360.
See merge request easycorp/zentaopms!1410
|
2022-01-14 05:53:56 +00:00 |
|
tianshujie
|
61590215c1
|
* Finish task #47359,47360.
|
2022-01-14 13:47:30 +08:00 |
|
孙广明
|
13e653f600
|
* Process kanban execution.
|
2022-01-14 13:34:47 +08:00 |
|
xieqiyu
|
d4365afb0b
|
* Add project test case.
|
2022-01-14 08:32:53 +08:00 |
|
liumengyi
|
92c3693650
|
* Fix bug #18419, #18414, #18411.
|
2022-01-13 17:20:21 +08:00 |
|
liumengyi
|
8850815c58
|
* Finish task #47339.
|
2022-01-13 14:13:03 +08:00 |
|
tianshujie
|
bc265f9364
|
* Finish task #47333,47313.
|
2022-01-13 11:02:07 +08:00 |
|
王怡栋
|
37d1c0e9e6
|
* code for task #47149.
|
2022-01-13 09:03:35 +08:00 |
|
tianshujie
|
a0d61f9d2f
|
* Working with Kanban Data.
|
2022-01-12 11:07:02 +08:00 |
|
tianshujie
|
e19602194a
|
* Modify the editing project error problem.
|
2022-01-12 10:30:55 +08:00 |
|
孙广明
|
62b7f5eac1
|
Merge branch 'sprint/182_liumengyi_47340' into 'kanban'
* Finish task #47340.When adding kanban execution, create region, group, lanes and columns.
See merge request easycorp/zentaopms!1344
|
2022-01-11 07:53:14 +00:00 |
|
liumengyi
|
ec74445096
|
* Finish task #47340.When adding kanban execution, create region, group, lanes and columns.
|
2022-01-11 15:38:50 +08:00 |
|
王怡栋
|
6fecf642ae
|
* code for task #47157.
|
2022-01-11 15:24:18 +08:00 |
|
孙广明
|
54fc83b0fc
|
* Add execution kanban list.
|
2022-01-11 11:17:41 +08:00 |
|
Wenrui LI
|
614f530249
|
* tweak project create for lite, task #47148.
|
2022-01-11 10:05:26 +08:00 |
|
王怡栋
|
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 |
|