 wangyidong
|
08be7e66fc
|
Merge branch 'fixbug'
|
2022-06-24 13:36:07 +08:00 |
|
|
王怡栋
|
fd82c8d2f1
|
Merge branch 'master' into 'fixbug'
# Conflicts:
# module/weekly/model.php
|
2022-06-24 05:35:50 +00:00 |
|
|
王怡栋
|
fa084d0117
|
Merge branch 'sprint/205_hufangzhou_dynamic' into 'master'
* Adjust the spacing of dynamic block and dynamic page.
See merge request easycorp/zentaopms!4139
|
2022-06-24 05:34:59 +00:00 |
|
|
hufangzhou
|
eebcfaad58
|
* Adjust the spacing of dynamic block and dynamic page.
|
2022-06-24 13:33:11 +08:00 |
|
|
leiyong
|
5d9ce4e512
|
* Adjust CSS.
|
2022-06-24 05:32:01 +00:00 |
|
|
caoyanyi
|
a0993d719a
|
* Modify js set error.
|
2022-06-24 13:27:15 +08:00 |
|
|
tanghucheng
|
212e495fc2
|
* Code for bug #24197.
|
2022-06-24 13:20:31 +08:00 |
|
|
宋辰轩
|
90f7322aeb
|
* Modify default.
|
2022-06-24 13:18:18 +08:00 |
|
|
leiyong
|
8ab031395a
|
* Adjust CSS.
|
2022-06-24 05:09:15 +00:00 |
|
|
tianshujie
|
5baf2a04fd
|
* Add tools to automatically generate German and French.
|
2022-06-24 13:03:54 +08:00 |
|
|
王怡栋
|
b57a5efddb
|
Merge branch 'master_xieqiyu_57869' into 'master'
* Finish task#57869.
See merge request easycorp/zentaopms!4135
|
2022-06-24 05:01:28 +00:00 |
|
|
leiyong
|
f7d7d7f5c6
|
* Fix bug#24192.
|
2022-06-24 03:37:18 +00:00 |
|
|
leiyong
|
fc9b7bf5ad
|
* Fix bug#24192.
|
2022-06-24 03:36:27 +00:00 |
|
|
xieqiyu
|
649633f5bc
|
* Finish task#57869.
|
2022-06-24 11:28:40 +08:00 |
|
|
tanghucheng
|
537e616a1f
|
* Fix bug #24197.
|
2022-06-24 11:13:42 +08:00 |
|
|
王怡栋
|
281c176681
|
Merge branch 'sgm_fixbug' into 'master'
Sgm fixbug
See merge request easycorp/zentaopms!4133
|
2022-06-24 03:12:17 +00:00 |
|
|
王怡栋
|
658f322367
|
Merge branch 'fixbug' into 'master'
* Fix bug #24197.
See merge request easycorp/zentaopms!4131
|
2022-06-24 03:11:16 +00:00 |
|
|
王怡栋
|
182130e2a1
|
Merge branch 'sprint/master_zhouxudong_57859' into 'master'
* Finish task #57859.
See merge request easycorp/zentaopms!4132
|
2022-06-24 03:10:53 +00:00 |
|
|
孙广明
|
4f8fc5f122
|
* Code css file.
|
2022-06-24 11:07:17 +08:00 |
|
|
tanghucheng
|
5731aa0824
|
* Fix bug #24197.
|
2022-06-24 10:56:27 +08:00 |
|
|
宋辰轩
|
1bcbbdaa68
|
* Login action are recorded by default.
|
2022-06-24 10:29:04 +08:00 |
|
|
王怡栋
|
491c882d44
|
Merge branch 'sprint205_leiyong_bug_24036' into 'master'
* Fix bug#24036.
See merge request easycorp/zentaopms!4129
|
2022-06-24 02:24:28 +00:00 |
|
|
leiyong
|
b74f79540c
|
* Fix bug#24036.
|
2022-06-24 02:22:22 +00:00 |
|
|
zhouxudong
|
463b4d0710
|
* Finish task #57859.
|
2022-06-24 02:14:08 +00:00 |
|
|
王怡栋
|
8ad9dea460
|
Merge branch 'sprint/xuan_106' into 'master'
Sprint/xuan 106
See merge request easycorp/zentaopms!4126
|
2022-06-24 01:35:58 +00:00 |
|
|
dingyongliang
|
7963845b6b
|
* mv style to x.style.css.
|
2022-06-24 01:32:03 +00:00 |
|
|
孙广明
|
00f264d26c
|
* Fix bugs.
|
2022-06-24 09:30:56 +08:00 |
|
|
王怡栋
|
f2603f143d
|
Merge branch 'spint/master_zhouxudong_57879' into 'master'
* Finish task #57879.
See merge request easycorp/zentaopms!4125
|
2022-06-24 01:30:35 +00:00 |
|
|
王怡栋
|
bbe4b01050
|
Merge branch 'sprint/206_tianshujie_23958' into 'master'
* Fix bug #23958.
See merge request easycorp/zentaopms!4128
|
2022-06-24 01:19:04 +00:00 |
|
|
tianshujie
|
77685a86df
|
* Add comment.
|
2022-06-24 09:18:32 +08:00 |
|
|
王怡栋
|
f922e4c835
|
Merge branch 'sprint/206_liumengyi_fixbug' into 'master'
* Fix bug #24246, #24214.
See merge request easycorp/zentaopms!4127
|
2022-06-24 01:17:33 +00:00 |
|
|
liumengyi
|
5b84f06092
|
* Fix bug #24214.
|
2022-06-24 09:10:05 +08:00 |
|
|
liumengyi
|
48532553f2
|
* Fix bug #24246.
|
2022-06-24 09:05:46 +08:00 |
|
|
zhouxudong
|
7db6039f4b
|
* Finish task #57879.
|
2022-06-24 00:50:19 +00:00 |
|
|
caoyanyi
|
7ce833f5ad
|
* Modify style for select.
|
2022-06-24 08:48:02 +08:00 |
|
|
王怡栋
|
0b0f026964
|
Merge branch 'fixbug' into 'master'
* Fix code format.
See merge request easycorp/zentaopms!4123
|
2022-06-24 00:44:51 +00:00 |
|
|
tianshujie
|
c4bdf0ea3d
|
* Fix bug #23958.
|
2022-06-24 08:42:39 +08:00 |
|
|
tanghucheng
|
25d4830892
|
* Fix code format.
|
2022-06-24 08:30:07 +08:00 |
|
|
zhujinyong
|
ac574675d8
|
Merge branch 'sprint/sunhao/picker'
|
2022-06-23 17:52:13 +08:00 |
|
|
孙广明
|
f8f88249a4
|
Merge branch 'sprint/207_mayue_bug#24059' into 'master'
* Fix bug #24059.
See merge request easycorp/zentaopms!4112
|
2022-06-23 09:36:33 +00:00 |
|
|
mayue
|
1c64648461
|
* Optimize code.
|
2022-06-23 17:29:26 +08:00 |
|
|
王怡栋
|
a4e2413206
|
Merge branch 'sprint205_leiyong_task_57876' into 'master'
* Finish task#57876.
See merge request easycorp/zentaopms!4121
|
2022-06-23 09:28:10 +00:00 |
|
|
王怡栋
|
399aca3bac
|
Merge branch 'sprint/master_zhouxudong_24173' into 'master'
* Fix bug #24173.
See merge request easycorp/zentaopms!4117
|
2022-06-23 09:27:46 +00:00 |
|
|
王怡栋
|
176239c74d
|
Merge branch 'master_xieqiyu_57850' into 'master'
* Code for task#57850.
See merge request easycorp/zentaopms!4122
|
2022-06-23 09:27:32 +00:00 |
|
|
孙广明
|
a9ec749aa1
|
Merge branch 'zg_24184' into 'master'
* Fix bug#24184
See merge request easycorp/zentaopms!4111
|
2022-06-23 09:26:59 +00:00 |
|
|
孙广明
|
fd4940a0ba
|
Merge branch 'sprint/207_mayue_bug#24175' into 'master'
* Fix bug #24175.
See merge request easycorp/zentaopms!4119
|
2022-06-23 09:26:24 +00:00 |
|
|
李玉春
|
267803004a
|
Merge branch 'cyy_optimize' into 'master'
* Adjust style.
See merge request easycorp/zentaopms!4110
|
2022-06-23 09:21:33 +00:00 |
|
|
xieqiyu
|
d4ac1b4a5f
|
* Code for task#57850.
|
2022-06-23 17:20:19 +08:00 |
|
|
朱金勇
|
251593ac46
|
Merge branch 'sprint/sunhao/bug24187' into 'master'
* bug #24187, update picker to support for using picker for form controls with same id.
See merge request easycorp/zentaopms!4107
|
2022-06-23 09:18:34 +00:00 |
|
|
王怡栋
|
19c0ff84f9
|
Merge branch 'fixbug' into 'master'
* Code for install max.
See merge request easycorp/zentaopms!4120
|
2022-06-23 09:13:18 +00:00 |
|