 tanghucheng
|
ebeb74af0f
|
* * Fix bug for common lang.
|
2022-09-16 13:36:40 +08:00 |
|
|
唐胡成
|
960e138526
|
Merge branch 'zentaopms_239' into 'zentaopms_239_tanghucheng'
# Conflicts:
# module/common/lang/en.php
# module/common/lang/fr.php
# module/common/lang/menu.php
|
2022-09-16 05:21:43 +00:00 |
|
|
tanghucheng
|
14dd9807e9
|
* Finish task #69006.
|
2022-09-16 13:13:26 +08:00 |
|
|
liuruogu
|
b8d30bed93
|
* Fix bug for lang.
|
2022-09-16 03:21:31 +00:00 |
|
|
liuruogu
|
788741caf8
|
* Light menu.
|
2022-09-16 02:45:28 +00:00 |
|
|
liuruogu
|
34bfa0e423
|
* Light menu.
|
2022-09-16 02:43:34 +00:00 |
|
|
liuruogu
|
19d3a1948d
|
* Finish task #69013.
|
2022-09-16 01:13:03 +00:00 |
|
|
liuruogu
|
234cf3ff97
|
* Finish task #69013.
|
2022-09-16 01:05:29 +00:00 |
|
|
liuruogu
|
8296ebbb9f
|
* Finsih task #69013.
|
2022-09-15 08:49:10 +00:00 |
|
|
liuruogu
|
17392ef1ac
|
* Finsih task #69013.
|
2022-09-15 08:45:57 +00:00 |
|
|
liuruogu
|
04824e964b
|
* Finish task #69016.
|
2022-09-15 05:12:30 +00:00 |
|
|
xieqiyu
|
62b51f7c9e
|
* Code for task#66954,66959.
|
2022-09-07 14:20:33 +08:00 |
|
|
wangyidong
|
a8a703bf16
|
* finish task #68203.
|
2022-09-07 11:08:48 +08:00 |
|
|
王怡栋
|
17aec51cbe
|
Merge branch 'master' into 'importExport'
# Conflicts:
# module/port/model.php
|
2022-09-07 02:30:00 +00:00 |
|
|
wangyidong
|
08ad00b091
|
* fix bug #25049.
|
2022-09-06 08:54:36 +08:00 |
|
|
tanghucheng
|
4f7582d37d
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into importExport
|
2022-09-05 13:17:29 +08:00 |
|
|
wangyidong
|
e7d65e1dce
|
Merge branch 'sprint/zentaopms230'
|
2022-09-01 13:28:26 +08:00 |
|
|
xieqiyu
|
16094e64d4
|
* Optimize code.
|
2022-09-01 11:04:08 +08:00 |
|
|
xieqiyu
|
d552aa67f9
|
* Code for task#66955.
|
2022-09-01 10:47:58 +08:00 |
|
|
xieqiyu
|
e6bc611d14
|
* Finish task#66955.
|
2022-08-31 19:20:02 +08:00 |
|
|
王怡栋
|
b278f56e87
|
Merge branch 'sprint/hufangzhou_26631' into 'master'
* Fix bug 26631.
See merge request easycorp/zentaopms!5210
|
2022-08-31 07:31:31 +00:00 |
|
|
李玉春
|
e9540f67ae
|
Merge branch 'cyy_67259' into 'master'
* Modify local img.
See merge request easycorp/zentaopms!5203
|
2022-08-31 06:54:15 +00:00 |
|
|
hufangzhou
|
9d14b9440c
|
* Fix bug 26631.
|
2022-08-31 14:09:01 +08:00 |
|
|
xieqiyu
|
0cd8ce30cd
|
* Finish task#66954,#66960,#66959,#66958,#66956.
|
2022-08-31 12:35:45 +08:00 |
|
|
tanghucheng
|
f82ca09e99
|
* Compatible workflow fields for import|export.
|
2022-08-31 11:15:59 +08:00 |
|
|
caoyanyi
|
a2bfbcb5af
|
* Modify local img.
|
2022-08-31 10:38:33 +08:00 |
|
|
caoyanyi
|
94f2e93d0e
|
* Finish task #67259.
|
2022-08-31 09:40:04 +08:00 |
|
|
liumengyi
|
9b0f6544df
|
* Fix bug #23957, #26846.
|
2022-08-29 15:11:21 +08:00 |
|
|
tianshujie
|
1e59fbd311
|
* Fix bug #26882.
|
2022-08-25 16:48:00 +08:00 |
|
|
王怡栋
|
de8934a593
|
Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* add import white list
See merge request easycorp/zentaopms!5109
|
2022-08-25 03:20:27 +00:00 |
|
|
lanzongjun
|
b964b5e17a
|
* add import white list
|
2022-08-25 10:20:05 +08:00 |
|
|
liumengyi
|
723093c840
|
* Fix bug for task #65808.
|
2022-08-25 10:01:58 +08:00 |
|
|
liumengyi
|
c033a87009
|
* Fix bug #26845.
|
2022-08-24 17:19:59 +08:00 |
|
|
孙广明
|
01c6c2fa7a
|
Merge branch 'sprint/max43_mayue_task#65893' into 'master'
* Finish task #65893.
See merge request easycorp/zentaopms!5089
|
2022-08-24 07:29:34 +00:00 |
|
|
mayue
|
b64081a30e
|
* Finish task #65893.
|
2022-08-24 14:56:00 +08:00 |
|
|
liumengyi
|
c95ecbd1a6
|
* Optimize code for task #65808.
|
2022-08-23 16:19:20 +08:00 |
|
|
liumengyi
|
06c64d7e6f
|
* Optimize code for task #65808, #65807.
|
2022-08-23 15:48:47 +08:00 |
|
|
tianshujie
|
4e1ca8bd60
|
* Finish task #65808.
|
2022-08-23 13:40:34 +08:00 |
|
|
liumengyi
|
20041ea696
|
* Fix bug #26723.
|
2022-08-22 11:12:38 +08:00 |
|
|
sunguangming
|
9d52e47151
|
Merge branch 'sprint/228_tianshujie_64967'
|
2022-08-22 10:24:40 +08:00 |
|
|
tianshujie
|
ee63dc4f17
|
* Finish task #64967.
|
2022-08-22 09:24:18 +08:00 |
|
|
李玉春
|
6399c58056
|
Merge branch 'sprint/228_tianshujie_64976' into 'master'
Sprint/228 tianshujie 64976
See merge request easycorp/zentaopms!5017
|
2022-08-18 09:57:34 +00:00 |
|
|
tianshujie
|
98694da2ae
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/228_tianshujie_64967
|
2022-08-18 16:47:14 +08:00 |
|
|
胡方舟
|
2027a69923
|
Merge branch 'sprint/228' into 'master'
Sprint/228
See merge request easycorp/zentaopms!5015
|
2022-08-18 07:53:30 +00:00 |
|
|
曾刚
|
3172961404
|
Sprint/228 zg tasks and units
|
2022-08-18 07:15:14 +00:00 |
|
|
tianshujie
|
c0e97a501c
|
* Finish task #64976.
|
2022-08-18 14:33:10 +08:00 |
|
|
王怡栋
|
f3d49ef75f
|
Merge branch 'sprint/max42_mayue_task#64939' into 'master'
Sprint/max42 mayue task#64939
See merge request easycorp/zentaopms!5010
|
2022-08-18 05:54:12 +00:00 |
|
|
tianshujie
|
884d6fa30a
|
* Finish task #64967.
|
2022-08-18 13:44:04 +08:00 |
|
|
tianshujie
|
df8c9caf46
|
* Finish task #64967.
|
2022-08-17 16:37:02 +08:00 |
|
|
mayue
|
e95ecf9244
|
* Finish task #64939.
|
2022-08-17 16:20:17 +08:00 |
|