 liumengyi
|
2ab2e3a2fb
|
* Finish task #62958.
|
2022-08-03 11:18:14 +08:00 |
|
|
liumengyi
|
9238ad1965
|
* Finish task #62957.
|
2022-08-03 11:17:49 +08:00 |
|
|
wangyidong
|
6a6218bc41
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-08-03 10:36:00 +08:00 |
|
|
wangyidong
|
ebe6dd630f
|
* fix bug #25921.
|
2022-08-03 10:35:41 +08:00 |
|
|
王怡栋
|
1c54132793
|
Merge branch 'master_liuhong_24281' into 'master'
Master liuhong 24281
See merge request easycorp/zentaopms!4752
|
2022-08-03 02:13:32 +00:00 |
|
|
王怡栋
|
1d59e34b07
|
Merge branch 'sprint/221_zg' into 'master'
Sprint/221 zg
See merge request easycorp/zentaopms!4751
|
2022-08-03 02:12:38 +00:00 |
|
|
liuhong
|
1e6366945d
|
*Fix bug #24281
|
2022-08-03 01:44:41 +00:00 |
|
|
zenggang
|
bc8dfbbe7a
|
* Adjust code
|
2022-08-03 01:43:58 +00:00 |
|
|
liuhong
|
abcbe76d24
|
*Fix bug 24281
|
2022-08-03 01:40:55 +00:00 |
|
|
wangyidong
|
c73dbfbcd0
|
Merge branch 'sprint/221_tianshujie_62940'
|
2022-08-03 09:36:00 +08:00 |
|
|
王怡栋
|
8675278f16
|
Merge branch 'master' into 'sprint/221_tianshujie_62940'
# Conflicts:
# db/update17.4.sql
|
2022-08-03 01:35:27 +00:00 |
|
|
tianshujie
|
aa30d43e68
|
* Finish task #62940.
|
2022-08-03 09:34:11 +08:00 |
|
|
tianshujie
|
947c380443
|
* Finish task #62940.
|
2022-08-03 09:25:53 +08:00 |
|
|
王怡栋
|
718b6543fc
|
Merge branch 'sprint/221_liumengyi_62945' into 'master'
* Finish task #62945.
See merge request easycorp/zentaopms!4750
|
2022-08-03 01:22:02 +00:00 |
|
|
王怡栋
|
515143259b
|
Merge branch 'sprint/221_liumengyi_62949' into 'master'
* Optimize code for task #62949.
See merge request easycorp/zentaopms!4749
|
2022-08-03 01:21:23 +00:00 |
|
|
王怡栋
|
9bb4369d7b
|
Merge branch 'sprint/221_liumengyi_62935' into 'master'
* Finish task #62935.
See merge request easycorp/zentaopms!4748
|
2022-08-03 01:21:03 +00:00 |
|
|
liumengyi
|
1da72a9ac7
|
* Fix bug for task #62945.
|
2022-08-03 09:07:27 +08:00 |
|
|
liumengyi
|
08ffbda087
|
* Optimize code for task #62949.
|
2022-08-03 09:03:19 +08:00 |
|
|
zenggang
|
e3698f1b6a
|
* Adjust code
|
2022-08-03 00:48:59 +00:00 |
|
|
liumengyi
|
6d019f65e5
|
* Fix bug for task #62935.
|
2022-08-03 08:39:25 +08:00 |
|
|
tianshujie
|
9300ddb0ed
|
* Finish task #62940.
|
2022-08-03 08:29:41 +08:00 |
|
|
zenggang
|
d9e251ea26
|
* Fix bug#25416
|
2022-08-02 09:29:33 +00:00 |
|
|
王怡栋
|
902fe36227
|
Merge branch 'sprint/221_liumengyi_62949' into 'master'
* Finish task #62949.
See merge request easycorp/zentaopms!4745
|
2022-08-02 09:25:15 +00:00 |
|
|
王怡栋
|
62f02d288c
|
Merge branch 'sprint/221_liumengyi_62939' into 'master'
* Finish task #62939.
See merge request easycorp/zentaopms!4744
|
2022-08-02 09:24:21 +00:00 |
|
|
王怡栋
|
1a13bf3fb0
|
Merge branch 'sprint/221_liumengyi_62938' into 'master'
* Finish task #62938.
See merge request easycorp/zentaopms!4743
|
2022-08-02 09:24:01 +00:00 |
|
|
tianshujie
|
3fdfc473c6
|
* Finish task #62941.
|
2022-08-02 17:23:35 +08:00 |
|
|
王怡栋
|
62038c368a
|
Merge branch 'sprint/221_liumengyi_62944' into 'master'
* Finish task #62944.
See merge request easycorp/zentaopms!4742
|
2022-08-02 09:21:11 +00:00 |
|
|
王怡栋
|
42f9f1d561
|
Merge branch 'fixbug' into 'master'
* Code for action.
See merge request easycorp/zentaopms!4734
|
2022-08-02 08:20:58 +00:00 |
|
|
王怡栋
|
6cc611635c
|
Merge branch 'sprint/221' into 'master'
Sprint/221
See merge request easycorp/zentaopms!4740
|
2022-08-02 08:20:39 +00:00 |
|
|
zenggang
|
8f6ca19bf7
|
* Finish task#62937,62950
|
2022-08-02 08:19:56 +00:00 |
|
|
wangyidong
|
99c5aab19a
|
* code for task #62739.
|
2022-08-02 16:18:38 +08:00 |
|
|
王怡栋
|
b76ebc1857
|
Merge branch 'bugfix/liwenrui/headermenu' into 'master'
* fix header menu unable to maintain hover state in zentaoclient.
See merge request easycorp/zentaopms!4741
|
2022-08-02 08:14:29 +00:00 |
|
|
Wenrui LI
|
da9d8249b5
|
* fix header menu unable to maintain hover state in zentaoclient.
|
2022-08-02 16:11:00 +08:00 |
|
|
liumengyi
|
7c8df39c3c
|
* Finish task #62949.
|
2022-08-02 16:08:10 +08:00 |
|
|
tianshujie
|
800f1bbb6d
|
* Finish task #62940.
|
2022-08-02 15:48:15 +08:00 |
|
|
Guan Xiying
|
4d34304c1d
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-08-02 15:40:51 +08:00 |
|
|
Guan Xiying
|
d089fff6bb
|
* Use find delete instead rm.
|
2022-08-02 15:28:45 +08:00 |
|
|
王怡栋
|
e02eabb6b1
|
Merge branch 'sprint/221_dongli_62948' into 'sprint/221'
* Fix bug #25851.
See merge request easycorp/zentaopms!4738
|
2022-08-02 07:17:25 +00:00 |
|
|
dongli
|
b664ed8b43
|
* Fix bug #25851
|
2022-08-02 07:03:57 +00:00 |
|
|
tianshujie
|
c13808d8df
|
* Finish task #62943,62941,62940,62942.
|
2022-08-02 15:01:24 +08:00 |
|
|
dongli
|
80753ec1f0
|
* Fix bug #25851.
|
2022-08-02 06:41:48 +00:00 |
|
|
liumengyi
|
aff5aa5668
|
* Finish task #62938.
|
2022-08-02 09:48:20 +08:00 |
|
|
王怡栋
|
6c223d9cb5
|
Merge branch 'tianshujie_bug25911' into 'master'
* Fix bug #25911.
See merge request easycorp/zentaopms!4735
|
2022-08-02 01:22:15 +00:00 |
|
|
tianshujie
|
324ec42a34
|
* Fix bug #25911.
|
2022-08-02 09:20:08 +08:00 |
|
|
liumengyi
|
5977be1fde
|
* Finish task #62935, and add fr lang file.
|
2022-08-02 09:13:01 +08:00 |
|
|
liumengyi
|
a90490cc26
|
* Finish task #62939.
|
2022-08-02 09:05:55 +08:00 |
|
|
tanghucheng
|
b88cbfa913
|
* Code for get history log.
|
2022-08-02 08:54:40 +08:00 |
|
|
胡方舟
|
5fe8857cae
|
Merge branch 'tianshujie_fixbug' into 'master'
* Fix the problem of no project executing after data merging.
See merge request easycorp/zentaopms!4733
zentaopms_17.4
|
2022-08-01 23:30:14 +00:00 |
|
|
tianshujie
|
8f62881ec6
|
* Fix the problem of no project executing after data merging.
|
2022-08-01 17:22:54 +08:00 |
|
|
liumengyi
|
de29183b2c
|
* Finish task #62944.
|
2022-08-01 16:16:25 +08:00 |
|