 朱金勇
|
1ce16c8e3a
|
Merge branch 'sprint/scx_international' into 'master'
Sprint/scx international
See merge request easycorp/zentaopms!1499
|
2022-01-20 07:38:04 +00:00 |
|
|
朱金勇
|
399fac5edc
|
Merge branch 'sprint/scx_lang' into 'master'
*Code lang for international ZenTao.
See merge request easycorp/zentaopms!1521
|
2022-01-20 07:37:10 +00:00 |
|
|
songchenxuan
|
4ce9f83f06
|
*Code lang for international ZenTao.
|
2022-01-20 15:33:12 +08:00 |
|
|
王怡栋
|
beaed8f006
|
Merge branch 'sprint/183_liumengyi_48011' into 'master'
* Finish task #48011.
See merge request easycorp/zentaopms!1519
|
2022-01-20 06:56:11 +00:00 |
|
|
liumengyi
|
df8366e1ad
|
* Modify code format.
|
2022-01-20 14:55:06 +08:00 |
|
|
liumengyi
|
e2e794c27f
|
* Finish task #48011.
|
2022-01-20 14:49:16 +08:00 |
|
|
王怡栋
|
6cf1ba1cf4
|
Merge branch 'revert-98d5844e' into 'master'
Revert "Merge branch 'devops_caoyanyi' into 'master'"
See merge request easycorp/zentaopms!1517
|
2022-01-20 06:07:56 +00:00 |
|
|
王怡栋
|
49cf88b669
|
Merge branch 'sprint/183_tianshujie_48012' into 'master'
* Achieve smooth refresh of completed tasks.
See merge request easycorp/zentaopms!1516
|
2022-01-20 05:50:27 +00:00 |
|
|
tianshujie
|
7383bb566d
|
* Modify the question.
|
2022-01-20 13:49:21 +08:00 |
|
|
李玉春
|
39e8a3fae7
|
Revert "Merge branch 'devops_caoyanyi' into 'master'"
This reverts merge request !1515
|
2022-01-20 05:42:05 +00:00 |
|
|
李玉春
|
98d5844e64
|
Merge branch 'devops_caoyanyi' into 'master'
* Modify page error.
See merge request easycorp/zentaopms!1515
|
2022-01-20 05:41:54 +00:00 |
|
|
tianshujie
|
ee15a96157
|
* Achieve smooth refresh of completed tasks.
|
2022-01-20 13:41:20 +08:00 |
|
|
caoyanyi
|
f87294adf7
|
* Modify page error.
|
2022-01-20 05:37:33 +00:00 |
|
|
王怡栋
|
438f0348a6
|
Merge branch 'sprint/183_liumengyi_47977' into 'master'
* Remove acl icon.
See merge request easycorp/zentaopms!1513
|
2022-01-20 05:03:54 +00:00 |
|
|
王怡栋
|
abf1d172a6
|
Merge branch 'sprint/183_liumengyi_47977' into 'master'
* Finish task #48006, #48007.
See merge request easycorp/zentaopms!1512
|
2022-01-20 03:22:28 +00:00 |
|
|
liumengyi
|
00f08fc3cd
|
* Remove acl icon.
|
2022-01-20 11:22:14 +08:00 |
|
|
liumengyi
|
2d6226093e
|
* Modify involved kanban judgment.
|
2022-01-20 11:19:27 +08:00 |
|
|
王怡栋
|
2f6dc0b378
|
Merge branch 'sprint/183_tianshujie_bug' into 'master'
* Fix bug #18783,18780.
See merge request easycorp/zentaopms!1511
|
2022-01-20 03:18:00 +00:00 |
|
|
tianshujie
|
b22eed4a6d
|
* Fix bug #18783,18780.
|
2022-01-20 11:15:33 +08:00 |
|
|
liumengyi
|
083e006c38
|
* Remove empty line.
|
2022-01-20 11:11:08 +08:00 |
|
|
liumengyi
|
b371c22842
|
* Finish task #48006, #48007.
|
2022-01-20 11:05:35 +08:00 |
|
|
王怡栋
|
3a972c69eb
|
Merge branch 'sprint/183_mayue_48002' into 'master'
* Optimize style.
See merge request easycorp/zentaopms!1510
|
2022-01-20 02:56:09 +00:00 |
|
|
mayue
|
bc20febdb0
|
* Optimize style.
|
2022-01-20 10:39:38 +08:00 |
|
|
王怡栋
|
5b4fd4c456
|
Merge branch 'sprint/183_mayue_48002' into 'master'
* Finish task.
See merge request easycorp/zentaopms!1509
|
2022-01-20 02:06:37 +00:00 |
|
|
mayue
|
65df68d61e
|
* Finish task.
|
2022-01-20 10:04:44 +08:00 |
|
|
王怡栋
|
278e4bcb0c
|
Merge branch 'sprint/183_tianshujie_18747' into 'master'
* Fix bug #18747.
See merge request easycorp/zentaopms!1508
|
2022-01-20 01:11:35 +00:00 |
|
|
tianshujie
|
d7be6b0af2
|
* Fix bug #18747.
|
2022-01-20 09:07:19 +08:00 |
|
|
孙广明
|
f30562f520
|
Merge branch 'sprint/183_zhouxin_47980' into 'master'
Finish task #47980.
See merge request easycorp/zentaopms!1496
|
2022-01-19 09:32:28 +00:00 |
|
|
孙广明
|
6d2212e7e0
|
Merge branch 'sprint/183_liumengyi_47977' into 'master'
* Finish task #47977.
See merge request easycorp/zentaopms!1503
|
2022-01-19 09:32:12 +00:00 |
|
|
孙广明
|
8ac4e2e2c5
|
Merge branch 'xieqiyu_fixbug' into 'master'
* Fix bug: click work sort error.
See merge request easycorp/zentaopms!1506
|
2022-01-19 09:30:57 +00:00 |
|
|
孙广明
|
74acc10e1c
|
Merge branch 'sprint/183_mayue_47996'
|
2022-01-19 17:27:09 +08:00 |
|
|
孙广明
|
aaa112c33b
|
Merge branch 'master' into 'sprint/183_mayue_47996'
# Conflicts:
# db/update16.2.sql
|
2022-01-19 09:29:23 +00:00 |
|
|
xieqiyu
|
93fa4d0468
|
* Fix bug: click work sort error.
|
2022-01-19 17:25:20 +08:00 |
|
|
liumengyi
|
9ef522cc46
|
* Modify code format.
|
2022-01-19 17:24:15 +08:00 |
|
|
mayue
|
7cb8fa1912
|
* Optimize code.
|
2022-01-19 17:23:27 +08:00 |
|
|
孙广明
|
f1dd5b30d0
|
Merge branch 'sprint/183_mayue_47979' into 'master'
* Finish task #47979.
See merge request easycorp/zentaopms!1505
|
2022-01-19 09:12:52 +00:00 |
|
|
mayue
|
29bedc7b1f
|
* Optimize code.
|
2022-01-19 17:10:09 +08:00 |
|
|
liumengyi
|
e02ec415c4
|
* Remove useless code.
|
2022-01-19 17:04:54 +08:00 |
|
|
liumengyi
|
5fa4c30acc
|
* Remove useless file.
|
2022-01-19 17:01:21 +08:00 |
|
|
mayue
|
9150697408
|
* Finish task #47979.
|
2022-01-19 16:59:00 +08:00 |
|
|
liumengyi
|
c8b5ceed87
|
* Finish task #47977.
|
2022-01-19 16:58:34 +08:00 |
|
|
liyuchun
|
7e96eb9f68
|
Merge branch 'devops19'
|
2022-01-19 16:55:57 +08:00 |
|
|
mayue
|
39b7da7355
|
* Finish task #47996.
|
2022-01-19 16:50:40 +08:00 |
|
|
孙广明
|
68fb902692
|
Merge branch 'sprint/183_tianshujie_48005' into 'master'
* Finish task #48005.
See merge request easycorp/zentaopms!1501
|
2022-01-19 08:44:06 +00:00 |
|
|
songchenxuan
|
f458304c06
|
*Finish task #47951,47952,47953,47954.
|
2022-01-19 16:43:20 +08:00 |
|
|
tianshujie
|
5bd18ec761
|
* Add conditional judgment.
|
2022-01-19 16:43:00 +08:00 |
|
|
songchenxuan
|
638e65114b
|
*Finish task #47951,47952,47953,47954.
|
2022-01-19 16:36:28 +08:00 |
|
|
tianshujie
|
131cdb614c
|
* Modify card query logic.
|
2022-01-19 16:33:57 +08:00 |
|
|
zhujinyong
|
74a9fedbd2
|
* Fix install function.
|
2022-01-19 16:22:44 +08:00 |
|
|
tianshujie
|
1c60beb471
|
* Finish task #48005.
|
2022-01-19 16:02:34 +08:00 |
|