 leiyong
|
aec5b3612e
|
* Finish task#56384.
|
2022-06-09 06:23:50 +00:00 |
|
|
王怡栋
|
fd0cb543ba
|
Merge branch 'master' into 'sprint_200'
# Conflicts:
# module/execution/lang/en.php
# module/execution/lang/zh-cn.php
# module/execution/view/kanban.html.php
# module/kanban/css/space.css
|
2022-06-09 03:16:20 +00:00 |
|
|
孙广明
|
ea2fe3e532
|
Merge branch 'sprint200_leiyong_task_56378' into 'sprint_200'
Sprint200 leiyong task 56378
See merge request easycorp/zentaopms!3801
|
2022-06-09 02:40:35 +00:00 |
|
|
leiyong
|
b471a3cdad
|
* Adjust code.
|
2022-06-09 02:36:56 +00:00 |
|
|
王怡栋
|
4591b20bd7
|
Merge branch 'sprint/200-zhouxudong_56383' into 'sprint_200'
Sprint/200 zhouxudong 56383
See merge request easycorp/zentaopms!3809
|
2022-06-09 01:57:00 +00:00 |
|
|
liumengyi
|
b6073c2220
|
* Fix bug.
|
2022-06-09 09:53:27 +08:00 |
|
|
zhouxudong
|
f7c784d6fa
|
* Finish task #56383.
|
2022-06-09 01:10:38 +00:00 |
|
|
zhouxudong
|
9694af1c79
|
* Finish task #56383.
|
2022-06-09 00:52:00 +00:00 |
|
|
leiyong
|
ce0dbc7d91
|
* Finish task#56373.
|
2022-06-08 10:53:01 +00:00 |
|
|
zhouxudong
|
6265fcd76f
|
* Finish task #56383.
|
2022-06-08 09:37:10 +00:00 |
|
|
leiyong
|
2a8339de04
|
* Finish task#56375.
|
2022-06-08 08:45:58 +00:00 |
|
|
王怡栋
|
7f967e8091
|
Merge branch 'sprint200_leiyong_task_56367' into 'sprint_200'
Sprint200 leiyong task 56367
See merge request easycorp/zentaopms!3795
|
2022-06-08 08:45:55 +00:00 |
|
|
leiyong
|
1f109a15aa
|
* Finish task#56378.
|
2022-06-08 08:18:50 +00:00 |
|
|
zhouxudong
|
0dc3a87d2e
|
* Finish task #56383
|
2022-06-08 08:02:47 +00:00 |
|
|
liumengyi
|
7b80bfeedd
|
* Fix bug #23422.
|
2022-06-08 15:43:17 +08:00 |
|
|
zhouxudong
|
512f152a6b
|
* Finish task #56381.
|
2022-06-08 06:48:34 +00:00 |
|
|
孙广明
|
cb4776df2d
|
Merge branch 'sprint/200_zhouxudong_56379' into 'master'
Sprint/200 zhouxudong 56379
See merge request easycorp/zentaopms!3785
|
2022-06-08 06:46:21 +00:00 |
|
|
王怡栋
|
df6d8bcb0e
|
Merge branch 'sprint/201' into 'master'
Sprint/201
See merge request easycorp/zentaopms!3793
|
2022-06-08 06:45:01 +00:00 |
|
|
zhouxudong
|
afbda967c1
|
* Finisha task #56381.
|
2022-06-08 06:43:38 +00:00 |
|
|
zhouxudong
|
b2cff31389
|
* Finish task #56379.
|
2022-06-08 06:41:28 +00:00 |
|
|
zhouxudong
|
16e9d31d15
|
* Finish task #56379.
|
2022-06-08 06:36:13 +00:00 |
|
|
zhouxudong
|
0586ef58e6
|
* Finishs task #56381.
|
2022-06-08 06:32:34 +00:00 |
|
|
leiyong
|
da49166f81
|
* Adjust CSS.
|
2022-06-08 05:40:18 +00:00 |
|
|
leiyong
|
23368e7847
|
* Adjust style.
|
2022-06-08 05:26:45 +00:00 |
|
|
leiyong
|
6ed6c4a956
|
* Adjust style.
|
2022-06-08 05:16:22 +00:00 |
|
|
zhouxudong
|
596ea0124b
|
* Finish task #56383.
|
2022-06-08 05:01:16 +00:00 |
|
|
leiyong
|
5a0cd1562b
|
* Finish task#56371.
|
2022-06-08 03:20:36 +00:00 |
|
|
leiyong
|
1086eca0db
|
* Finish task#56367.
|
2022-06-08 02:44:31 +00:00 |
|
|
liumengyi
|
5e74d3bd9f
|
* Finish task #56454.
|
2022-06-08 10:32:01 +08:00 |
|
|
孙广明
|
b896377846
|
* Change zentao license.
|
2022-06-08 10:02:29 +08:00 |
|
|
zhouxudong
|
757b86bf33
|
* Finish task #56379.
|
2022-06-08 01:52:34 +00:00 |
|
|
zhouxudong
|
56419e17a8
|
* Finish task #56379.
|
2022-06-08 01:39:24 +00:00 |
|
|
孙广明
|
b528156589
|
* Change license.
|
2022-06-08 09:34:46 +08:00 |
|
|
zhouxudong
|
dd10aa75f0
|
* Finish task #56366 #56379 #56382 #56380
|
2022-06-08 01:06:07 +00:00 |
|
|
zhouxudong
|
b4a27adf49
|
* Finish task #56379 #56382 #56380.
|
2022-06-07 08:16:04 +00:00 |
|
|
zhouxudong
|
4ecda5bee6
|
* Finish task #56380 #56379.
|
2022-06-07 07:44:21 +00:00 |
|
|
zhouxudong
|
02e7d183c7
|
* Finish task #56379.
|
2022-06-07 07:01:44 +00:00 |
|
|
zhouxudong
|
d89952846b
|
* Finish task #56381.
|
2022-06-07 06:32:08 +00:00 |
|
|
tianshujie
|
814f1a597f
|
* Fix bug #23255.
|
2022-06-06 15:07:57 +08:00 |
|
|
tianshujie
|
246d0f8654
|
* Fix bug #23259.
|
2022-06-06 14:15:07 +08:00 |
|
|
tianshujie
|
6635e019cf
|
* Fix bug #23289.
|
2022-06-06 14:01:55 +08:00 |
|
|
liumengyi
|
4d2c34c122
|
* Fix bug #23213.
|
2022-06-02 15:59:57 +08:00 |
|
|
李玉春
|
66ca553dad
|
Merge branch 'sprint/master_zhouxudong_23111' into 'master'
Sprint/master zhouxudong 23111 19265
See merge request easycorp/zentaopms!3722
|
2022-06-02 06:32:26 +00:00 |
|
|
zhouxudong
|
3e4db334a5
|
* Fix bug #19265.
|
2022-06-02 06:24:53 +00:00 |
|
|
李玉春
|
88da2f7565
|
Merge branch 'sprint/197_tianshujie_fixbug' into 'master'
Sprint/197 tianshujie fixbug
See merge request easycorp/zentaopms!3714
|
2022-06-02 05:27:06 +00:00 |
|
|
tianshujie
|
d8f8e9cce0
|
* Modify variable name.
|
2022-06-02 13:26:10 +08:00 |
|
|
李玉春
|
d36ec41688
|
Merge branch 'master' into 'sprint/sunhao/fix_kanban_fullscreen'
# Conflicts:
# www/js/zui/kanban/min.js
|
2022-06-02 05:20:38 +00:00 |
|
|
tianshujie
|
c170d62313
|
* Resoled issue #656.
|
2022-06-02 13:16:37 +08:00 |
|
|
Hao Sun
|
c1abc19882
|
* fix virtual rendering not work when kanban enter fullscreen
|
2022-06-02 04:11:59 +00:00 |
|
|
tianshujie
|
aec74869fe
|
* Finish task #55675.
|
2022-06-01 14:47:21 +08:00 |
|