Commit Graph
238 Commits
Author SHA1 Message Date
zhouxin 64368f82a0 * Batch replace "else if" sequence to "elseif". 2023-05-30 11:22:17 +08:00
zhouxin 97a50f40c6 * Add setQuery method for search. 2023-05-18 02:59:32 +00:00
hufangzhou dc8fcc9484 * Merge 18.4 into master. 2023-05-05 09:26:04 +08:00
wangyidong 88fa8fc839 * fix bug #34750. 2023-04-24 18:56:38 +08:00
Hao Sun 2bcc9bdbf4 Merge branch 'zin_dev'
# Conflicts:
#	module/common/lang/zh-cn.php
#	module/product/lang/de.php
#	module/product/lang/en.php
#	module/product/lang/fr.php
#	module/product/lang/zh-cn.php
#	module/program/js/browse.js
#	module/program/lang/de.php
#	module/program/lang/en.php
#	module/program/lang/fr.php
#	module/program/lang/zh-cn.php
#	module/project/config.php
#	module/project/lang/de.php
#	module/project/lang/en.php
#	module/project/lang/fr.php
#	module/project/lang/zh-cn.php
#	module/search/view/buildform.html.php
#	module/task/control.php
2023-04-23 19:20:45 +08:00
陈涛 02ccffb473 * zin: render searchform with ModalDialog 2023-04-18 09:10:22 +08:00
陈涛 37815be1db * zin: implements function to build search form options. 2023-04-17 15:48:07 +08:00
朱金勇 93acd3cc77 * Fix bug#34233. 2023-04-17 07:43:55 +00:00
zhaoke d401a87812 Merge branch 'master' into zenops_69 2023-04-13 09:09:49 +08:00
朱金勇 22f9f1d087 Merge branch 'db' 2023-04-05 14:30:11 +00:00
朱金勇 7f9d638d28 * Fix sql for dmdb. 2023-04-05 14:18:24 +00:00
zhaoke 8522e6fb58 * Add scene control and view file to testcase module. 2023-03-29 16:26:59 +08:00
mayue fc83e59848 * Fix feedback #2393. 2023-03-06 08:28:50 +00:00
hufangzhou f3cd2e7d4d * Change the Easy Soft to ZenTao Software. 2023-02-15 17:01:22 +08:00
xieqiyu d1d82a03fc * Fix bug#31366. 2023-02-01 09:43:57 +08:00
xieqiyu 99ee8a6b3f * Fix bug of search. 2023-01-04 14:28:47 +08:00
tianshujie 9fff89f9ef * Add popover to save search criteria. 2023-01-04 11:04:21 +08:00
tianshujie 15b9176f8d Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zin 2023-01-03 16:52:49 +08:00
xieqiyu 05f2d7665b * Finish task#81193. 2022-12-27 20:22:32 +08:00
xieqiyu e5e8ecaa68 * Code for task#80490. 2022-12-19 16:05:17 +08:00
tianshujie 6db009dc8b * Modify the field name of the search structure. 2022-11-16 10:08:49 +08:00
tianshujie be5665504d * Add search lang for build form page. 2022-11-15 17:12:26 +08:00
tianshujie 08e8bfea06 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zin 2022-11-15 17:07:27 +08:00
tianshujie 614a518edd * Add search functon for program list. 2022-11-15 17:07:06 +08:00
lanzongjun e37ee336f3 * finish task #75908 2022-11-15 09:06:17 +08:00
tianshujie bd96bce2f1 * Search form of program list. 2022-11-11 17:20:05 +08:00
tianshujie 2e763aff21 * Add search of program list. 2022-11-11 16:29:50 +08:00
liugang ce1458946e * Fix bug of generate the view link of user story in search-index page. 2022-11-09 15:49:01 +08:00
daitingting cb90a2e25b * Finish task #74176. 2022-11-02 06:30:01 +00:00
wangyidong 148d3d6d6b Merge branch 'master' into zentaopms_239 2022-10-27 11:39:47 +08:00
wangyuting2 aa9bc2b8ec * Fix systemMode bug. 2022-10-10 07:32:11 +00:00
zenggang 88460b30ba * Code for feedback#958 2022-09-30 06:41:27 +00:00
daitingting f7d564e837 * Finish task #70200. 2022-09-26 09:38:11 +00:00
wangyidong 653118b916 * fix bug #27783. 2022-09-22 14:32:57 +08:00
曾刚 3172961404 Sprint/228 zg tasks and units 2022-08-18 07:15:14 +00:00
wangyidong 1e5558d383 * adjust for search. 2022-08-15 11:06:34 +08:00
曾刚 de80b35803 * Fix bug#26389,26333,26328 2022-08-12 08:17:54 +00:00
zenggang 6600b76ad9 * Fix bug #26307 2022-08-11 07:01:08 +00:00
zenggang 858b383916 * Adjust code 2022-08-10 05:58:04 +00:00
zenggang dcacaa5cea * Adjust code 2022-08-10 03:09:50 +00:00
zenggang 20f40c7b85 * Finish task#63690,63693 2022-08-09 08:44:37 +00:00
王怡栋 0f9f37e882 Merge branch 'sprint/devplat_30' into 'master'
* Set the value is empty if the value is not setted.

See merge request easycorp/zentaopms!4786
2022-08-04 03:26:55 +00:00
daitingting c5036c1b55 * Set the value is empty if the value is not setted. 2022-08-04 03:22:07 +00:00
wangyidong f5b6edef01 Merge branch 'sprint/devplat_30' 2022-08-04 09:13:53 +08:00
wangyuting2 4b65421dbe * Fix lang is not defind bug. 2022-08-03 13:47:05 +08:00
daitingting 8619b4c5a9 * Fix bug #25922. 2022-08-03 01:53:35 +00:00
wangyidong 99c5aab19a * code for task #62739. 2022-08-02 16:18:38 +08:00
wangyidong 16663dee7f * fix bug #24818. 2022-07-06 17:17:28 +08:00
lanzongjun d6a387935f * fix bug #24813 2022-07-06 14:44:36 +08:00
wangyidong 18c2a6e80e * code for bug #24758. 2022-07-05 16:57:34 +08:00