Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
48,794 Commits 2 Branches 292 Tags
c45cc998547597ed4e0d82db33a94de955f85ca4
Commit Graph
192 Commits
Author SHA1 Message Date
wangyidong 9761648d59 Merge branch 'zentaopms_239' 2022-11-08 08:41:28 +08:00
tianshujie 2176378af6 * Fix bug #29339. 2022-11-07 09:11:40 +08:00
wangyidong 148d3d6d6b Merge branch 'master' into zentaopms_239 2022-10-27 11:39:47 +08:00
曹延义 31d80ee859 * Code for story #38739. 2022-10-14 10:33:42 +08:00
wangyuting2 aa9bc2b8ec * Fix systemMode bug. 2022-10-10 07:32:11 +00:00
tianshujie 23f5c939ae * Finish task #68934. 2022-09-21 10:10:14 +08:00
tanghucheng 5cb74fee0b * Fix bug . 2022-08-30 14:50:49 +08:00
王怡栋 e8654f20a9 Merge branch 'master' into 'sprint/zentaomax42' 
# Conflicts:
#   db/update17.5.sql
 2022-08-19 02:34:50 +00:00
王怡栋 bff1d42c2f Merge branch 'sprint/zentaomax42_lanzongjun' into 'sprint/zentaomax42' 
* finish task #64943

See merge request easycorp/zentaopms!4997
 2022-08-18 01:57:13 +00:00
lanzongjun 85188b9d50 * finish task #64943 2022-08-18 09:20:50 +08:00
lanzongjun c28e0748dd * finish task #64943 2022-08-17 16:39:55 +08:00
xieqiyu 6f6491148a * Fix bug#26414. 2022-08-17 15:19:53 +08:00
tanghucheng c816179a08 * Fix bug #26419,26417. 2022-08-15 12:26:44 +08:00
tanghucheng 2eec12eeac * Format code for port. 2022-08-08 12:15:28 +08:00
tanghucheng 3eccc858eb * Format Code for port. 2022-08-08 10:57:31 +08:00
tanghucheng c4510a152a * Code for port. 2022-08-08 09:48:07 +08:00
tanghucheng 3bfdc7d342 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into importExport 2022-08-05 13:07:31 +08:00
tanghucheng 5f4699ceec Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into importExport 2022-08-04 14:10:36 +08:00
wangyuting2 1b2f9f68e6 * Adjust assetlib caselib approval menu. 2022-08-04 13:47:12 +08:00
wangyuting2 39e507111c * Finish task #63379. 2022-08-03 16:04:40 +08:00
wangyuting2 84c6278274 * Finish task #63288. 2022-08-03 13:32:41 +08:00
wangyuting2 fa81472771 * Adjust menu. 2022-08-03 13:32:41 +08:00
wangyuting2 dc14d91320 * Finish task #63286. 2022-08-02 14:54:20 +08:00
tanghucheng 5ee43ad1f8 * rename exporttemplet to exporttemplate. 2022-08-01 16:03:38 +08:00
孙广明 52c9717727 Merge branch 'sprint/tianshujie_fixbug' into 'master' 
Sprint/tianshujie fixbug

See merge request easycorp/zentaopms!4531
 2022-07-14 02:06:13 +00:00
tianshujie 1e0aff765a * Fix bug #25208. 2022-07-14 08:17:00 +08:00
sunjun eb07793262 fixbug_25174 2022-07-13 06:57:48 +00:00
liumengyi 424653ac7f * Fix bug #24896. 2022-07-13 11:23:50 +08:00
lanzongjun 31109d6519 * fix task #60100 2022-07-07 16:36:24 +08:00
lanzongjun 76b79da0c1 * fix bug #23996 2022-06-30 15:20:38 +08:00
lanzongjun f73072e6de * fix bug #23729 2022-06-30 15:07:31 +08:00
tianshujie 7372f7f936 * Finish story #32623. 2022-06-22 08:51:05 +08:00
孙广明 b896377846 * Change zentao license. 2022-06-08 10:02:29 +08:00
孙广明 b528156589 * Change license. 2022-06-08 09:34:46 +08:00
hufangzhou 27ec156f88 * Add the new version. 2022-05-26 09:52:33 +08:00
wangyidong 967d24dd06 Merge branch 'sprint/189_package' 2022-05-24 10:32:09 +08:00
lanzongjun 867152e2bc * fix bug #22570 2022-05-18 13:33:54 +08:00
lanzongjun ece8976470 * fix bug #22570 2022-05-18 13:20:43 +08:00
liumengyi 5bdc188491 * Code format for bug #22585. 2022-05-18 10:12:42 +08:00
liumengyi b4a34e2ed6 * Fix bug #22585. 2022-05-18 10:10:06 +08:00
lanzongjun 10eebbd136 * fix bug #22570 2022-05-17 17:13:17 +08:00
tanghucheng d3dc4ebe43 * Fix bug. 2022-05-17 06:00:26 +00:00
tianshujie f328086daf * Fix bug #22490. 2022-05-16 13:43:08 +08:00
wangyuting2 3380222afc * Fix build action menu bug. 2022-05-11 16:11:34 +08:00
tanghucheng f3f0dd5647 * Code for task #53591. 2022-05-11 03:16:41 +00:00
王怡栋 d9d331c38e Merge branch 'master' into 'sprint/wangyuting_workflow' 
# Conflicts:
#   framework/control.class.php
 2022-05-10 08:46:32 +00:00
wangyuting2 fe3c882c5e * Adjust buildin workflow menu. 2022-05-10 16:32:04 +08:00
daitingting a71cf1d280 Merge branch 'branch/workflow' of https://gitlab.zcorp.cc/easycorp/zentaopms into branch/workflow 2022-05-10 01:44:47 +00:00
daitingting d577d57a33 * Add id for checking unique field. 2022-05-09 17:02:23 +08:00
wangyuting2 a607161591 * Finish task #53549. 2022-05-09 17:00:41 +08:00