75 Commits

Include renames

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
wangyuting2	aa9bc2b8ec	* Fix systemMode bug.	2022-10-10 07:32:11 +00:00
王怡栋	e8654f20a9	Merge branch 'master' into 'sprint/zentaomax42' ... # Conflicts: # db/update17.5.sql	2022-08-19 02:34:50 +00: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
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
liumengyi	424653ac7f	* Fix bug #24896.	2022-07-13 11:23:50 +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
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	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
tianshujie	f328086daf	* Fix bug #22490.	2022-05-16 13:43:08 +08: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
daitingting	e30acad1f2	* Add id for checking unique field.	2022-05-09 07:56:17 +00:00
daitingting	96e460c47d	* Finish task #53549.	2022-05-09 06:41:35 +00:00
caoyanyi	a6a56ea4fe	* Fix bug #17175.	2022-04-08 09:18:27 +08:00
tianshujie	9071214c7f	* Fix bug #19834.	2022-02-28 11:23:52 +08:00
zhujinyong	b17c3c8206	* Move die to return print.	2022-02-22 08:42:32 +08:00
zhujinyong	37b486ad1c	* Replace htmlspecialchars to htmlSpecialString for compatibility.	2021-11-10 14:57:48 +08:00
王怡栋	89f498454f	* finish task #41769.	2021-08-26 11:20:44 +08:00
wangyidong	509afaa6f7	* adjust upgrade.	2021-08-06 18:12:18 +08:00
wangyidong	92ea15541f	* finish task #40299.	2021-07-16 13:03:55 +08:00
wangyidong	3034d24f2c	* adjust for task #40020.	2021-07-12 10:09:39 +08:00
tianshujie98	16b137a9a0	* Add method of caselib module.	2021-06-24 09:07:48 +08:00
wangyidong	57e1291823	* fix bug #12452.	2021-04-29 12:10:34 +08:00
tianshujie98	44385524fa	* Fix bug #12452.	2021-04-29 10:50:26 +08:00
tianshujie98	65f9d1cb1c	* Fix bug #12402.	2021-04-27 10:39:35 +08:00
leiyong	ac932f0ad6	* Adjust caselib module.	2021-04-01 09:24:03 +03:00
Yagami	822a06ae56	* Finish task #36892.	2021-03-23 10:12:33 +08:00
zhujinyong	82428349ad	* Rename session->PRJ to session->project.	2021-03-22 12:03:10 +08:00
zhujinyong	a6eff425ca	* Adjust menu logic.	2021-03-21 12:15:55 +08:00
Catouse	70ae2251b0	* task #36769, change UI of buttons in header.	2021-03-17 10:53:40 +08:00
holan20180123	79d200f692	* Finish task #36447.	2021-03-12 10:41:27 +08:00
leiyong	2316458960	* Adjust menu.	2021-03-11 14:50:38 +08:00
Yagami	d1e6e9265b	* Rename project session to PRJ.	2021-03-09 15:29:06 +08:00
hufangzhou	71054f44be	* Adjust the caselib module.	2021-03-04 13:25:09 +08:00
hufangzhou	6b3cb64cc9	* Adjust the code.	2021-03-02 10:24:10 +08:00
holan20180123	7498a17df7	* Finish task #36082.	2021-02-25 16:54:00 +08:00
hufangzhou	007296bd38	* Adjust the code.	2021-02-25 14:57:26 +08:00
Yagami	5c5bdc213e	* Adjust code style.	2021-02-24 15:02:43 +08:00
hufangzhou	e2f6d864f9	* Add the plus icon for create caselib.	2021-02-24 13:31:52 +08:00