 Yagami
|
f95691948a
|
Merge branch 'zentaopms_294'
|
2023-03-06 08:37:11 +08:00 |
|
|
王怡栋
|
82fd53a51e
|
Merge branch 'zentaopms_wangyuting' into 'master'
* Fix warning.
See merge request easycorp/zentaopms!7124
|
2023-03-02 05:08:08 +00:00 |
|
|
wangyuting2
|
872138ec11
|
* Fix warning.
|
2023-03-02 11:03:12 +08:00 |
|
|
zhujinyong
|
ed3a128e50
|
Fix bug #32570.
|
2023-03-01 17:07:41 +08:00 |
|
|
zhujinyong
|
f667435248
|
Fix bug #32521.
|
2023-03-01 10:49:02 +08:00 |
|
|
liumengyi
|
93b01c6542
|
* Finish task #85641.
|
2023-02-28 01:12:35 +00:00 |
|
|
tianshujie
|
eb04e06f11
|
* Modify tip for system block.
|
2023-02-27 16:49:20 +08:00 |
|
|
hufangzhou
|
42769d3425
|
* Add the new version.
|
2023-02-27 06:51:34 +00:00 |
|
|
tianshujie
|
d753f6ebb6
|
* Resolve issue #761.
|
2023-02-22 15:31:45 +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
|
dbad8ab513
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_284
|
2023-02-14 08:52:02 +08:00 |
|
|
hufangzhou
|
7108816fa5
|
* Fix bug #32073.
|
2023-02-13 16:30:13 +08:00 |
|
|
zhujinyong
|
d9d47b9229
|
Merge branch 'zentaopms_284' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_284
|
2023-02-13 14:53:24 +08:00 |
|
|
zhujinyong
|
bab89d1e32
|
* Fix upgrading for mix stage.
|
2023-02-13 14:51:08 +08:00 |
|
|
hufangzhou
|
8d26dceb4b
|
* Compatible with php5.3.
|
2023-02-09 05:54:15 +00:00 |
|
|
孙广明
|
99446cf8d3
|
Merge branch 'zhouxin_feedback_313' into 'master'
* Resolve feedback #313.
See merge request easycorp/zentaopms!6861
|
2023-02-08 03:23:03 +00:00 |
|
|
hufangzhou
|
025aa5dc4b
|
* Add the new version.
|
2023-02-08 02:44:44 +00:00 |
|
|
zhouxin
|
26abc21883
|
* Adjust code.
|
2023-02-08 09:26:12 +08:00 |
|
|
zhouxin
|
c7a767521c
|
* Resolve feedback #313.
|
2023-02-06 14:27:23 +08:00 |
|
|
hufangzhou
|
c27e0ae9a6
|
* Add the mark for auto pack, and integrate the table creation statement.
|
2023-02-02 08:48:58 +00:00 |
|
|
chaideqing
|
0ebc9cd0d3
|
* Fix feedback 2047.
|
2023-02-01 01:52:20 +00:00 |
|
|
田淑杰
|
c2304d1197
|
* Fix bug #31571.
|
2023-01-10 08:21:02 +08:00 |
|
|
tianshujie
|
5eeb79f0cf
|
* Add upgrade delete file configuration.
|
2023-01-04 14:00:23 +08:00 |
|
|
hufangzhou
|
b5859c7dc3
|
* Add the new version.
|
2023-01-03 13:56:27 +08:00 |
|
|
tanghucheng
|
62c1ed7f9c
|
Merge branch 'master' into zenops_46
|
2022-12-30 09:40:04 +08:00 |
|
|
田淑杰
|
866b4086e8
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/272
|
2022-12-29 15:22:13 +08:00 |
|
|
hufangzhou
|
464cd34cd5
|
* Fix bug for add module.
|
2022-12-27 01:28:22 +00:00 |
|
|
hufangzhou
|
3a51b751ef
|
* Add the new Version.
|
2022-12-27 00:54:30 +00:00 |
|
|
liugang
|
9a89860dc4
|
* Comment codes.
|
2022-12-27 08:40:48 +08:00 |
|
|
liugang
|
8100689bb2
|
Merge branch 'sprint/biz17'
|
2022-12-26 08:50:31 +08:00 |
|
|
tanghucheng
|
5975278edc
|
* Merge master into zenops_46.
|
2022-12-20 16:44:27 +08:00 |
|
|
田淑杰
|
d6bad0942f
|
* Add update function of task #79622.
|
2022-12-19 11:11:28 +08:00 |
|
|
tanghucheng
|
85ffa23da8
|
Merge branch 'master' into zenops_46_tanghucheng
|
2022-12-15 15:27:59 +08:00 |
|
|
hufangzhou
|
6cef691b39
|
* Add the new version.
|
2022-12-14 05:28:51 +00:00 |
|
|
wangyidong
|
cb5af075f0
|
* adjust for upgrade.
|
2022-12-06 17:27:53 +08:00 |
|
|
caoyanyi
|
f58e24e6fc
|
Merge branch 'master' into zenops_46
|
2022-12-02 10:04:48 +08:00 |
|
|
Lufei
|
12e1539301
|
* Fix baseUrl scheme error for api createDemoData.
|
2022-11-29 18:28:13 +08:00 |
|
|
孙广明
|
d4f5170391
|
Merge branch 'zenops_46_zhaoke_74993' into 'zenops_46'
Zenops 46 zhaoke 74993
See merge request easycorp/zentaopms!6395
|
2022-11-28 06:58:42 +00:00 |
|
|
caoyanyi
|
fc95313a40
|
Merge branch 'master' into zenops_46
|
2022-11-28 08:41:37 +08:00 |
|
|
daitingting
|
a2aa5c325a
|
* Fix bug #30020.
|
2022-11-25 07:36:53 +00:00 |
|
|
王怡栋
|
647547faac
|
* fix for upgrade.
|
2022-11-25 15:13:23 +08:00 |
|
|
daitingting
|
8650982994
|
* Fix issues of function review.
|
2022-11-25 05:50:02 +00:00 |
|
|
liugang
|
9d5c9ca29d
|
* Remove files not compatible with open source version.
|
2022-11-24 15:00:46 +08:00 |
|
|
caoyanyi
|
4361cb4182
|
Merge branch 'master' into zenops_46
|
2022-11-24 13:01:30 +08:00 |
|
|
wangyuting
|
84f9b7b36a
|
* Fix bug #30193.
|
2022-11-24 02:12:02 +00:00 |
|
|
王怡栋
|
838f499ca6
|
Merge branch 'zentaopms_263_bug_#30104' into 'master'
* Fix bug #30104.
See merge request easycorp/zentaopms!6318
|
2022-11-23 05:44:05 +00:00 |
|
|
zhaoke
|
c2b0f0a656
|
* Update zanode name
|
2022-11-23 02:44:27 +00:00 |
|
|
daitingting
|
8b35153a3c
|
* Fix bug #30104.
|
2022-11-23 02:42:41 +00:00 |
|
|
liugang
|
b688d08312
|
Merge branch 'master' into sprint/biz17
|
2022-11-23 10:10:30 +08:00 |
|