 孙广明
|
bb4e3ed781
|
Merge branch 'kanban' into 'sprint/177_tianshujie_45815'
# Conflicts:
# module/kanban/lang/en.php
# module/kanban/lang/zh-cn.php
|
2021-12-10 02:18:54 +00:00 |
|
|
tianshujie
|
6244b7500b
|
* Modify the space variable name.
|
2021-12-10 10:16:48 +08:00 |
|
|
tianshujie
|
446f4a86ed
|
* Modify the space variable name.
|
2021-12-10 10:14:06 +08:00 |
|
|
孙广明
|
bf1918df76
|
Merge branch 'sprint/177_zhengrunyu_45882' into kanban
|
2021-12-10 10:10:44 +08:00 |
|
|
孙广明
|
c4ff55306b
|
Merge branch 'kanban' into 'sprint/177_zhengrunyu_45882'
# Conflicts:
# module/kanban/lang/en.php
# module/kanban/model.php
|
2021-12-10 02:10:15 +00:00 |
|
|
zhengrunyu
|
5fbecc7204
|
*Finish task #45822.
|
2021-12-10 10:06:21 +08:00 |
|
|
zhengrunyu
|
e7fb8aded2
|
*Finish task #45822.
|
2021-12-10 10:03:56 +08:00 |
|
|
zhengrunyu
|
e8cd54a0fd
|
*Finish task #45822.
|
2021-12-10 09:59:25 +08:00 |
|
|
zhengrunyu
|
361378e0fd
|
*Finish task #45822.*Finish task #45822.*Finish task #45822.*Finish task #45822.*Finish task #45822.*Finish task #45822.*Finish task #45822.*Finish task #45822.
|
2021-12-10 09:55:52 +08:00 |
|
|
tianshujie
|
fe254eafb0
|
* Modify card style.
|
2021-12-10 09:41:07 +08:00 |
|
|
孙广明
|
20783bb906
|
Merge branch 'sprint/177_liumengyi_45825' into 'kanban'
* Finish task #45825.
See merge request easycorp/zentaopms!875
|
2021-12-10 01:32:49 +00:00 |
|
|
liumengyi
|
37d9aaeb3a
|
* Finish task #45825.
|
2021-12-10 09:28:40 +08:00 |
|
|
zhengrunyu
|
2aa3c3bbcb
|
*Finish task #45882.
|
2021-12-10 09:18:05 +08:00 |
|
|
tianshujie
|
0588ec9b61
|
* Finish task #45815.
|
2021-12-10 09:09:38 +08:00 |
|
|
孙广明
|
85f50ea175
|
Merge branch 'sprint/177_liumengyi_45831' into 'kanban'
Sprint/177 liumengyi 45831
See merge request easycorp/zentaopms!864
|
2021-12-09 09:53:20 +00:00 |
|
|
刘梦艺
|
e60f6b4eb9
|
Update model.php
|
2021-12-09 09:52:46 +00:00 |
|
|
刘梦艺
|
f785cd9732
|
Update common.js
|
2021-12-09 09:46:26 +00:00 |
|
|
liumengyi
|
7b8659a6fb
|
* Finish task #45831 and #45823.
|
2021-12-09 17:45:41 +08:00 |
|
|
liumengyi
|
2b51182d3d
|
* Finish task #45831 and #45823.
|
2021-12-09 17:44:34 +08:00 |
|
|
李玉春
|
92bfb40c7c
|
Merge branch 'sgm_45818' into 'kanban'
* Finish task #45818.
See merge request easycorp/zentaopms!866
|
2021-12-09 09:23:38 +00:00 |
|
|
孙广明
|
006fca3fe3
|
* Finish task #45818.
|
2021-12-09 16:53:53 +08:00 |
|
|
liumengyi
|
de5c753de9
|
* Modify edit HTML file.
|
2021-12-09 16:46:02 +08:00 |
|
|
liumengyi
|
42370222fc
|
* Finish task #45831.
|
2021-12-09 16:40:44 +08:00 |
|
|
孙广明
|
f35a970a5f
|
Merge branch 'sprint/177_tianshujie_error' into 'kanban'
* Fix error.
See merge request easycorp/zentaopms!862
|
2021-12-09 08:01:35 +00:00 |
|
|
tianshujie
|
c565b6a5d4
|
* Fix error.
|
2021-12-09 16:00:20 +08:00 |
|
|
孙广明
|
7a94a08436
|
Merge branch 'sprint/177_tianshujie_45815' into kanban
|
2021-12-09 15:58:19 +08:00 |
|
|
孙广明
|
16da4cdf28
|
Merge branch 'kanban' into 'sprint/177_tianshujie_45815'
# Conflicts:
# module/kanban/control.php
# module/kanban/model.php
|
2021-12-09 07:54:42 +00:00 |
|
|
tianshujie
|
30c95b0915
|
* Modify code variables.
|
2021-12-09 15:51:30 +08:00 |
|
|
tianshujie
|
09c3e93969
|
* Modify the logic of the query space.
|
2021-12-09 15:46:24 +08:00 |
|
|
孙广明
|
8d1e0491d6
|
Merge branch 'sprint/177_sunhao/new_icons' into 'kanban'
* add 6 new icons for kanban.
See merge request easycorp/zentaopms!860
|
2021-12-09 07:34:32 +00:00 |
|
|
tianshujie
|
362cd1189b
|
* Modify variables.
|
2021-12-09 15:33:16 +08:00 |
|
|
tianshujie
|
023db164d0
|
* Adjust code of kanban model file.
|
2021-12-09 15:31:49 +08:00 |
|
|
Hao Sun
|
02df6e2704
|
* add 6 new icons for kanban.
The new icons includes: col-add-left, col-add-right, col-split, col-archive, card-archive, zone.
|
2021-12-09 15:23:53 +08:00 |
|
|
tianshujie
|
a3e9d350eb
|
* Finish task #45817.
|
2021-12-09 15:19:37 +08:00 |
|
|
孙广明
|
780cf3a79d
|
Merge branch 'sprint/177_liumengyi_45823' into kanban
|
2021-12-09 14:42:37 +08:00 |
|
|
孙广明
|
f447e44833
|
Merge branch 'kanban' into 'sprint/177_liumengyi_45823'
# Conflicts:
# module/kanban/control.php
|
2021-12-09 06:41:49 +00:00 |
|
|
liumengyi
|
9c9271ae44
|
* Remove unwanted code.
|
2021-12-09 14:37:41 +08:00 |
|
|
李玉春
|
c80b8d09e0
|
Merge branch 'sgm_45818' into 'kanban'
* Code for task #45818.
See merge request easycorp/zentaopms!854
|
2021-12-09 06:36:48 +00:00 |
|
|
孙广明
|
ad53ead5ba
|
* Fix code details.
|
2021-12-09 14:33:23 +08:00 |
|
|
liumengyi
|
840082e4c1
|
* Finish task #45823.
|
2021-12-09 14:27:21 +08:00 |
|
|
孙广明
|
b7480bb257
|
Merge branch 'sprint/30_zhouxin_45792' into 'kanban'
Finish task #45792.
See merge request easycorp/zentaopms!844
|
2021-12-09 06:19:40 +00:00 |
|
|
孙广明
|
9824f4c6ac
|
* Code for task #45818.
|
2021-12-09 14:11:49 +08:00 |
|
|
孙广明
|
12ce541d9e
|
* Code for task #45818.
|
2021-12-09 10:50:05 +08:00 |
|
|
xieqiyu
|
8298f778e7
|
* Fix bug#17251.
|
2021-12-09 10:34:47 +08:00 |
|
|
hufangzhou
|
1517a800e2
|
* Fix an error for lang item.
|
2021-12-09 10:34:47 +08:00 |
|
|
tianshujie
|
2030bbd11c
|
* Fix bug #17173.
|
2021-12-09 10:34:47 +08:00 |
|
|
hufangzhou
|
c7d5310496
|
* Fix bug #16792.
|
2021-12-09 10:34:47 +08:00 |
|
|
hufangzhou
|
5287e87410
|
* Fix bug #17276.
|
2021-12-09 10:34:47 +08:00 |
|
|
hufangzhou
|
0d7f5f6e2d
|
* Adjust the code.
|
2021-12-09 10:34:47 +08:00 |
|
|
hufangzhou
|
e408f91d1f
|
* Fix bug #17269, bug #16975.
|
2021-12-09 10:34:47 +08:00 |
|