 tianshujie
|
5db38be8de
|
* Code for finish task #83721.
|
2023-02-07 09:52:21 +08:00 |
|
|
tianshujie
|
2b265f6157
|
Merge branch 'sprint/285' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285_navigation
|
2023-02-07 09:01:49 +08:00 |
|
|
王怡栋
|
243cf7528f
|
Merge branch 'sprint/285_tianshujie_83745' into 'sprint/285'
Sprint/285 tianshujie 83745
See merge request easycorp/zentaopms!6865
|
2023-02-07 00:35:24 +00:00 |
|
|
王怡栋
|
8399f2d331
|
Merge branch 'dev/gfl_task_#83327' into 'sprint/285'
Dev/gfl task #83327
See merge request easycorp/zentaopms!6864
|
2023-02-07 00:34:42 +00:00 |
|
|
caoyanyi
|
c80f614322
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285
|
2023-02-07 08:29:22 +08:00 |
|
|
tianshujie
|
7b6d5a1651
|
* Code for finish task #83721.
|
2023-02-07 08:26:37 +08:00 |
|
|
王怡栋
|
ac066acdc9
|
Merge branch 'master_xieqiyu_83681' into 'master'
* Code for task#83681.
See merge request easycorp/zentaopms!6863
|
2023-02-06 09:23:47 +00:00 |
|
|
王怡栋
|
26fa30840f
|
Merge branch 'zentaopms_wangyuting2' into 'master'
* Finish task #84089. Fix bug #31946.
See merge request easycorp/zentaopms!6862
|
2023-02-06 09:23:33 +00:00 |
|
|
王怡栋
|
6d105678b0
|
Merge branch 'zentaopms_wangyuting' into 'master'
* Fix the bug of not updating the weekly report.
See merge request easycorp/zentaopms!6860
|
2023-02-06 09:20:09 +00:00 |
|
|
王怡栋
|
91b5f22ed9
|
Merge branch 'dev/gfl_fix_style_bug_in_browseList' into 'master'
* Code for change pd-l in a to pd-r in icon
See merge request easycorp/zentaopms!6859
|
2023-02-06 09:18:39 +00:00 |
|
|
guofeilong
|
c14a0f505a
|
* Code for add lang in admin
|
2023-02-06 17:14:18 +08:00 |
|
|
guofeilong
|
07960c45a0
|
* Code for admin refactors
|
2023-02-06 17:10:28 +08:00 |
|
|
tianshujie
|
1a1f8d3a07
|
* Put holiday permissions in the open source edition.
|
2023-02-06 17:05:37 +08:00 |
|
|
tianshujie
|
55bc9f98b0
|
* Code for finish task #83722.
|
2023-02-06 16:53:45 +08:00 |
|
|
guofeilong
|
36bd3f3384
|
* Code for task #83731
|
2023-02-06 16:52:51 +08:00 |
|
|
guofeilong
|
f957c30cd0
|
Merge branch 'sprint/285' of https://gitlab.zcorp.cc/easycorp/zentaopms into dev/gfl_task_#83327
|
2023-02-06 16:34:33 +08:00 |
|
|
tianshujie
|
73c669b247
|
* Code for finish task #83722.
|
2023-02-06 16:11:57 +08:00 |
|
|
xieqiyu
|
91efd85783
|
* Code for task#83681.
|
2023-02-06 15:56:49 +08:00 |
|
|
tianshujie
|
f44d27bfdc
|
Merge branch 'sprint/285' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285
|
2023-02-06 15:42:51 +08:00 |
|
|
tianshujie
|
adc0616341
|
* Code for finish task #83721,83722.
|
2023-02-06 15:41:55 +08:00 |
|
|
wangyuting2
|
b37af3c3a7
|
* Fix bug #84089.
|
2023-02-06 15:35:33 +08:00 |
|
|
hufangzhou
|
1aaa267cff
|
* Add the comment.
|
2023-02-06 06:43:02 +00:00 |
|
|
caoyanyi
|
2f67a61a45
|
* Optimize page style.
|
2023-02-06 13:48:34 +08:00 |
|
|
wangyuting2
|
775c16402c
|
* Optimize code.
|
2023-02-06 13:24:45 +08:00 |
|
|
Yagami
|
33fc8fd620
|
* Code for php version bug.
|
2023-02-06 13:24:02 +08:00 |
|
|
wangyuting2
|
34e4445859
|
* Fix the bug of not updating the weekly report.
|
2023-02-06 13:07:03 +08:00 |
|
|
tianshujie
|
5b6978ed8b
|
* Finish task #83744.
|
2023-02-06 12:02:31 +08:00 |
|
|
guofeilong
|
6e345d7525
|
* Code for change pd-l in a to pd-r in icon
|
2023-02-06 10:40:25 +08:00 |
|
|
tianshujie
|
a1aa671bb2
|
* Finish task #83745.
|
2023-02-06 10:35:12 +08:00 |
|
|
guofeilong
|
7faf11867e
|
* Code for bug #31933
|
2023-02-06 08:39:25 +08:00 |
|
|
guofeilong
|
4fe1effdec
|
Merge branch 'sprint/285' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285
|
2023-02-06 08:27:25 +08:00 |
|
|
guofeilong
|
f1124e5cde
|
* Code for bug #31938
|
2023-02-06 08:27:17 +08:00 |
|
|
caoyanyi
|
e539996403
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285
|
2023-02-06 08:23:10 +08:00 |
|
|
wangyidong
|
9b2050098d
|
* fix bug #29748.
|
2023-02-03 17:17:39 +08:00 |
|
|
王怡栋
|
9d34521ef7
|
Merge branch 'master_xieqiyu_28270' into 'master'
* Code for bug#28270.
See merge request easycorp/zentaopms!6858
|
2023-02-03 09:14:46 +00:00 |
|
|
王怡栋
|
ca09570077
|
Merge branch 'dev/gfl_my_preference_css_refactors' into 'master'
* Code for css in preference.html.php .
See merge request easycorp/zentaopms!6857
|
2023-02-03 09:14:09 +00:00 |
|
|
xieqiyu
|
2ab3b9f8cb
|
* Code for bug#28270.
|
2023-02-03 16:59:43 +08:00 |
|
|
guofeilong
|
f71582f9f2
|
* Code for bug #31907
|
2023-02-03 16:49:29 +08:00 |
|
|
guofeilong
|
ec8e0acb79
|
* Code for css in admin.html
|
2023-02-03 16:37:16 +08:00 |
|
|
guofeilong
|
b5df472639
|
* Code for css in preference.html.php .
|
2023-02-03 16:27:52 +08:00 |
|
|
王怡栋
|
b1bd43c331
|
Merge branch 'master_bug_30389' into 'master'
* Fix bug #30389.* Fix bug #30389.* Fix bug #30389.* Fix bug #30389.* Fix bug...
See merge request easycorp/zentaopms!6852
|
2023-02-03 07:59:06 +00:00 |
|
|
liuhong
|
3d24c6980f
|
* Adjust code for 30389.
|
2023-02-03 07:33:01 +00:00 |
|
|
guofeilong
|
1538371339
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285
|
2023-02-03 15:13:00 +08:00 |
|
|
王怡栋
|
3ec34c9acd
|
Merge branch 'master_xieqiyu_28704' into 'master'
* Code for bug#28704.
See merge request easycorp/zentaopms!6856
|
2023-02-03 06:46:28 +00:00 |
|
|
王怡栋
|
bc3ba1e05c
|
Merge branch 'zentaopms284_bug#25538' into 'master'
* Fix bug #25538.
See merge request easycorp/zentaopms!6854
|
2023-02-03 06:39:06 +00:00 |
|
|
王怡栋
|
f6264aed8c
|
Merge branch 'ticket_324' into 'master'
* Adjuct for ticket 324.
See merge request easycorp/zentaopms!6853
|
2023-02-03 06:36:09 +00:00 |
|
|
xieqiyu
|
3c8d8e27a6
|
* Code for bug#28704.
|
2023-02-03 14:34:16 +08:00 |
|
|
guofeilong
|
54f3ba6ec1
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285
|
2023-02-03 14:28:38 +08:00 |
|
|
王怡栋
|
c1ea319bcd
|
Merge branch 'dev/gfl_finish_bug_in_flow-item' into 'master'
* Code for style problem in flowchart
See merge request easycorp/zentaopms!6855
|
2023-02-03 06:28:02 +00:00 |
|
|
guofeilong
|
df8608ddc9
|
* Code for style problem in flowchart
|
2023-02-03 14:23:22 +08:00 |
|