 guofeilong
|
0d4a09fb42
|
* Code for style refactors in holiday.
|
2023-02-17 09:33:54 +08:00 |
|
|
guofeilong
|
6943902abc
|
* Code for style in hours.html.
|
2023-02-17 09:16:10 +08:00 |
|
|
guofeilong
|
553f1157ac
|
* Code for css in hours.
|
2023-02-17 09:07:22 +08:00 |
|
|
tianshujie
|
792f1c5a98
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285
|
2023-02-17 08:33:25 +08:00 |
|
|
Yagami
|
f6dfccc9cd
|
Merge branch 'zentaopms_284'
|
2023-02-16 17:22:15 +08:00 |
|
|
Yagami
|
af25c582d7
|
Merge branch 'zentaopms_284' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_284
|
2023-02-16 17:07:00 +08:00 |
|
|
Yagami
|
b737d1df40
|
* Remove unused code.
|
2023-02-16 17:06:35 +08:00 |
|
|
tianshujie
|
b20bcae852
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285
|
2023-02-16 16:33:45 +08:00 |
|
|
tianshujie
|
052d72e4a5
|
Merge branch 'zentaopms_284' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_284
|
2023-02-16 16:18:14 +08:00 |
|
|
tianshujie
|
5e2ac749af
|
* Fix bug #32233.
|
2023-02-16 16:17:48 +08:00 |
|
|
Yagami
|
58fb367739
|
* Adjust dtable scroll bar and pager z-index.
|
2023-02-16 16:11:53 +08:00 |
|
|
Yagami
|
06696bcd0e
|
* Add setCookie for execution export.
|
2023-02-16 16:05:28 +08:00 |
|
|
tianshujie
|
9f391a84c1
|
* Fix bug #32216.
|
2023-02-16 16:03:33 +08:00 |
|
|
tianshujie
|
e6fa9625d5
|
* Fix bug #32224.
|
2023-02-16 15:59:03 +08:00 |
|
|
tianshujie
|
2925520efd
|
* Modify field name.
|
2023-02-16 15:53:11 +08:00 |
|
|
tianshujie
|
d657ae898a
|
* Restore.
|
2023-02-16 15:50:31 +08:00 |
|
|
tianshujie
|
9b4772b07d
|
* Fix bug #32215.
|
2023-02-16 15:44:35 +08:00 |
|
|
Yagami
|
7616c02f17
|
* Redirect old project to new project.
|
2023-02-16 15:35:30 +08:00 |
|
|
tianshujie
|
f39f2d27ed
|
* Code for fix bug #32206.
|
2023-02-16 15:27:43 +08:00 |
|
|
tianshujie
|
e652d0075c
|
* Code for fix bug #32189.
|
2023-02-16 15:15:36 +08:00 |
|
|
zhujinyong
|
08a6439103
|
* Expand tree of extensions.
|
2023-02-16 15:09:35 +08:00 |
|
|
liumengyi
|
93a890663c
|
* Fix bug of task #84584.
|
2023-02-16 07:01:13 +00:00 |
|
|
caoyanyi
|
f4153b2629
|
* Fix bug #32218,32219.
|
2023-02-16 14:59:17 +08:00 |
|
|
tianshujie
|
355cf1c597
|
Merge branch 'zentaopms_284' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_284
|
2023-02-16 14:58:53 +08:00 |
|
|
tianshujie
|
a2435c006a
|
* Code for finish task #84575.
|
2023-02-16 14:58:36 +08:00 |
|
|
Yagami
|
ae5dcc21ab
|
* Finish task #84589.
|
2023-02-16 14:55:45 +08:00 |
|
|
王怡栋
|
761a7ee0a2
|
Merge branch 'zentaopms_max4.2_wangyuting' into 'master'
* Fix bug #27133.
See merge request easycorp/zentaopms!6971
|
2023-02-16 06:44:20 +00:00 |
|
|
王怡栋
|
0e107103c9
|
Update helper.class.php
|
2023-02-16 06:44:03 +00:00 |
|
|
tianshujie
|
951de75b0a
|
Merge branch 'zentaopms_284' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_284
|
2023-02-16 14:42:42 +08:00 |
|
|
tianshujie
|
ad1d1631a3
|
* Code for finish task #84593.
|
2023-02-16 14:42:27 +08:00 |
|
|
liumengyi
|
7501362a58
|
* Finish task #84591.
|
2023-02-16 06:34:10 +00:00 |
|
|
王怡栋
|
b14b1806be
|
Merge branch 'zentaopms_biz8.2_wangyuting' into 'master'
* Fix bug #26855.
See merge request easycorp/zentaopms!6972
|
2023-02-16 06:26:54 +00:00 |
|
|
王怡栋
|
4f64ce13d7
|
Merge branch 'master_xieqiyu_26434' into 'master'
* Code for bug#26434.
See merge request easycorp/zentaopms!6973
|
2023-02-16 06:25:22 +00:00 |
|
|
王怡栋
|
96f6bff0bd
|
Merge branch 'master_xieqiyu_28673' into 'master'
* Code for bug#28673.
See merge request easycorp/zentaopms!6974
|
2023-02-16 06:24:56 +00:00 |
|
|
王怡栋
|
64acd2dced
|
Merge branch 'master_xieqiyu_25082' into 'master'
* Code for bug#25082.
See merge request easycorp/zentaopms!6976
|
2023-02-16 06:24:38 +00:00 |
|
|
caoyanyi
|
63ff47ead8
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285
|
2023-02-16 14:12:30 +08:00 |
|
|
xieqiyu
|
7ceb69b370
|
* Code for bug#25082.
|
2023-02-16 13:57:39 +08:00 |
|
|
Yagami
|
38a68912ff
|
Merge branch 'zentaopms_284' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_284
|
2023-02-16 13:56:28 +08:00 |
|
|
Yagami
|
15ff524a7d
|
* Finish task #84590.
|
2023-02-16 13:56:15 +08:00 |
|
|
caoyanyi
|
617cc3767e
|
* Fix bug #32197.
|
2023-02-16 13:46:31 +08:00 |
|
|
liumengyi
|
cd7cdbb6a8
|
* Fix bug of task #84592.
|
2023-02-16 05:35:10 +00:00 |
|
|
liumengyi
|
9be6fa2fd2
|
* Finish task #84584.
|
2023-02-16 05:28:39 +00:00 |
|
|
王怡栋
|
3b777eeb4e
|
Merge branch 'sprint/feedback2203' into 'master'
* Fix feedback feedback2204.
See merge request easycorp/zentaopms!6970
|
2023-02-16 05:08:28 +00:00 |
|
|
chaideqing
|
b3eeb70b26
|
* Fix feedback feedback2204.
|
2023-02-16 11:59:17 +08:00 |
|
|
caoyanyi
|
b478779676
|
* Fix bug #32184,32192,32193.
|
2023-02-16 11:09:18 +08:00 |
|
|
wangyuting2
|
3196ef5d19
|
* Fix bug #26855.
|
2023-02-16 10:26:53 +08:00 |
|
|
tianshujie
|
020b742dc7
|
* Code for finish task #84593.
|
2023-02-16 10:24:53 +08:00 |
|
|
tianshujie
|
fcc4837af0
|
* Code for finish task #84578.
|
2023-02-16 10:01:44 +08:00 |
|
|
tianshujie
|
be00a4a8ae
|
* Code for finish task #84580.
|
2023-02-16 09:29:05 +08:00 |
|
|
tianshujie
|
2a388d06a7
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285
|
2023-02-16 09:00:16 +08:00 |
|