wangyuting2
|
df375beaa5
|
* Fix bug #29286.
|
2022-11-04 06:55:16 +00:00 |
|
wangyuting2
|
0cefde5d28
|
* Optimize code for review code.
|
2022-11-04 06:35:21 +00:00 |
|
王怡栋
|
74c7882fc6
|
Merge branch 'zentaopms_239_task_#74858' into 'zentaopms_239'
* Finish task #74858.
See merge request easycorp/zentaopms!6030
|
2022-11-04 02:44:03 +00:00 |
|
王怡栋
|
cae7c516d1
|
Merge branch 'zentaopms_239_task_#74864' into 'zentaopms_239'
* Finish task #74864.
See merge request easycorp/zentaopms!6029
|
2022-11-04 02:43:44 +00:00 |
|
Yagami
|
c202a3275a
|
* Fix bug #29156.
|
2022-11-04 09:56:03 +08:00 |
|
daitingting
|
3d287772cc
|
* Finish task #74858.
|
2022-11-04 01:49:32 +00:00 |
|
daitingting
|
9f1f70f9ca
|
* Finish task #74864.
|
2022-11-04 01:41:06 +00:00 |
|
王 于听
|
95879b7f64
|
Merge branch 'zentaopms_239_task_#73988_#74180' into 'zentaopms_239'
* Fix for #73988, #74180.
See merge request easycorp/zentaopms!6023
|
2022-11-03 08:53:34 +00:00 |
|
daitingting
|
1eaf98a48a
|
* Fix for #73988, #74180.
|
2022-11-03 07:58:17 +00:00 |
|
wangyuting2
|
b4f6b346b8
|
* Fix bug for review code.
|
2022-11-03 07:16:01 +00:00 |
|
wangyuting2
|
3a204c4a37
|
* Adjust otherOa to otherOA.
|
2022-11-03 07:04:47 +00:00 |
|
代婷婷
|
c105930472
|
Merge branch 'zentaopms_239' into 'zentaopms_239_task_#74667'
# Conflicts:
# module/custom/js/mode.js
# module/custom/lang/de.php
# module/custom/lang/en.php
# module/custom/lang/fr.php
# module/custom/lang/zh-cn.php
|
2022-11-03 05:36:38 +00:00 |
|
王怡栋
|
6adc7ee920
|
Merge branch 'zentaopms_239_72273' into 'zentaopms_239'
* Finish task #72273.
See merge request easycorp/zentaopms!6014
|
2022-11-03 05:32:33 +00:00 |
|
王怡栋
|
87000d8973
|
Merge branch 'zentaopms_239_task_#74180' into 'zentaopms_239'
* Finish task #74180.
See merge request easycorp/zentaopms!6006
|
2022-11-03 05:29:24 +00:00 |
|
wangyuting2
|
b59ceb1038
|
* Finish task #72273.
|
2022-11-03 05:28:49 +00:00 |
|
王怡栋
|
83eef8d509
|
Merge branch 'zentaopms_239_bug#29110' into 'zentaopms_239'
* Fix bug #29110.
See merge request easycorp/zentaopms!6004
|
2022-11-03 05:26:33 +00:00 |
|
王怡栋
|
9bacba7388
|
Merge branch 'zentaopms_239_wangyuting' into 'zentaopms_239'
* Adjust devops priv.
See merge request easycorp/zentaopms!6002
|
2022-11-03 05:26:02 +00:00 |
|
daitingting
|
b07b1031ea
|
* Finish task #74667.
|
2022-11-03 03:15:41 +00:00 |
|
daitingting
|
998866a374
|
* Finish task #74180.
|
2022-11-03 01:40:17 +00:00 |
|
wangyuting2
|
5448eaf3c7
|
* Fix bug #29110.
|
2022-11-03 01:08:39 +00:00 |
|
wangyuting2
|
c2db7a96a9
|
* Adjust devops priv.
|
2022-11-03 00:51:27 +00:00 |
|
王怡栋
|
2bd3030dc1
|
Merge branch 'zentaopms_239_wyd' into 'zentaopms_239'
Zentaopms 239 wyd
See merge request easycorp/zentaopms!5996
|
2022-11-02 08:07:31 +00:00 |
|
wangyidong
|
7cd735d1e0
|
* code for task #28138.
|
2022-11-02 16:05:05 +08:00 |
|
王怡栋
|
e7aa768496
|
Merge branch 'zentaopms_239_task#74239' into 'zentaopms_239'
* Finish task #74239.
See merge request easycorp/zentaopms!5992
|
2022-11-02 07:52:28 +00:00 |
|
王怡栋
|
0219d85484
|
Merge branch 'zentaopms_239_bug_#29108' into 'zentaopms_239'
* Fix bug #29108.
See merge request easycorp/zentaopms!5990
|
2022-11-02 07:52:08 +00:00 |
|
wangyuting2
|
6209c70d7e
|
* Finish task #74239.
|
2022-11-02 07:42:06 +00:00 |
|
daitingting
|
f82d405eff
|
* Fix bug #29108.
|
2022-11-02 07:28:28 +00:00 |
|
wangyuting2
|
4d63abcce5
|
* Fix caselib bug.
|
2022-11-02 07:18:06 +00:00 |
|
wangyidong
|
df497ad610
|
* finish task #74774.
|
2022-11-02 14:48:19 +08:00 |
|
daitingting
|
cb90a2e25b
|
* Finish task #74176.
|
2022-11-02 06:30:01 +00:00 |
|
王怡栋
|
16f8d7450b
|
Merge branch 'zentaopms_239_task#73845' into 'zentaopms_239'
* Finish task #73845 ~ #73848.
See merge request easycorp/zentaopms!5984
|
2022-11-02 06:24:45 +00:00 |
|
王怡栋
|
5010149390
|
Merge branch 'zentaopms_239_wyd' into 'zentaopms_239'
Zentaopms 239 wyd
See merge request easycorp/zentaopms!5985
|
2022-11-02 06:22:55 +00:00 |
|
wangyidong
|
f2cd7c12b4
|
* code for task #74779.
|
2022-11-02 14:21:24 +08:00 |
|
wangyuting2
|
a873368635
|
* Adjust lang.
|
2022-11-02 06:17:35 +00:00 |
|
wangyidong
|
557d32fbd3
|
* code for task #74775.
|
2022-11-02 14:05:22 +08:00 |
|
wangyuting2
|
dc4716f951
|
* Finish task #73845 ~ #73848.
|
2022-11-02 06:05:18 +00:00 |
|
wangyidong
|
e29b72fe17
|
* code for unlink story and case from execution.
|
2022-11-02 13:32:02 +08:00 |
|
王怡栋
|
c534fb0065
|
Merge branch 'zentaopms_239_wyd' into 'zentaopms_239'
Zentaopms 239 wyd
See merge request easycorp/zentaopms!5980
|
2022-11-02 03:57:36 +00:00 |
|
王怡栋
|
2c02e877ac
|
Merge branch 'zentaopms_239_task#73838' into 'zentaopms_239'
* Finish task #73838 ~ #73844.
See merge request easycorp/zentaopms!5977
|
2022-11-02 02:25:51 +00:00 |
|
王怡栋
|
0699177140
|
Merge branch 'zentaopms_239_task_#73985' into 'zentaopms_239'
* Doing task #73985.
See merge request easycorp/zentaopms!5975
|
2022-11-02 02:23:51 +00:00 |
|
wangyidong
|
fd56b11e41
|
* code for task #74779.
|
2022-11-02 10:18:26 +08:00 |
|
daitingting
|
b163bd0f32
|
* Finish task #73985.
|
2022-11-02 02:09:34 +00:00 |
|
wangyidong
|
99889da499
|
* code for task #74781.
|
2022-11-02 09:27:14 +08:00 |
|
wangyidong
|
4a0a5649a0
|
* adjust code.
|
2022-11-02 09:16:51 +08:00 |
|
wangyuting2
|
d54ca95ff6
|
* Finish task #73838 ~ #73844.
|
2022-11-02 01:15:40 +00:00 |
|
daitingting
|
8ad4ae27ef
|
* Doing task #73985.
|
2022-11-01 08:41:11 +00:00 |
|
wangyidong
|
9aea6ec0fe
|
* code for task #73995.
|
2022-11-01 16:38:26 +08:00 |
|
Yagami
|
6477ae1dff
|
Merge branch 'zentaopms_239' of https://gitlab.zcorp.cc/easycorp/zentaopms into 239
|
2022-11-01 16:10:10 +08:00 |
|
Yagami
|
3d211b68b0
|
* Finish task #74209.
|
2022-11-01 16:09:54 +08:00 |
|
wangyidong
|
af3ae9e5df
|
* code for task #73996.
|
2022-11-01 16:09:18 +08:00 |
|