 孙广明
|
187c67fd3b
|
Merge branch 'sprint/179_tianshujie_bug' into 'master'
* Fix bug #17694,17683.
See merge request easycorp/zentaopms!1027
|
2021-12-21 03:32:08 +00:00 |
|
|
zhujinyong
|
01a62fe94b
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2021-12-21 11:28:26 +08:00 |
|
|
zhujinyong
|
9ed65123b5
|
* Fix bug: display dropmenu when no lib.
|
2021-12-21 11:27:55 +08:00 |
|
|
tianshujie
|
7d49e79513
|
* Fix bug #17694,17683.
|
2021-12-21 11:26:26 +08:00 |
|
|
朱金勇
|
49ae6abad6
|
Merge branch 'sprint/178_songchenxuan_17563' into 'master'
*Fix bug #17563.
See merge request easycorp/zentaopms!1013
|
2021-12-21 03:11:57 +00:00 |
|
|
朱金勇
|
338657c59f
|
Merge branch 'sprint/178_songchenxuan_17684' into 'master'
*Fix bug #17684.
See merge request easycorp/zentaopms!1024
|
2021-12-21 03:09:34 +00:00 |
|
|
王怡栋
|
a8bcb49883
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2021-12-21 11:08:56 +08:00 |
|
|
朱金勇
|
da2117bb2e
|
Merge branch 'sprint/179_sunhao/icon' into 'master'
* Update icons: add icon-sonarqube, remove icon-zone, update icon-cube.
See merge request easycorp/zentaopms!1025
|
2021-12-21 03:08:34 +00:00 |
|
|
王怡栋
|
bf4dcdd19c
|
* adjust get api version.
|
2021-12-21 11:08:28 +08:00 |
|
|
孙广明
|
68e2a1c668
|
Merge branch 'sprint/179_zhengrunyu_46146' into 'master'
*Fix bug
See merge request easycorp/zentaopms!1023
|
2021-12-21 03:05:42 +00:00 |
|
|
zhengrunyu
|
1681d07f6a
|
*Fix task 46163.
|
2021-12-21 11:04:12 +08:00 |
|
|
zhengrunyu
|
f7ff2b00d9
|
*Fix bug.
|
2021-12-21 10:58:30 +08:00 |
|
|
Hao Sun
|
c4638ccc9d
|
* Update icons: add icon-sonarqube, remove icon-zone, update icon-cube.
|
2021-12-21 10:58:22 +08:00 |
|
|
songchenxuan
|
147c03f2f0
|
*Fix bug #17684.
|
2021-12-21 10:17:51 +08:00 |
|
|
zhengrunyu
|
8599448fda
|
*Fix bug*Fix bug*Fix bug*Fix bug*Fix bug*Fix bug*Fix bug*Fix bug
|
2021-12-21 10:08:11 +08:00 |
|
|
孙广明
|
951dea2b63
|
Merge branch 'sprint/179_tianshujie_bug' into 'master'
* Fix bug #17704,17740,17694.
See merge request easycorp/zentaopms!1022
|
2021-12-21 01:56:29 +00:00 |
|
|
tianshujie
|
8ea2cc8e9e
|
* Fix bug #17704,17740,17694.
|
2021-12-21 09:53:44 +08:00 |
|
|
zhujinyong
|
6307414ef2
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2021-12-21 09:36:54 +08:00 |
|
|
zhujinyong
|
411b060895
|
+ Create demo data for api.
|
2021-12-21 09:36:25 +08:00 |
|
|
孙广明
|
d8c93c3dc8
|
Merge branch 'sprint/179_liumengyi_fixbug' into 'master'
* Fix bug for task#46150,#46158.
See merge request easycorp/zentaopms!1021
|
2021-12-21 01:07:07 +00:00 |
|
|
liumengyi
|
4f369ace40
|
* Modify edit card html.
|
2021-12-21 09:04:57 +08:00 |
|
|
孙广明
|
c5cb021416
|
Merge branch 'sprint/179_tianshujie_46245' into 'master'
* Finish task #46245.
See merge request easycorp/zentaopms!1019
|
2021-12-21 01:02:52 +00:00 |
|
|
liumengyi
|
8318d1fa69
|
* Fix bug for task#46150,#46158.
|
2021-12-21 09:02:24 +08:00 |
|
|
tianshujie
|
5863beeb76
|
* Remove extra spaces.
|
2021-12-21 09:01:53 +08:00 |
|
|
孙广明
|
53c741481b
|
Merge branch 'sprint/179_zhengrunyu_Fixbug' into 'master'
Sprint/179 zhengrunyu fixbug
See merge request easycorp/zentaopms!1020
|
2021-12-21 00:58:01 +00:00 |
|
|
zhengrunyu
|
d3e873976d
|
*Fix bug 17662.
|
2021-12-21 08:55:15 +08:00 |
|
|
zhengrunyu
|
402458803d
|
*Fixbug17662.
|
2021-12-21 08:54:02 +08:00 |
|
|
tianshujie
|
d364b7c362
|
* Remove useless attributes.
|
2021-12-21 08:53:21 +08:00 |
|
|
tianshujie
|
c04c2506ae
|
* Finish task #46245.
|
2021-12-21 08:51:03 +08:00 |
|
|
zhengrunyu
|
851f2fad1d
|
*Fix bug 17662.
|
2021-12-21 08:47:02 +08:00 |
|
|
孙广明
|
e1a6381454
|
Merge branch 'sprint/179_liumengyi_46156' into 'master'
* Finish task #46156.
See merge request easycorp/zentaopms!1016
|
2021-12-21 00:44:25 +00:00 |
|
|
liumengyi
|
6c9f4248cd
|
* Add dafault card color.
|
2021-12-21 08:43:13 +08:00 |
|
|
liumengyi
|
8712f7640a
|
* Finish task #46156.
|
2021-12-21 08:37:40 +08:00 |
|
|
孙广明
|
397f0b587c
|
Merge branch 'sprint/179_zhengrunyu_Fixbug' into 'master'
*Fix bug17647.
See merge request easycorp/zentaopms!1011
|
2021-12-20 08:50:30 +00:00 |
|
|
孙广明
|
6dbd976baa
|
Merge branch 'sprint/179_tianshujie_46162'
|
2021-12-20 16:48:16 +08:00 |
|
|
孙广明
|
093314fde5
|
Merge branch 'master' into 'sprint/179_tianshujie_46162'
# Conflicts:
# module/kanban/js/view.js
|
2021-12-20 08:47:59 +00:00 |
|
|
孙广明
|
112fb5d279
|
Merge branch 'sprint/179_tianshujie_46157'
|
2021-12-20 16:46:45 +08:00 |
|
|
孙广明
|
54b712feed
|
Merge branch 'master' into 'sprint/179_tianshujie_46157'
# Conflicts:
# module/kanban/js/view.js
|
2021-12-20 08:46:31 +00:00 |
|
|
李玉春
|
df28168e3e
|
Merge branch 'sgm_kanbanstyle' into 'master'
Sgm kanbanstyle
See merge request easycorp/zentaopms!1010
|
2021-12-20 08:44:44 +00:00 |
|
|
zhengrunyu
|
3a9fcbc3f0
|
*Fix bug17647.
|
2021-12-20 16:42:53 +08:00 |
|
|
孙广明
|
9aa2fc86c0
|
* Fix card title style.
|
2021-12-20 16:41:30 +08:00 |
|
|
zhengrunyu
|
8ed5f8545a
|
*Fix bug.
|
2021-12-20 16:41:30 +08:00 |
|
|
zhengrunyu
|
6939ffe621
|
*Fix bug.
|
2021-12-20 16:41:30 +08:00 |
|
|
zhengrunyu
|
f5eead33bf
|
*Fix bug.
|
2021-12-20 16:41:30 +08:00 |
|
|
孙广明
|
5226a302c7
|
* Code for project priv.
|
2021-12-20 16:41:30 +08:00 |
|
|
孙广明
|
a5992d64e4
|
* Fix project priv bug.
|
2021-12-20 16:41:30 +08:00 |
|
|
孙广明
|
5d7b75bb53
|
Merge branch 'sprint/179_zhengrunyu_Fixbug' into 'master'
*Fix bug 17653.
See merge request easycorp/zentaopms!1009
|
2021-12-20 08:34:27 +00:00 |
|
|
tianshujie
|
d6fe370f9b
|
* Modify the name of the variable.
|
2021-12-20 16:33:22 +08:00 |
|
|
tianshujie
|
04f6a9e217
|
* Merge conflict.
|
2021-12-20 16:29:06 +08:00 |
|
|
zhengrunyu
|
f578251936
|
*Fix bug 17653.
|
2021-12-20 16:28:50 +08:00 |
|