 孙广明
|
777b20ebdc
|
Merge branch 'sprint/tsj_task' into 'master'
Sprint/tsj task
See merge request easycorp/zentaopms!7009
|
2023-02-21 05:47:26 +00:00 |
|
|
Lufei
|
63a8a97c59
|
* Compatible PHP5.3.
|
2023-02-21 09:15:53 +08:00 |
|
|
tianshujie
|
d6266bc607
|
* Code for finish task #85047.
|
2023-02-20 14:47:10 +08:00 |
|
|
王怡栋
|
361568a575
|
Merge branch 'sprint/tsj_fixbug' into 'master'
Sprint/tsj fixbug
See merge request easycorp/zentaopms!6980
|
2023-02-17 02:00:33 +00:00 |
|
|
tianshujie
|
d9322e91e2
|
* Code for finish task#84576.
|
2023-02-17 09:33:34 +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 |
|
|
tianshujie
|
2a388d06a7
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285
|
2023-02-16 09:00:16 +08:00 |
|
|
tianshujie
|
484f34396c
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_284
|
2023-02-16 08:59:00 +08:00 |
|
|
hufangzhou
|
f3cd2e7d4d
|
* Change the Easy Soft to ZenTao Software.
|
2023-02-15 17:01:22 +08:00 |
|
|
tianshujie
|
4f65445e8e
|
* Code for finish task #84576.
|
2023-02-15 16:31:18 +08:00 |
|
|
tianshujie
|
f989173e10
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_284
|
2023-02-15 08:29:48 +08:00 |
|
|
tianshujie
|
b2fef4f696
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285
|
2023-02-15 08:19:27 +08:00 |
|
|
hufangzhou
|
30a251154e
|
* Fix bug #31933.
|
2023-02-14 15:59:09 +08:00 |
|
|
liumengyi
|
00d8f85005
|
* Finish task #84584.
|
2023-02-14 13:21:33 +08:00 |
|
|
liumengyi
|
7ea51e54b5
|
* Finish task #84584.
|
2023-02-14 13:13:46 +08:00 |
|
|
guofeilong
|
bc88bfece2
|
* code for delete / after background-image: url
|
2023-02-14 09:56:33 +08:00 |
|
|
tianshujie
|
ec0078c708
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_284
|
2023-02-13 14:03:58 +08:00 |
|
|
guofeilong
|
89be39c7e3
|
* Code for class refactors in flowChart
|
2023-02-13 09:43:04 +08:00 |
|
|
tianshujie
|
da0ebacef2
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285
|
2023-02-13 08:27:05 +08:00 |
|
|
guofeilong
|
08b3159b3d
|
* Code for fix style problem in flowChart.
|
2023-02-10 11:24:53 +08:00 |
|
|
tianshujie
|
cca9a79498
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285
|
2023-02-10 10:55:46 +08:00 |
|
|
daitingting
|
e155d462a7
|
* Fix bug #24499.
|
2023-02-09 06:10:28 +00:00 |
|
|
tianshujie
|
adc0616341
|
* Code for finish task #83721,83722.
|
2023-02-06 15:41:55 +08:00 |
|
|
guofeilong
|
df8608ddc9
|
* Code for style problem in flowchart
|
2023-02-03 14:23:22 +08:00 |
|
|
hufangzhou
|
73df98376a
|
* Finish task #83205, and fix bug of task #83206.
|
2023-01-31 10:35:06 +08:00 |
|
|
Yagami
|
fd399560f9
|
* Code for task #83209.
|
2023-01-31 08:54:50 +08:00 |
|
|
hufangzhou
|
dfa423b29c
|
* Fix bug for task #83206.
|
2023-01-30 17:14:56 +08:00 |
|
|
hufangzhou
|
a8e7b0e2a1
|
* Finish task #83206.
|
2023-01-30 15:03:22 +08:00 |
|
|
liumengyi
|
ba1f64daf9
|
* Fix bug #31808.
|
2023-01-30 08:29:51 +08:00 |
|
|
caoyanyi
|
32174bfc47
|
* Modify block style.
|
2023-01-13 10:55:23 +08:00 |
|
|
caoyanyi
|
0eea47c282
|
* Modify help block style.
|
2023-01-13 10:53:26 +08:00 |
|
|
王怡栋
|
de8493412a
|
Merge branch 'cyy_bug' into 'master'
* Modify job edit error tip.
See merge request easycorp/zentaopms!6689
|
2023-01-05 02:55:34 +00:00 |
|
|
田淑杰
|
5ecaa57043
|
* Fix bug #31470.
|
2023-01-05 10:13:34 +08:00 |
|
|
caoyanyi
|
459f1ae27d
|
* Fix bug #31469.
|
2023-01-05 09:58:49 +08:00 |
|
|
caoyanyi
|
b758139f9b
|
* Modify vision switch.
|
2023-01-04 15:27:10 +08:00 |
|
|
caoyanyi
|
8ac4dc8fd4
|
Merge branch 'master' into cyy_bug
|
2023-01-04 09:34:04 +08:00 |
|
|
caoyanyi
|
c853331163
|
* Modify admin user check.
|
2023-01-04 09:33:08 +08:00 |
|
|
caoyanyi
|
c3f8d4873f
|
* Fix bug #31397.
|
2023-01-03 17:09:58 +08:00 |
|
|
王怡栋
|
62d60df7bd
|
Merge branch 'sprint/hufangzhou_newVersion' into 'master'
* Add the new version.
See merge request easycorp/zentaopms!6668
|
2023-01-03 06:09:21 +00:00 |
|
|
hufangzhou
|
b5859c7dc3
|
* Add the new version.
|
2023-01-03 13:56:27 +08:00 |
|
|
孙广明
|
c29776bbfe
|
Merge branch 'sprint/tsj_fixbug' into 'master'
Sprint/tsj fixbug
See merge request easycorp/zentaopms!6667
|
2023-01-03 05:54:09 +00:00 |
|
|
王怡栋
|
aef16e3c83
|
Merge branch 'sprint/gfl_task_40825' into 'master'
* code for task #40827
See merge request easycorp/zentaopms!6659
|
2023-01-03 01:54:28 +00:00 |
|
|
tianshujie
|
a2f27fe5d5
|
* Fix bug #30557.
|
2023-01-03 08:43:08 +08:00 |
|
|
wangyidong
|
ccec9bcc16
|
Merge branch 'zentaopms279'
|
2023-01-03 08:39:33 +08:00 |
|
|
tianshujie
|
e11298c33b
|
* code for task #40827
|
2022-12-30 17:32:05 +08:00 |
|
|
tianshujie
|
41dd1a0280
|
* code for task #40827
|
2022-12-30 16:47:15 +08:00 |
|
|
caoyanyi
|
597b11524f
|
* Modify text style.
|
2022-12-30 15:09:44 +08:00 |
|
|
wangyidong
|
7c3958183f
|
* code for task #81412,81413.
|
2022-12-29 15:33:40 +08:00 |
|
|
tianshujie
|
a1fe18b99d
|
* code for bug #81093
|
2022-12-29 15:17:18 +08:00 |
|
|
tianshujie
|
2ed3974bc6
|
* code for bug #81093
|
2022-12-29 15:14:34 +08:00 |
|