 tianshujie
|
8cd6a13955
|
* Fix bug #20535.
|
2022-03-09 15:08:17 +08:00 |
|
|
tianshujie
|
a349c5bfeb
|
* Fix bug #20530.
|
2022-03-09 14:01:41 +08:00 |
|
|
王怡栋
|
b2aa0be020
|
Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug 19010,19464,19496
See merge request easycorp/zentaopms!2112
|
2022-03-07 07:41:30 +00:00 |
|
|
Zongjun Lan
|
7add528024
|
* fix bug 19496
|
2022-03-07 15:37:27 +08:00 |
|
|
liumengyi
|
33403652d0
|
* Finish task #50363.
|
2022-03-07 14:48:38 +08:00 |
|
|
王怡栋
|
a783b5d736
|
Merge branch 'master' into 'sprint/master_tanghucheng_fix'
# Conflicts:
# db/update16.4.sql
# module/user/view/batchcreate.html.php
|
2022-03-07 05:25:38 +00:00 |
|
|
tanghucheng
|
79a38cc9ad
|
* Fix bug.
|
2022-03-07 13:04:06 +08:00 |
|
|
孙广明
|
91d3978a98
|
Merge branch 'pailei_mayue_task49305' into 'master'
* Finish task#49305.
See merge request easycorp/zentaopms!2104
|
2022-03-07 03:10:05 +00:00 |
|
|
mayue
|
c2295b2f8e
|
* Optimize code.
|
2022-03-07 11:08:23 +08:00 |
|
|
mayue
|
fcb86e9728
|
* Finish task#49305.
|
2022-03-04 16:44:27 +08:00 |
|
|
liumengyi
|
3885b28344
|
* Fix bug #20323.
|
2022-03-04 16:29:49 +08:00 |
|
|
liumengyi
|
33d7610a06
|
* Fix bug #20303.
|
2022-03-04 13:27:53 +08:00 |
|
|
Hao Sun
|
97293856bb
|
* Bug #20280, fix avatar with text not displayed as expected.
|
2022-03-03 15:10:25 +08:00 |
|
|
liyuchun
|
adee975255
|
Merge branch 'sprint/sunhao/task49295'
|
2022-03-02 13:48:36 +08:00 |
|
|
Hao Sun
|
0c8171af7a
|
* Bug #20214, fix card style on dragging in kanban.
|
2022-03-02 08:57:26 +08:00 |
|
|
Hao Sun
|
aa30172fea
|
* Task #49295, optimize UI for avatar.
|
2022-03-01 13:24:13 +08:00 |
|
|
liumengyi
|
54fe05a303
|
* Fix bug #20103.
|
2022-02-28 15:16:36 +08:00 |
|
|
liumengyi
|
1ccbf30716
|
* Fix bug #20103.
|
2022-02-28 14:09:57 +08:00 |
|
|
孙广明
|
cc7e29e208
|
* Remove unused code.
|
2022-02-28 11:14:49 +08:00 |
|
|
孙广明
|
df55b0af1b
|
Merge branch '185'
|
2022-02-28 08:58:20 +08:00 |
|
|
王怡栋
|
a0e8f5fcb0
|
Merge branch 'sprint/185_lanzongjun_49334' into 'sprint/185'
* move to extension
See merge request easycorp/zentaopms!1975
|
2022-02-25 02:22:09 +00:00 |
|
|
Zongjun Lan
|
3d24613524
|
* move to extension
|
2022-02-25 10:01:16 +08:00 |
|
|
zhengrunyu
|
4e392ea7b2
|
* Fixbug 19999.
|
2022-02-24 14:48:36 +08:00 |
|
|
李玉春
|
3762eba099
|
Merge branch 'sprint/185_zhengrunyu_Fixbug_19957' into 'sprint/185'
* Fix bug 19957 .
See merge request easycorp/zentaopms!1939
|
2022-02-24 02:41:07 +00:00 |
|
|
zhengrunyu
|
259edbbf3c
|
* Fix bug 19957 .
|
2022-02-24 10:39:35 +08:00 |
|
|
Zongjun Lan
|
7a673daa6f
|
* Fix bug #49334
|
2022-02-23 15:26:53 +08:00 |
|
|
李玉春
|
9405f7bf71
|
Merge branch 'sprint/185' into 'sprint/185_zhengrunyu_49283'
# Conflicts:
# db/update16.4.sql
# module/user/view/story.html.php
|
2022-02-23 01:33:37 +00:00 |
|
|
zhouxin
|
d8085ec0cd
|
Adjust code.
|
2022-02-23 01:23:43 +00:00 |
|
|
zhouxin
|
a9995c6fe0
|
Finish task #49692.
|
2022-02-22 09:00:47 +00:00 |
|
|
王怡栋
|
6486986b5a
|
Merge branch 'sprint/185_tanghucheng_49418' into 'sprint/185'
* Finish task #49415,49418,49425,49418,49402.
See merge request easycorp/zentaopms!1873
|
2022-02-22 01:49:27 +00:00 |
|
|
zhujinyong
|
002e215a3d
|
* Move die to return.
|
2022-02-22 09:02:00 +08:00 |
|
|
tanghucheng
|
9b6903f6eb
|
* Finish task#49418.
|
2022-02-21 17:23:09 +08:00 |
|
|
tanghucheng
|
422811bcbd
|
* code for task #49697.
|
2022-02-21 17:01:42 +08:00 |
|
|
zhengrunyu
|
0805d25735
|
* Finish task 49283.
|
2022-02-21 10:47:27 +08:00 |
|
|
liumengyi
|
6dc1c744a1
|
* Fix bug for kanban priv.
|
2022-02-17 10:34:17 +08:00 |
|
|
zhujinyong
|
5bd64d9312
|
Merge branch 'lite' into sprint/185
|
2022-02-17 08:56:40 +08:00 |
|
|
liumengyi
|
5e645da507
|
* Fix bug #19308.
|
2022-02-16 14:55:21 +08:00 |
|
|
李玉春
|
1f00067aa5
|
Merge branch 'devops21_zhangzilong_19312' into 'sprint/185_fixbug'
* Fix bug #19312.
See merge request easycorp/zentaopms!1813
|
2022-02-15 08:37:55 +00:00 |
|
|
zhangzilong
|
66cf431d7d
|
* Fix bug #19312.
|
2022-02-15 16:35:25 +08:00 |
|
|
zhangzilong
|
b64dc4da7b
|
* Fix bug #19312.
|
2022-02-15 15:04:21 +08:00 |
|
|
孙广明
|
9e171958bf
|
Merge branch 'liyuchun_bug_19323' into 'master'
* Fix bug #19323.
See merge request easycorp/zentaopms!1800
|
2022-02-15 05:27:00 +00:00 |
|
|
liyuchun
|
0d16a79b63
|
* Fix bug #19323.
|
2022-02-15 08:22:25 +08:00 |
|
|
朱金勇
|
3de08ec30e
|
Merge branch 'sprint/scx_deletelang' into 'master'
*Delete lang.
See merge request easycorp/zentaopms!1779
|
2022-02-14 08:46:07 +00:00 |
|
|
songchenxuan
|
91f3e14e68
|
*Delete lang.
|
2022-02-14 16:44:23 +08:00 |
|
|
周旭东
|
3b88357aad
|
Update model.php
|
2022-02-14 05:22:36 +00:00 |
|
|
zhouxudong
|
090905f628
|
Fix bug #19424.
|
2022-02-14 08:42:51 +08:00 |
|
|
tanghucheng
|
ebef99ccf6
|
* Fix bug.
|
2022-02-10 14:52:21 +08:00 |
|
|
tanghucheng
|
3e6e604678
|
* Fix bug .
|
2022-02-09 14:05:34 +08:00 |
|
|
周旭东
|
ced8d40c6b
|
Update model.php
|
2022-02-08 06:04:16 +00:00 |
|
|
周旭东
|
f3eda73168
|
Update model.php
|
2022-02-08 05:49:56 +00:00 |
|