Commit Graph
100 Commits
Author SHA1 Message Date
hufangzhou 66f38dd976 * Adjust the xuan tag. 2022-12-19 03:18:27 +00:00
胡方舟 d051fbabf7 Merge branch 'bugfix/liwenrui/upgradelang' into 'master'
* add upgrade lang for xuan.

See merge request easycorp/zentaopms!6590
2022-12-19 03:13:44 +00:00
胡方舟 9ff12a3a07 Merge branch 'fix_local_upgrade' into 'master'
- Remove useless code for local upgrade.

See merge request easycorp/zentaopms!6589
2022-12-19 02:56:25 +00:00
胡方舟 ed83ba0142 Merge branch 'bugfix/liwenrui/zentaoxxmake' into 'master'
* fix makefile for zentaoxx.

See merge request easycorp/zentaopms!6587
2022-12-19 01:54:03 +00:00
hufangzhou 73207bedbb * Remove the bi's info from the version. 2022-12-16 06:04:42 +00:00
hufangzhou 5b13b13d43 * Adjust the xuanxuan commit. 2022-12-15 08:21:11 +00:00
hufangzhou 6cef691b39 * Add the new version. 2022-12-14 05:28:51 +00:00
hufangzhou e248cd064b * Handle feedback #1723. 2022-12-14 00:45:03 +00:00
hufangzhou 68108737e6 * Fix bug for helper class not found. 2022-12-13 02:18:30 +00:00
hufangzhou 6f9d1f9fdb * Handle feedback #1707. 2022-12-09 06:37:38 +00:00
hufangzhou 871eb1c0a3 * Fix bug #30500. 2022-12-06 09:20:32 +00:00
hufangzhou 70cc4cda66 * Handle feedback #1666. 2022-12-06 08:30:30 +00:00
hufangzhou 15d3437046 * Handle ticket #144. 2022-12-06 06:53:34 +00:00
hufangzhou d839f6f593 * Handle feedback #1479. 2022-11-28 05:10:00 +00:00
胡方舟 13448090a3 Merge branch 'zentaopms_263_wangyuting' into 'master'
* Fix bug.

See merge request easycorp/zentaopms!6388
2022-11-25 09:52:30 +00:00
hufangzhou 4b9bc5727b * Adjust the changelog. 2022-11-23 07:45:11 +00:00
hufangzhou 16df34b4ae * Adjust the standard sql. 2022-11-21 00:40:29 +00:00
hufangzhou a344340f1c * Remove the unwanted xuan sql. 2022-11-17 06:11:54 +00:00
hufangzhou 825a67ca8f * Adjust xuanxuan commit. 2022-11-17 06:06:11 +00:00
hufangzhou 3dae19302b * Add the new version. 2022-11-16 06:34:29 +00:00
hufangzhou 23dd1b4384 * Fix bug #29279. 2022-11-04 02:11:14 +00:00
hufangzhou 50934a34eb * Change the zentao manual url. 2022-11-03 07:01:02 +00:00
hufangzhou d095daee76 * Add the sql in confirm page. 2022-11-02 08:33:05 +00:00
hufangzhou b08746ca3c * Fix an error. 2022-11-02 08:06:59 +00:00
hufangzhou d09093f42b * Add the new version. 2022-11-02 06:24:20 +00:00
hufangzhou 402d4a6333 * Handle feedback #1304. 2022-10-31 07:31:00 +00:00
胡方舟 91f8a7dd05 Merge branch 'bugfix/liwenrui/chatavatar' into 'master'
* escape `&` in sed script.

See merge request easycorp/zentaopms!5866
2022-10-25 01:25:00 +00:00
胡方舟 de739ea1ac Merge branch 'bugfix/liwenrui/chatavatar' into 'master'
* fix sed for target zentaoxx.

See merge request easycorp/zentaopms!5865
2022-10-24 05:33:20 +00:00
胡方舟 d4541ebf3d Merge branch 'bugfix/liwenrui/chatavatar' into 'master'
* fix chat avatar failing to upload.

See merge request easycorp/zentaopms!5862
2022-10-24 02:33:37 +00:00
hufangzhou e8879c8ad7 * Fix bug #28718. 2022-10-20 05:33:25 +00:00
hufangzhou ee0a444bde * Adjust the type of fields. 2022-10-19 06:48:45 +00:00
hufangzhou 10c07b964f * Added empty row for alignment. 2022-10-19 06:06:26 +00:00
hufangzhou d3f7df5518 * Add the new version. 2022-10-19 05:41:40 +00:00
hufangzhou 90e28b35c2 * Fix bug #28266. 2022-10-08 01:24:57 +00:00
hufangzhou fa00ebf9f5 * Fix bug #28265. 2022-10-08 01:05:13 +00:00
hufangzhou 098ad81cd5 * Handle feedback #130. 2022-09-30 15:11:57 +08:00
胡方舟 0681bde87c Merge branch 'sprint/wangzemei/fix_kanban' into 'master'
* fix xuanxuan css

See merge request easycorp/zentaopms!5587
2022-09-28 03:30:00 +00:00
胡方舟 6ed8540d28 Merge branch 'sprint/wzm/fixkanban' into 'master'
* fix select class bug about xuanxuan

See merge request easycorp/zentaopms!5584
2022-09-28 03:23:46 +00:00
胡方舟 19175806f5 Merge branch 'sprint/wangzemei/241_fix' into 'master'
* fix bug #28047 # 28065

See merge request easycorp/zentaopms!5579
2022-09-28 00:55:03 +00:00
胡方舟 6fd2b704dc Merge branch 'cyy_bug' into 'master'
* Fix bug #28030.

See merge request easycorp/zentaopms!5573
2022-09-27 08:05:30 +00:00
胡方舟 376197313f Merge branch 'sprint/tianshujie_fixbug' into 'master'
* Modify navigation default font color.

See merge request easycorp/zentaopms!5570
2022-09-27 07:18:58 +00:00
hufangzhou 682425df5e * Fix bug #28003. 2022-09-27 15:17:41 +08:00
胡方舟 a95042508e Merge branch 'sprint/tianshujie_fixbug' into 'master'
Sprint/tianshujie fixbug

See merge request easycorp/zentaopms!5564
2022-09-27 05:51:26 +00:00
hufangzhou 7bf00beebb * Add the fixed bugs to changelog. 2022-09-27 11:15:38 +08:00
hufangzhou 6c971a35c8 * Adjust the code. 2022-09-27 08:50:09 +08:00
hufangzhou 7a3e44d499 * Handle feedback #963. 2022-09-26 10:22:39 +08:00
hufangzhou e9408ae4ae * Fix the bug which autofill the title for creating doc. 2022-09-26 08:49:17 +08:00
hufangzhou 952f0395c9 * Add the new version 2022-09-23 16:33:40 +08:00
胡方舟 8aac1004fa Merge branch 'sprint/wangzemei/70008' into 'master'
* rebuild zui

See merge request easycorp/zentaopms!5510
2022-09-23 03:34:05 +00:00
胡方舟 55434f884f Merge branch 'sprint/241_tianshujie_70008' into 'master'
Sprint/241 tianshujie 70008

See merge request easycorp/zentaopms!5501
2022-09-23 02:33:49 +00:00
hufangzhou 0fdb6ddcf8 * Format the code. 2022-09-23 09:21:30 +08:00
hufangzhou 2b85f8cd1a * Use the php to operate cookie for safe. 2022-09-22 09:41:53 +08:00
hufangzhou 13bc51eb8c * Compatible with Zen Tao's table structure. 2022-09-22 08:39:12 +08:00
hufangzhou 0dad4d834f * Handle feedback #863. 2022-09-21 09:46:38 +08:00
hufangzhou d64d98cb16 * Fixed an issue where submodules could not be obtained. 2022-09-20 13:40:13 +08:00
胡方舟 a5b3f9ba64 Merge branch 'sprint/tianshujie_bug' into 'master'
* Fix the problem that Kanban cannot be loaded.

See merge request easycorp/zentaopms!5319
2022-09-14 05:02:31 +00:00
hufangzhou 8fef2d9166 * Remove the unsed code. 2022-09-08 16:12:27 +08:00
hufangzhou e828862deb * Fix error for xuan. 2022-09-08 16:04:41 +08:00
hufangzhou 55ce88445b * Add the new version. 2022-09-08 15:17:06 +08:00
hufangzhou c0c86877cb Merge branch 'sprint/hufangzhou_25840' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/hufangzhou_25840 2022-09-02 13:49:13 +08:00
hufangzhou c77fde0166 * Code for bug #25840. 2022-09-02 13:48:50 +08:00
hufangzhou 3fe5830e76 * Code for bug #25832. 2022-09-02 13:47:27 +08:00
hufangzhou 159fcd07e7 * Fix bug #25840. 2022-09-02 13:37:05 +08:00
hufangzhou c64c9bbf3e * Fix bug #26131. 2022-09-02 09:32:41 +08:00
hufangzhou def6b278e9 * Fix bug #26458. 2022-09-01 10:50:45 +08:00
hufangzhou a83076d330 * Fix bug #26457. 2022-09-01 09:47:13 +08:00
hufangzhou aa7fec1a32 * Fix bug #25898. 2022-08-31 17:08:38 +08:00
hufangzhou 9d14b9440c * Fix bug 26631. 2022-08-31 14:09:01 +08:00
hufangzhou abd43d06af * Fix bug #26544. 2022-08-31 13:23:12 +08:00
hufangzhou 61f6b1609f * Fix bug #26586. 2022-08-31 11:14:08 +08:00
hufangzhou a8669f9404 * Fix bug #27046. 2022-08-30 14:06:09 +08:00
hufangzhou 92e0ec8eae * Fix bug #26420. 2022-08-29 09:32:23 +08:00
hufangzhou 5983b027ad * Update the changelog. 2022-08-26 14:03:38 +08:00
hufangzhou 6a77010b1d * Modify the max version. 2022-08-26 10:12:58 +08:00
hufangzhou fa9ea8cdca * Calculate height in html format. 2022-08-25 11:16:44 +08:00
hufangzhou 90c9cdc9fa * Add php 8.1 for package. 2022-08-25 10:34:32 +08:00
hufangzhou e55c40278d * Add the new version. 2022-08-25 09:31:18 +08:00
胡方舟 60c557a802 Merge branch 'sprint/231_liumengyi_bug' into 'master'
* Code for unit test of bug.

See merge request easycorp/zentaopms!5090
2022-08-24 07:12:20 +00:00
胡方舟 2f2fc272e6 Merge branch 'sprint/231_tianshujie_case' into 'master'
Sprint/231 tianshujie case

See merge request easycorp/zentaopms!5091
2022-08-24 07:11:24 +00:00
hufangzhou 243f2f468a * Modify the create and edit unit test case of execution module. 2022-08-24 11:30:59 +08:00
hufangzhou 33324f758f * Fix bug #26743. 2022-08-22 16:32:48 +08:00
hufangzhou c34766a68d * Fix bug #26743. And modify the unit case of batch edit under the execution module. 2022-08-22 16:09:39 +08:00
hufangzhou 9a5c9299b3 * Add the ignored object type config for plugin. 2022-08-19 11:16:04 +08:00
胡方舟 2027a69923 Merge branch 'sprint/228' into 'master'
Sprint/228

See merge request easycorp/zentaopms!5015
2022-08-18 07:53:30 +00:00
hufangzhou 6a6b04db11 * Fix bug #26548. 2022-08-16 15:16:19 +08:00
hufangzhou ed4dec3540 * Fix bug #26445. 2022-08-15 15:32:13 +08:00
hufangzhou 81c1e5b6e7 * Add the BI sql to standard sql. 2022-08-15 13:24:04 +08:00
hufangzhou f98716d88f * Add the xuan update sql to zentao.sql. 2022-08-15 10:53:56 +08:00
hufangzhou b1aa1f2ea6 * Add the xxc to changelog. 2022-08-12 17:00:53 +08:00
hufangzhou f28a05f25b * Add the xuanxuan update sql to standard sql. 2022-08-12 16:40:51 +08:00
hufangzhou c7f587ef5a * Fix bug #26359. Optimize detail styles for creating documents. 2022-08-12 15:05:00 +08:00
hufangzhou 3fb7a8b070 * Modify the changelog. 2022-08-11 18:59:08 +08:00
hufangzhou 9e80429e03 * Modify the lang item. 2022-08-11 11:34:02 +08:00
胡方舟 f2365a4937 Merge branch 'sprint/tianshujie' into 'master'
* Initializes the module control.

See merge request easycorp/zentaopms!4919
2022-08-11 03:07:20 +00:00
hufangzhou e97a5a7361 * Add the new version. 2022-08-11 10:55:29 +08:00
胡方舟 3509dfa1fa Merge branch 'spirnt/224_tianshujie_bug' into 'master'
Spirnt/224 tianshujie bug

See merge request easycorp/zentaopms!4912
2022-08-11 01:39:52 +00:00
hufangzhou 96506b7125 * Adjust spacing in whitelist. 2022-08-08 16:34:47 +08:00
hufangzhou b44ed94231 * Finish task #62965. Fix bug #26130, #26129, #26120. 2022-08-08 16:31:20 +08:00
hufangzhou 5280ed4fc6 * Remove the unused code. 2022-08-08 11:02:06 +08:00
hufangzhou f8b34bc690 * Remove the unused code. 2022-08-08 10:56:49 +08:00