朱金勇
|
1025716534
|
Merge branch 'sprint/zhouxudong_fixbug_17257' into 'master'
*Fix bug #17257.
See merge request easycorp/zentaopms!1373
|
2022-01-13 05:06:12 +00:00 |
|
朱金勇
|
ee2fc5b7c6
|
Merge branch 'phpcs-zhanrunyu' into 'master'
Fix compatibility with PHP 5.4
See merge request easycorp/zentaopms!1371
|
2022-01-13 04:28:02 +00:00 |
|
zhouxudong
|
0b86002428
|
*Fix bug #17257.
|
2022-01-13 10:39:56 +08:00 |
|
zhangrunyu
|
39e30fc64f
|
Fix compatibility with PHP 5.4
|
2022-01-13 10:14:15 +08:00 |
|
zhouxudong
|
cc9aae99c7
|
*Fix bug #18036.
|
2022-01-12 15:55:25 +08:00 |
|
tianshujie
|
1c28a0462f
|
* Change the die of the bug module to return print.
|
2022-01-11 08:09:13 +08:00 |
|
tianshujie
|
1ee5fb522f
|
* Fix bug #18287.
|
2022-01-10 12:15:19 +08:00 |
|
孙广明
|
d5efab2baf
|
Merge branch 'master' into 'sprint/180_xieqiyu_18166'
# Conflicts:
# module/project/config.php
|
2022-01-07 00:46:43 +00:00 |
|
xieqiyu
|
af54ab16c6
|
* Fix bug#18242,18241,18240,18239.
|
2022-01-07 08:35:18 +08:00 |
|
liumengyi
|
42e9076e66
|
* Finish task #47081 #47092 #47093 #47111.
|
2022-01-06 15:25:09 +08:00 |
|
songchenxuan
|
bc637ef419
|
*Fix bug 18183,18184.
|
2022-01-05 15:11:26 +08:00 |
|
songchenxuan
|
ecc3ae4608
|
*Fix bug 18183,18184.
|
2022-01-05 15:06:56 +08:00 |
|
孙广明
|
c8db935f34
|
Merge branch '180'
|
2022-01-04 22:41:23 +08:00 |
|
zhujinyong
|
ff9ceaccad
|
* Check auth.
|
2022-01-05 09:05:32 +08:00 |
|
朱金勇
|
24ad4bc48c
|
Merge branch 'sprint/180_xieqiyu_46520' into 'sprint/180'
Sprint/180 xieqiyu 46520
See merge request easycorp/zentaopms!1228
|
2021-12-31 07:53:33 +00:00 |
|
xieqiyu
|
5c4609d302
|
* Modify review problem.
|
2021-12-31 15:43:27 +08:00 |
|
liyuchun
|
c2da5eefe2
|
Merge branch 'devops18'
|
2021-12-31 10:38:04 +08:00 |
|
孙广明
|
1d6a70d41d
|
Merge branch 'sprint/180_songchenxuan_46519' into 'sprint/180'
*Finish task #46519.
See merge request easycorp/zentaopms!1198
|
2021-12-30 08:17:21 +00:00 |
|
songchenxuan
|
5e7c715efb
|
*Finish task #46519.
|
2021-12-29 17:42:41 +08:00 |
|
孙广明
|
3d3d4130dd
|
* Code for php8.0.
|
2021-12-29 16:59:54 +08:00 |
|
朱金勇
|
58716fddf1
|
Merge branch 'sprint/180_songchenxuan_fix_classicbranchbug' into 'sprint/180'
Sprint/180 songchenxuan fix classicbranchbug
See merge request easycorp/zentaopms!1164
|
2021-12-29 08:55:59 +00:00 |
|
liyuchun
|
2b44879ba2
|
* Adjust code style.
|
2021-12-29 10:24:39 +08:00 |
|
liyuchun
|
8e98e9831e
|
* Finish task #46551.
|
2021-12-29 10:02:25 +08:00 |
|
liyuchun
|
9da21e20f0
|
* Finish task #46550.
|
2021-12-28 15:45:09 +08:00 |
|
songchenxuan
|
32a4823ff6
|
*Fix classic mode branch bug.
|
2021-12-28 15:08:34 +08:00 |
|
xieqiyu
|
5ab26fee54
|
* Finish task#46543.
|
2021-12-28 13:38:35 +08:00 |
|
hufangzhou
|
30d2fb6cfa
|
* Fix bug #18014.
|
2021-12-28 10:19:20 +08:00 |
|
songchenxuan
|
4dd72bb56b
|
*Fix classic mode branch bug.
|
2021-12-27 17:37:42 +08:00 |
|
mayue
|
be1671c243
|
* Modify the code.
|
2021-12-23 14:34:44 +08:00 |
|
mayue
|
f8f763f9dd
|
* Fix a bug #17638.
|
2021-12-23 14:15:27 +08:00 |
|
songchenxuan
|
1d7882d51f
|
*Finish task #46100.
|
2021-12-23 10:06:54 +08:00 |
|
songchenxuan
|
a7258e471b
|
*Finish task #46100.
|
2021-12-22 14:28:28 +08:00 |
|
孙广明
|
84fae4bc7d
|
Merge branch 'kanban'
|
2021-12-20 10:59:07 +08:00 |
|
朱金勇
|
8ba0385b58
|
Merge branch 'sql-optimization-zhangrunyu' into 'master'
SQL optimization
See merge request easycorp/zentaopms!924
|
2021-12-20 00:47:21 +00:00 |
|
Hao Sun
|
44921262ff
|
* Adjust url card style in client.
|
2021-12-17 11:33:13 +08:00 |
|
zhouxin
|
0683b91b5c
|
Fixed wrong method used.
|
2021-12-16 08:30:49 +00:00 |
|
朱金勇
|
d5d4cfe049
|
Merge branch 'sprint/176_mayue_45544' into 'master'
* Optimize code.
See merge request easycorp/zentaopms!936
|
2021-12-14 07:43:32 +00:00 |
|
mayue
|
7deea0d588
|
* Optimize code.
|
2021-12-14 13:42:54 +08:00 |
|
朱金勇
|
efdadc07a7
|
Merge branch 'sprint/176_mayue_45544' into 'master'
* Finish a task #45544.
See merge request easycorp/zentaopms!928
|
2021-12-14 05:34:42 +00:00 |
|
Yurun
|
63bc23d43f
|
Optimize bug module
|
2021-12-14 10:41:02 +08:00 |
|
mayue
|
77d36b7467
|
* Finish a task #45544.
|
2021-12-14 09:49:46 +08:00 |
|
zhujinyong
|
45cdfc8f59
|
Merge branch 'xuan'
|
2021-12-14 09:08:15 +08:00 |
|
朱金勇
|
40e1b04661
|
Merge branch 'sprint/176_songchenxuan_45545' into 'master'
Sprint/176 songchenxuan 45545
See merge request easycorp/zentaopms!880
|
2021-12-10 07:16:22 +00:00 |
|
songchenxuan
|
a175c752b8
|
*Finish task #45545.
|
2021-12-10 14:41:33 +08:00 |
|
朱金勇
|
5ee11088b8
|
Merge branch 'sprint/176_songchenxuan_45539' into 'master'
Sprint/176 songchenxuan 45539
See merge request easycorp/zentaopms!870
|
2021-12-10 06:04:23 +00:00 |
|
songchenxuan
|
33efd7faf3
|
*Finish task #45539.
|
2021-12-10 11:34:18 +08:00 |
|
songchenxuan
|
30a8d7acb0
|
*Finish task #45539.
|
2021-12-10 11:00:04 +08:00 |
|
songchenxuan
|
7d58d95af3
|
*Finish task #45545.
|
2021-12-10 09:15:55 +08:00 |
|
songchenxuan
|
2b7e0ed4b3
|
*Finish task #45545.
|
2021-12-09 11:16:29 +08:00 |
|
孙广明
|
14b272a1af
|
* Merge 169 untrack file to master.
|
2021-12-09 10:34:47 +08:00 |
|