 liumengyi
|
b8166358ad
|
* Finish task #46244, #46243.
|
2021-12-21 13:46:31 +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 |
|
|
tianshujie
|
ec2e94440d
|
* Finish task #46162.
|
2021-12-20 16:24:19 +08:00 |
|
|
孙广明
|
7d6854cbd6
|
Merge branch 'sprint/179_zhengrunyu_Fixbug' into 'master'
Sprint/179 zhengrunyu fixbug
See merge request easycorp/zentaopms!1007
|
2021-12-20 08:23:32 +00:00 |
|
|
zhengrunyu
|
ed928752d3
|
*Fix bug.
|
2021-12-20 15:48:19 +08:00 |
|
|
孙广明
|
08758239f9
|
* Fix kanban style.
|
2021-12-20 15:47:47 +08:00 |
|
|
zhengrunyu
|
6a3c77e451
|
*Fix bug.
|
2021-12-20 15:44:44 +08:00 |
|
|
zhengrunyu
|
92a7b2a6cc
|
*Fix bug.
|
2021-12-20 15:43:04 +08:00 |
|
|
孙广明
|
3db6c1bf1e
|
* Code for trashes.
|
2021-12-20 15:40:02 +08:00 |
|
|
孙广明
|
428ba360dd
|
* Fix kanban css.
|
2021-12-20 15:40:02 +08:00 |
|
|
liumengyi
|
1244776f69
|
* Add function comments.
|
2021-12-20 15:40:02 +08:00 |
|
|
liumengyi
|
96971d9029
|
* Finish task #46155.
|
2021-12-20 15:40:02 +08:00 |
|
|
tanghucheng
|
c221abf485
|
* Fix bug #17690,17688.
|
2021-12-20 15:40:02 +08:00 |
|
|
tanghucheng
|
418bf9d1f5
|
* Fix css for .open dropdown-toggle.btn.
|
2021-12-20 15:40:02 +08:00 |
|
|
李玉春
|
ac49c3f367
|
Merge branch 'sgm_projectpriv' into 'master'
Sgm projectpriv
See merge request easycorp/zentaopms!1002
|
2021-12-20 07:09:59 +00:00 |
|
|
tianshujie
|
0cceea2b86
|
* Add translation judgment.
|
2021-12-20 14:59:05 +08:00 |
|
|
孙广明
|
88dca1f12a
|
Merge branch 'sprint/179_liumengyi_46155' into 'master'
* Finish task #46155.
See merge request easycorp/zentaopms!1004
|
2021-12-20 06:47:56 +00:00 |
|
|
tianshujie
|
442fbdad44
|
* Finish task #46157.
|
2021-12-20 14:42:06 +08:00 |
|
|
liumengyi
|
14c584555e
|
* Add function comments.
|
2021-12-20 14:35:36 +08:00 |
|
|
liumengyi
|
6fadc5c013
|
* Finish task #46155.
|
2021-12-20 14:29:55 +08:00 |
|