 liyuchun
|
02b18d8174
|
* Fix error of zentao.sql
|
2022-08-05 05:12:32 +00:00 |
|
|
王怡栋
|
000038f12f
|
Merge branch 'sprint/gantt_upgrade' into 'master'
Sprint/gantt upgrade
See merge request easycorp/zentaopms!4807
|
2022-08-05 01:58:16 +00:00 |
|
|
wangyidong
|
7796bc8499
|
Merge branch 'sprint/devplat_30'
|
2022-08-05 08:46:26 +08:00 |
|
|
lanzongjun
|
f241846903
|
resolve conflict
|
2022-08-05 08:43:09 +08:00 |
|
|
daitingting
|
a292bc7438
|
* Add createdBy,createdDate fields in build table.
|
2022-08-04 07:39:24 +00:00 |
|
|
wangyidong
|
c98ee9e323
|
* fix for searchindex table fulltext index.
|
2022-08-04 09:40:58 +08:00 |
|
|
mayue
|
dfeafd9dbd
|
* Add key for zt_task.
|
2022-08-04 09:21:05 +08:00 |
|
|
wangyidong
|
f5b6edef01
|
Merge branch 'sprint/devplat_30'
|
2022-08-04 09:13:53 +08:00 |
|
|
王怡栋
|
8675278f16
|
Merge branch 'master' into 'sprint/221_tianshujie_62940'
# Conflicts:
# db/update17.4.sql
|
2022-08-03 01:35:27 +00:00 |
|
|
wangyidong
|
99c5aab19a
|
* code for task #62739.
|
2022-08-02 16:18:38 +08:00 |
|
|
tianshujie
|
c13808d8df
|
* Finish task #62943,62941,62940,62942.
|
2022-08-02 15:01:24 +08:00 |
|
|
daitingting
|
daa5ca846d
|
* Add createdBy and createdDate in these tables.
|
2022-08-02 00:52:00 +00:00 |
|
|
mayue
|
62b3b33910
|
* Add update17.4.sql.
|
2022-08-01 16:53:49 +08:00 |
|
|
caoyanyi
|
abd4b2aa6f
|
* Update sql.
|
2022-07-27 08:25:37 +08:00 |
|
|
caoyanyi
|
9037038690
|
* Modify data name.
|
2022-07-18 10:36:26 +08:00 |
|
|
lanzongjun
|
eac15cf70a
|
* fix bug #25172
|
2022-07-13 16:04:15 +08:00 |
|
|
lanzongjun
|
47aed9058f
|
* fix task #60360
|
2022-07-13 10:16:07 +08:00 |
|
|
wangyidong
|
6757d64f6e
|
* fix field type.
|
2022-07-11 16:16:59 +08:00 |
|
|
wangyidong
|
6d71c5e346
|
* fix bug #24794.
|
2022-07-07 13:18:25 +08:00 |
|
|
孙广明
|
6f1521407c
|
* Add cfd cron.
|
2022-07-06 09:07:13 +08:00 |
|
|
孙广明
|
25028997fa
|
* Finish task #59701.
|
2022-07-05 15:03:15 +08:00 |
|
|
hufangzhou
|
4336b35a36
|
* Fix bug #24626.
|
2022-06-30 15:13:34 +08:00 |
|
|
hufangzhou
|
ab1a43e1c6
|
* Change the xuan version.
|
2022-06-30 09:10:00 +08:00 |
|
|
王怡栋
|
f1c9378e10
|
Merge branch 'sprint/devplat_29' into 'master'
* Add fields to integrate workflow and approval.
See merge request easycorp/zentaopms!4224
|
2022-06-29 09:08:21 +00:00 |
|
|
tanghucheng
|
a4966c759b
|
* Fix bug #24552.
|
2022-06-29 16:27:58 +08:00 |
|
|
liugang
|
21ea84f2f5
|
* Add fields to integrate workflow and approval.
|
2022-06-29 16:21:06 +08:00 |
|
|
hufangzhou
|
cb49804253
|
* Add the new version.
|
2022-06-29 13:18:20 +08:00 |
|
|
liumengyi
|
cca9efbb77
|
* Finish task #58561.
|
2022-06-28 10:33:05 +08:00 |
|
|
tanghucheng
|
6226497d08
|
* Code for install max.
|
2022-06-23 16:51:30 +08:00 |
|
|
孙广明
|
33dd17eb8a
|
Merge branch 'sprint/207_mayue_bug#23765' into 'master'
Sprint/207 mayue bug#23765
See merge request easycorp/zentaopms!4094
|
2022-06-23 05:30:16 +00:00 |
|
|
王怡栋
|
748f1ffedf
|
Merge branch 'master' into 'sgm_prjadmin'
# Conflicts:
# db/update17.1.sql
|
2022-06-23 05:00:48 +00:00 |
|
|
孙广明
|
65a162536a
|
* Fix details.
|
2022-06-23 11:27:55 +08:00 |
|
|
王怡栋
|
77d1ab4daf
|
Merge branch 'master' into 'sprint/206_liumengyi_58288'
# Conflicts:
# db/update17.1.sql
|
2022-06-23 01:46:35 +00:00 |
|
|
孙广明
|
a58607bbaa
|
* Code for task #58217.
|
2022-06-22 18:25:02 +08:00 |
|
|
mayue
|
6c975adff8
|
* Add some code.
|
2022-06-22 17:21:55 +08:00 |
|
|
tianshujie
|
a2e0cc5cb3
|
* Finish task #58290.
|
2022-06-22 16:51:28 +08:00 |
|
|
王怡栋
|
03c76b1565
|
Merge branch 'master' into 'sprint/206'
# Conflicts:
# db/update17.1.sql
|
2022-06-22 07:26:11 +00:00 |
|
|
wangyidong
|
f0ff649fa5
|
* add zentaomax sql to zentao.sql.
|
2022-06-22 08:33:43 +08:00 |
|
|
tianshujie
|
d3408b9212
|
* Finish task #57894.
|
2022-06-21 13:52:27 +08:00 |
|
|
tianshujie
|
30bff5f852
|
* Finish task #57894.
|
2022-06-21 11:15:16 +08:00 |
|
|
tianshujie
|
a6b47e84a9
|
* Finish task #57098.
|
2022-06-14 09:55:56 +08:00 |
|
|
孙广明
|
212fb344c3
|
* Finish task #56545.
|
2022-06-10 09:44:48 +08:00 |
|
|
孙广明
|
9d477cc0cf
|
Merge branch 'master' into 'liyuchun_56551'
# Conflicts:
# db/update17.0.sql
|
2022-06-09 01:30:08 +00:00 |
|
|
liyuchun
|
d4d24b6e9d
|
* Code for task #56551.
|
2022-06-09 01:24:38 +00:00 |
|
|
孙广明
|
91199908ce
|
* Code for task #56547.
|
2022-06-09 08:57:56 +08:00 |
|
|
lanzongjun
|
89bf907dff
|
* finish bug #23282
|
2022-06-06 14:16:38 +08:00 |
|
|
hufangzhou
|
44f99c26a5
|
* Modify the xuan upgrade sql.
|
2022-05-31 15:18:57 +08:00 |
|
|
李玉春
|
b41cdeb6f4
|
Merge branch 'sprint/194_tianshujie_55257' into 'master'
Sprint/194 tianshujie 55257
See merge request easycorp/zentaopms!3594
|
2022-05-25 08:08:26 +00:00 |
|
|
tianshujie
|
e3d1c44eae
|
* Finish task #55257.
|
2022-05-25 13:45:10 +08:00 |
|
|
李玉春
|
b5ad70bcb7
|
Merge branch 'master' into 'sgm_sprint195'
# Conflicts:
# db/update17.0.beta1.sql
|
2022-05-24 06:58:00 +00:00 |
|