Commit Graph
426 Commits
Author SHA1 Message Date
tanghucheng 8272c6cc90 Merge branch '18.x' into ipd1.1 2023-09-27 02:08:48 -04:00
zenggang bf79d3dcaa * Adjust code 2023-09-21 06:43:19 +00:00
zenggang e561f96652 * Adjust code 2023-09-21 02:39:49 +00:00
hufangzhou 88172f6b98 * Move zin's config forward. 2023-09-18 13:06:18 +08:00
Lufei 4130b37304 * Move zin's config forward. 2023-09-18 11:31:30 +08:00
zhaoke 08522225c2 * Remove unused code. 2023-09-11 11:26:09 +08:00
zhaoke bd6a59a523 * Add version prefix of devops version. 2023-09-09 14:15:56 +08:00
zhujinyong 41d7d88f57 * Modify config of slave db. 2023-08-31 13:50:02 +08:00
zhujinyong 1e8616c812 + Add slave dbs and bi db. 2023-08-30 18:06:32 +08:00
sunhao 3cb96f18bb * zin: add zin config to global config file and support to import extra css file. 2023-08-30 17:12:53 +08:00
zenggang 29f2f5187b * Merge 18.x 2023-08-28 10:27:22 +00:00
zenggang fdd027a824 * Merged 18.x 2023-08-28 09:30:26 +00:00
liwenrui dfad86fcd1 * bump version to 18.7, and add ai to module whitelist. 2023-08-16 10:35:54 +08:00
wangyuting cad0053f58 * Optimize user picker on bug batchEdit page. 2023-08-10 14:36:48 +08:00
zenggang d7b4cfbe18 * Fix bugs 2023-08-07 06:53:59 +00:00
zenggang 9ac4f0db31 * Fix bugs. 2023-08-04 08:23:47 +00:00
zenggang b7a75d7b62 * devops setting 2023-07-31 08:02:25 +00:00
tanghucheng d667c4d029 Merge branch '18.x' into zentaoipd 2023-07-31 08:58:26 +08:00
songchenxuan 1dbee52ddb * Fix bug #36654. 2023-07-19 03:33:23 +08:00
tanghucheng 6b0db86d24 Merge branch '18.x' into zentaoipd 2023-07-13 17:26:49 +08:00
hufangzhou acfad4db71 * Add the 18.5 version. 2023-07-05 17:31:27 +08:00
tanghucheng 3741c9b6fa Merge branch '18.x' into zentaoipd 2023-07-03 13:36:29 +08:00
hufangzhou 9d95ee8484 * Add 18.4 version. 2023-06-14 13:21:45 +08:00
Lufei cae4cc315a + Support full page cache. 2023-06-05 16:52:54 +08:00
Lufei 9db5597475 * Add cache for block. 2023-06-02 14:19:58 +08:00
hufangzhou 4e94a792fd * Change version 18.4 to 18.4.beta1. 2023-05-31 17:15:37 +08:00
hufangzhou 1adb13d4cd * Add 18.4 version. 2023-05-31 10:35:16 +08:00
Yagami 1af5aff52b * Add ipd version. 2023-05-04 15:53:01 +08:00
Yagami 1f00f62914 * Change ipd to or. 2023-05-04 15:23:33 +08:00
tanghucheng c8a626480d Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaoipd 2023-04-21 13:49:46 +08:00
hufangzhou e0d28390ab * Add the new version. 2023-04-21 13:35:49 +08:00
孙广明 b674dfe3a8 Merge branch 'master' into zentaoipd 2023-04-04 15:54:44 +08:00
tanghucheng 035a68b78c Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaoipd 2023-04-03 10:37:42 +08:00
daitingting de50c7f922 * Revert version. 2023-04-03 10:25:37 +08:00
daitingting 790df501b0 * Process upgrade. 2023-03-31 13:40:17 +08:00
tanghucheng 3cf4954c2c Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaoipd 2023-03-16 10:19:13 +08:00
hufangzhou 125a4384af * Add the new version. 2023-03-15 02:53:46 +00:00
Yagami fbf3a78452 * Add ipd page. 2023-03-14 10:09:27 +08:00
hufangzhou 42769d3425 * Add the new version. 2023-02-27 06:51:34 +00:00
hufangzhou 025aa5dc4b * Add the new version. 2023-02-08 02:44:44 +00:00
hufangzhou b5859c7dc3 * Add the new version. 2023-01-03 13:56:27 +08:00
王怡栋 4af7ffbfa9 Merge branch 'sprint/konglinmao_optimize_code2' into 'master'
* Optimize code.

See merge request easycorp/zentaopms!6640
2022-12-27 08:48:41 +00:00
孔令茂 610e22f948 * Optimize code. 2022-12-27 08:45:32 +00:00
hufangzhou 3a51b751ef * Add the new Version. 2022-12-27 00:54:30 +00:00
hufangzhou 6cef691b39 * Add the new version. 2022-12-14 05:28:51 +00:00
hufangzhou 3dae19302b * Add the new version. 2022-11-16 06:34:29 +00:00
wangyidong a5b9f374d1 * merge git stash. 2022-11-10 15:50:17 +08:00
孙广明 acf5a57b8f Merge branch 'sprint/254_tianshujie_kanban' into 'master'
Sprint/254 tianshujie kanban

See merge request easycorp/zentaopms!5991
2022-11-02 07:53:05 +00:00
tianshujie f7a1df8da4 * Change the minimum range of kanban columns. 2022-11-02 15:34:02 +08:00
hufangzhou d09093f42b * Add the new version. 2022-11-02 06:24:20 +00:00