 李玉春
|
26056ba15b
|
Merge branch 'devops_16736' into 'master'
* Fix bug#16736,17037,16844
See merge request easycorp/zentaopms!766
|
2021-12-03 02:25:07 +00:00 |
|
|
孙广明
|
87c7acdf03
|
Merge branch 'sprint/175_liyuchun_45162' into 'master'
* Finish task #45154.
See merge request easycorp/zentaopms!762
|
2021-12-03 02:11:49 +00:00 |
|
|
孙广明
|
fd0e67494d
|
Merge branch 'sprint/175_zhengrunyu_fixbug' into 'master'
*Fixbug .
See merge request easycorp/zentaopms!767
|
2021-12-03 02:11:31 +00:00 |
|
|
zhengrunyu
|
cda9cdf969
|
*Fixbug .
|
2021-12-03 10:04:54 +08:00 |
|
|
zhujinyong
|
fc9fe1ac84
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2021-12-03 10:01:17 +08:00 |
|
|
zhujinyong
|
861e92107c
|
+ Add user type for api.
|
2021-12-03 10:01:01 +08:00 |
|
|
zenggang
|
4b53f349df
|
* Fix bug#16736,17037,16844
|
2021-12-03 01:59:04 +00:00 |
|
|
李玉春
|
0d9f5197af
|
Merge branch 'sprint/175_sgm_fixbug' into 'master'
* Fix bug #17051.
See merge request easycorp/zentaopms!764
|
2021-12-03 01:57:35 +00:00 |
|
|
孙广明
|
ae50871336
|
* Fix style.
|
2021-12-03 09:55:21 +08:00 |
|
|
孙广明
|
fe3e96de2d
|
* Fix bug #17051.
|
2021-12-03 09:46:58 +08:00 |
|
|
李玉春
|
87769894a6
|
Merge branch 'sprint/174_hufangzhou_17038' into 'master'
* Fix bug #17038.
See merge request easycorp/zentaopms!754
|
2021-12-03 01:46:39 +00:00 |
|
|
liyuchun
|
c39512c79e
|
* Finish task #45154.
|
2021-12-03 09:33:35 +08:00 |
|
|
王怡栋
|
3c276c75f5
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2021-12-03 09:26:27 +08:00 |
|
|
王怡栋
|
2837dc322c
|
* adjust for classic mode and fix bug.
|
2021-12-03 09:25:44 +08:00 |
|
|
孙广明
|
32ec141d3d
|
Merge branch 'sprint/devops_liyuchun_bug' into 'master'
* Adjust style.
See merge request easycorp/zentaopms!750
|
2021-12-03 01:04:19 +00:00 |
|
|
孙广明
|
27a25ed019
|
Merge branch 'sprint/174_tianshujie_17025' into 'master'
* Fix bug #17025.
See merge request easycorp/zentaopms!761
|
2021-12-03 01:03:41 +00:00 |
|
|
朱金勇
|
789a419696
|
Merge branch 'sprint/168_sunhao/improve_kanban' into 'master'
* Support for using kanban in old browsers without CSS flex.
See merge request easycorp/zentaopms!757
|
2021-12-03 00:50:26 +00:00 |
|
|
tianshujie
|
90b385d022
|
* Fix bug #17025.
|
2021-12-03 08:45:02 +08:00 |
|
|
李玉春
|
acf728eb91
|
Merge branch 'sprint/175_sgm_fixbug' into 'master'
* Fix bug.
See merge request easycorp/zentaopms!756
|
2021-12-03 00:26:35 +00:00 |
|
|
Hao Sun
|
3230cff401
|
* fix kanban not work in ie.
|
2021-12-02 17:03:41 +08:00 |
|
|
孙广明
|
24c613bba9
|
* Fix bug.
|
2021-12-02 17:01:33 +08:00 |
|
|
孙广明
|
1c61d0c57a
|
Merge branch 'sprint/174_tianshujie_17050' into 'master'
* Fix bug #17050.
See merge request easycorp/zentaopms!755
|
2021-12-02 08:58:47 +00:00 |
|
|
tianshujie
|
e02537be9b
|
* Fix bug #17050.
|
2021-12-02 16:56:29 +08:00 |
|
|
hufangzhou
|
dda03577c1
|
* Fix bug #17038.
|
2021-12-02 16:55:52 +08:00 |
|
|
Hao Sun
|
62efd53edb
|
* update kanban lib and refactor usage of it.
|
2021-12-02 16:54:56 +08:00 |
|
|
王怡栋
|
01cb981c6e
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2021-12-02 16:53:55 +08:00 |
|
|
王怡栋
|
0951e47a28
|
* fix for save query condition.
|
2021-12-02 16:53:20 +08:00 |
|
|
孙广明
|
2dbdf45a28
|
Merge branch 'sprint/174_tianshujie_error' into 'master'
* Fix the problem that cookic is not updated in time.
See merge request easycorp/zentaopms!753
|
2021-12-02 08:45:30 +00:00 |
|
|
孙广明
|
669e66e39d
|
Merge branch 'sprint/175_liumengyi_17031' into 'master'
* Fix bug #17031,#17029.
See merge request easycorp/zentaopms!752
|
2021-12-02 08:44:20 +00:00 |
|
|
tianshujie
|
1c3c07e6e0
|
* Fix the problem that cookic is not updated in time.
|
2021-12-02 16:43:15 +08:00 |
|
|
liumengyi
|
cbf1fe21ac
|
* Remove empty lines.
|
2021-12-02 16:16:03 +08:00 |
|
|
李玉春
|
1885ea1b6d
|
Merge branch 'sprint/175_sgm_fixbug' into 'master'
* Fix bug.
See merge request easycorp/zentaopms!751
|
2021-12-02 08:11:37 +00:00 |
|
|
李玉春
|
82f0d4f39c
|
Merge branch 'sprint/174_hufangzhou_16975' into 'master'
* Fix bug #16975.
See merge request easycorp/zentaopms!739
|
2021-12-02 08:08:58 +00:00 |
|
|
孙广明
|
6e2f7563df
|
* Fix bug.
|
2021-12-02 16:08:43 +08:00 |
|
|
liumengyi
|
9d7cd3b29e
|
* Fix bug #17031,#17029.
|
2021-12-02 16:08:17 +08:00 |
|
|
李玉春
|
e99a81d9ad
|
Merge branch 'sprint/174_hufangzhou_branch' into 'master'
* Fix bug #17046.
See merge request easycorp/zentaopms!749
|
2021-12-02 08:06:07 +00:00 |
|
|
liyuchun
|
2b331d987d
|
* Fix bug #16885.
|
2021-12-02 16:00:32 +08:00 |
|
|
liyuchun
|
9c9756bdd8
|
* Fix bug #16853.
|
2021-12-02 15:53:06 +08:00 |
|
|
liyuchun
|
8e11431865
|
* Adjust style.
|
2021-12-02 15:46:53 +08:00 |
|
|
王怡栋
|
21a5a2c31a
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2021-12-02 15:43:58 +08:00 |
|
|
王怡栋
|
7343f4a2af
|
* fix bug for save query condition.
|
2021-12-02 15:43:36 +08:00 |
|
|
李玉春
|
b26673eb9b
|
Merge branch 'sprint/174_tianshujie_16968' into 'master'
Sprint/174 tianshujie 16968
See merge request easycorp/zentaopms!748
|
2021-12-02 07:42:14 +00:00 |
|
|
李玉春
|
db897d851d
|
Merge branch 'devops_16765' into 'master'
* Fix bug#16765,16771
See merge request easycorp/zentaopms!746
|
2021-12-02 07:41:47 +00:00 |
|
|
hufangzhou
|
fc8a537ed9
|
* Fix bug #17046.
|
2021-12-02 15:41:25 +08:00 |
|
|
李玉春
|
3e07dd1d72
|
Merge branch 'master' into 'sprint/174_mayue_17036'
# Conflicts:
# module/testtask/model.php
|
2021-12-02 07:41:03 +00:00 |
|
|
tianshujie
|
9e9dcf653d
|
* Modify the code issue.
|
2021-12-02 15:40:45 +08:00 |
|
|
mayue
|
8ba4ebf390
|
* Conflict resolution #17036.
|
2021-12-02 15:40:02 +08:00 |
|
|
李玉春
|
befdfa2eb4
|
Merge branch 'sprint/174_tianshujie_16927' into 'master'
* Fix bug #16927.
See merge request easycorp/zentaopms!730
|
2021-12-02 07:39:36 +00:00 |
|
|
mayue
|
f6676e2757
|
* Conflict resolution #17036.
|
2021-12-02 15:36:31 +08:00 |
|
|
tianshujie
|
ac0cd01df6
|
* Fix bug #17043.
|
2021-12-02 15:35:35 +08:00 |
|