孙广明
|
2ec4e43353
|
Merge branch 'sprint/183_tianshujie_18838' into 'master'
* Fix bug #18838.
See merge request easycorp/zentaopms!1591
|
2022-01-25 03:20:31 +00:00 |
|
孙广明
|
df75841d5b
|
Merge branch 'sprint/183_xt_card' into 'master'
Sprint/183 xt card
See merge request easycorp/zentaopms!1587
|
2022-01-25 03:19:35 +00:00 |
|
tianshujie
|
7001f6c2d5
|
* Fix bug #18838.
|
2022-01-25 11:16:14 +08:00 |
|
孙广明
|
7a77064493
|
Merge branch 'sprint/183_zhouxin_fixbugs' into 'master'
Adjust code.
See merge request easycorp/zentaopms!1588
|
2022-01-25 03:12:57 +00:00 |
|
孙广明
|
5af5b98a3c
|
Merge branch 'Fixbug' into 'master'
*Fix bug18942.
See merge request easycorp/zentaopms!1589
|
2022-01-25 03:12:35 +00:00 |
|
zhengrunyu
|
b3ebd6f98b
|
*Fixbug18942.
|
2022-01-25 11:11:16 +08:00 |
|
zhengrunyu
|
8e470d86a4
|
*Fix bug18942.
|
2022-01-25 11:03:05 +08:00 |
|
liumengyi
|
571f530460
|
* Fix bug #18936, #18924.
|
2022-01-25 11:03:05 +08:00 |
|
zhouxin
|
a5343e7d36
|
Adjust code.
|
2022-01-25 02:52:07 +00:00 |
|
xieqiyu
|
a0306d6c6b
|
* Delete space line.
|
2022-01-25 10:42:21 +08:00 |
|
tianshujie
|
a0f307452a
|
Merge branch 'sprint/183_xt_card' of https://gitlab.zcorp.cc/easycorp/zentaopms into card
|
2022-01-25 10:39:44 +08:00 |
|
tianshujie
|
8b0bd45bf6
|
* Build add delete flag.
|
2022-01-25 10:39:17 +08:00 |
|
xieqiyu
|
f010d79708
|
* Add color.
|
2022-01-25 10:34:12 +08:00 |
|
xieqiyu
|
eae8f49e94
|
* Modify error.
|
2022-01-25 10:14:32 +08:00 |
|
孙广明
|
3883262c0e
|
Merge branch 'sprint/scx_international_lang' into 'master'
*International lang.
See merge request easycorp/zentaopms!1584
|
2022-01-25 02:13:55 +00:00 |
|
xieqiyu
|
a182d70628
|
* Display duplicate imported cards.
|
2022-01-25 10:11:41 +08:00 |
|
tianshujie
|
a8334bed66
|
* Modify details.
|
2022-01-25 10:02:59 +08:00 |
|
songchenxuan
|
73207475ae
|
*International lang.
|
2022-01-25 09:54:31 +08:00 |
|
tianshujie
|
14c68e0cf7
|
* Modify card style.
|
2022-01-25 09:29:43 +08:00 |
|
tianshujie
|
62d7380d6e
|
Merge branch 'sprint/183_xt_card' of https://gitlab.zcorp.cc/easycorp/zentaopms into card
|
2022-01-25 09:26:10 +08:00 |
|
tianshujie
|
590715c6d4
|
* Query plan and version creator.
|
2022-01-25 09:25:35 +08:00 |
|
xieqiyu
|
1801b1e783
|
* Add pending future to the product plan.
|
2022-01-25 09:10:26 +08:00 |
|
孙广明
|
b2d1125ff9
|
* Fix delete kanban column bug.
|
2022-01-25 08:47:57 +08:00 |
|
孙广明
|
2c350e6ad6
|
Merge branch 'sprint/183_liumengyi_fixbug' into 'master'
* Fix bug #18907.
See merge request easycorp/zentaopms!1577
|
2022-01-25 00:20:26 +00:00 |
|
hufangzhou
|
0105b70258
|
* Finish task #48000.
|
2022-01-25 08:19:04 +08:00 |
|
xieqiyu
|
053985fb05
|
* Code for task#47988.
|
2022-01-24 23:12:40 +08:00 |
|
tianshujie
|
c1faac726f
|
* Finish task #47992.
|
2022-01-24 18:26:16 +08:00 |
|
tianshujie
|
e1bf31d73b
|
Merge branch 'sprint/183_xt_card' of https://gitlab.zcorp.cc/easycorp/zentaopms into card
|
2022-01-24 18:16:51 +08:00 |
|
tianshujie
|
7a7ad37f3c
|
* Finish task #47990.
|
2022-01-24 18:16:28 +08:00 |
|
liumengyi
|
077df631ac
|
* Fix bug #18907.
|
2022-01-24 17:31:35 +08:00 |
|
孙广明
|
c48452ae1a
|
Merge branch 'sprint/183_liumengyi_18883' into 'master'
* Finish task 18883,add project team.
See merge request easycorp/zentaopms!1575
|
2022-01-24 09:25:29 +00:00 |
|
liumengyi
|
b6b895bb87
|
* Modify how the creator is appended to team members.
|
2022-01-24 17:20:38 +08:00 |
|
liumengyi
|
30236e6a94
|
* Remove empty line.
|
2022-01-24 17:11:25 +08:00 |
|
xieqiyu
|
c4fffd292e
|
* Modify iframe class.
|
2022-01-24 17:04:36 +08:00 |
|
tianshujie
|
331e00ab2b
|
* Modify area style.
|
2022-01-24 17:04:07 +08:00 |
|
tianshujie
|
bffc71132d
|
* Add permission judgment.
|
2022-01-24 16:58:14 +08:00 |
|
liumengyi
|
ecc9e22867
|
* Finish task 18883,add project team.
|
2022-01-24 16:54:30 +08:00 |
|
孙广明
|
0ff2692de7
|
Merge branch 'sprint/183_tianshjie_18861' into 'master'
* Fix bug #18861.
See merge request easycorp/zentaopms!1573
|
2022-01-24 08:39:34 +00:00 |
|
tianshujie
|
86649bcad9
|
* Modify the format.
|
2022-01-24 16:38:52 +08:00 |
|
孙广明
|
050897d304
|
Merge branch 'sprint/183_xieqiyu_importdropmenu' into 'master'
* Modify import drop menu.
See merge request easycorp/zentaopms!1572
|
2022-01-24 08:37:47 +00:00 |
|
tianshujie
|
7234d6bc9b
|
* Fix bug #18861.
|
2022-01-24 16:37:46 +08:00 |
|
孙广明
|
46a66b038d
|
Merge branch 'sprint/183_tianshujie_18848' into 'master'
* Fix bug #18848.
See merge request easycorp/zentaopms!1571
|
2022-01-24 08:28:39 +00:00 |
|
xieqiyu
|
2838e9dc76
|
* Modify import drop menu.
|
2022-01-24 16:28:00 +08:00 |
|
tianshujie
|
67e57e26b7
|
* Modify the format.
|
2022-01-24 16:27:57 +08:00 |
|
tianshujie
|
281885f598
|
* Fix bug #18848.
|
2022-01-24 16:24:52 +08:00 |
|
孙广明
|
81ce7460b4
|
* Fix kanban bug.
|
2022-01-24 16:13:36 +08:00 |
|
孙广明
|
6bcb09a6d9
|
Merge branch 'sprint/183_liumengyi_18883' into 'master'
Sprint/183 liumengyi 18883
See merge request easycorp/zentaopms!1565
|
2022-01-24 07:30:40 +00:00 |
|
孙广明
|
72de0a1b9c
|
Merge branch 'master' into 'sprint/183_xieqiyu_47995new'
# Conflicts:
# db/update16.2.sql
# module/group/lang/resource.php
# module/kanban/js/view.js
# module/kanban/model.php
|
2022-01-24 07:28:48 +00:00 |
|
liumengyi
|
c3b7172f24
|
* Fix bug #18883.
|
2022-01-24 15:23:17 +08:00 |
|
tianshujie
|
dfa075beb7
|
* Edit view link.
|
2022-01-24 15:16:29 +08:00 |
|