Commit Graph

455 Commits

Author SHA1 Message Date
Yagami
4f37bb55b3 * Fix code error. 2021-04-02 11:29:26 +08:00
Yagami
dd82d7f284 * Fix code detail. 2021-04-02 11:18:19 +08:00
holan20180123
5f888f7b3f * Delete unused code. 2021-04-02 09:15:01 +08:00
wangyidong
aa3085e485 * adjust for repo. 2021-04-01 17:52:38 +08:00
wangyidong
fd65b4ac28 * fix bug #11115 2021-04-01 14:52:02 +08:00
zhujinyong
b201a2137b Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-01 07:53:15 +08:00
zhujinyong
3a03f8b613 * Fix menu switch. 2021-04-01 07:52:56 +08:00
holan20180123
e17648144b Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-03-31 17:15:51 +08:00
holan20180123
4c73b6a489 * Adjust hour unit. 2021-03-31 17:15:33 +08:00
Yagami
32ce91bdde * Comment unused code. 2021-03-31 17:02:10 +08:00
wangyidong
5dd5f12b1f * fix bug #11115. 2021-03-31 16:49:34 +08:00
zhujinyong
d966b2e214 * Ajdust openApp logic. 2021-03-31 16:07:11 +08:00
holan20180123
ea9cc9cb2f * Finish task #37099. 2021-03-31 13:22:46 +08:00
tianshujie98
53ef76a7c7 * Fix an error. 2021-03-30 16:41:15 +08:00
tianshujie98
5f646301eb * Fix bug #11046. 2021-03-30 16:24:35 +08:00
zhujinyong
3146fb6b3e - Remove function 'get_magic_quotes_gpc'. 2021-03-23 08:56:15 +08:00
zhujinyong
6582a700bb * Fix story of project. 2021-03-21 16:11:07 +08:00
zhujinyong
a6eff425ca * Adjust menu logic. 2021-03-21 12:15:55 +08:00
Yagami
2f5eb04e08 * Merge code. 2021-03-19 15:14:14 +08:00
Yagami
7f52574a2f * Code for app session. 2021-03-19 09:31:44 +08:00
leiyong
9ed9d2a7c2 * Adjust code. 2021-03-19 09:05:03 +08:00
Yagami
7fa5a2dab0 * Fix session app. 2021-03-18 16:37:01 +08:00
qiyu-xie
188910f08e * Add project select when creating an execution. 2021-03-18 09:53:19 +08:00
leiyong
584546c34c * Adjust code. 2021-03-17 15:47:15 +08:00
leiyong
e279dff340 * Finish task#36767. 2021-03-17 15:24:33 +08:00
qiyu-xie
782f967ab1 * Fix bug. 2021-03-17 14:31:42 +08:00
zhujinyong
cbd3bde278 Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-03-17 14:13:42 +08:00
zhujinyong
691e9392f0 - Remove PRJ param in url. 2021-03-17 14:13:22 +08:00
Catouse
eef29b4ef0 * fix error on request mode=getconfig when visit at first time. 2021-03-17 14:08:12 +08:00
leiyong
84689f67e3 * Finish task#36452. 2021-03-10 11:43:05 +08:00
Yagami
4341a64282 * Fix framework. 2021-03-09 15:31:22 +08:00
Yagami
d1e6e9265b * Rename project session to PRJ. 2021-03-09 15:29:06 +08:00
Yagami
84622c3231 * Fix project details. 2021-03-09 14:07:45 +08:00
Yagami
0f1492cad9 * Fix bug and execution menu. 2021-03-09 10:05:34 +08:00
holan20180123
4caf65064c * Fix product,project error. 2021-03-08 15:47:09 +08:00
hufangzhou
1ba4d3574b * Adjust the link. 2021-03-08 10:26:20 +08:00
Catouse
64fee8e9b1 * refactor: rename "tab" to "app", "group" to "appCode", "$openGroup" to "$openApp", "tabs" to "apps", "#open=" to "#app=". 2021-03-04 14:48:45 +08:00
holan20180123
dbc0a6c9bb * Code for task #36060. 2021-03-03 09:05:46 +08:00
Yagami
294058ddcd * Finish task #36358 and rename mode. 2021-03-02 10:13:51 +08:00
hufangzhou
2098ef0e2d * Fix an error. 2021-03-02 10:08:11 +08:00
vimrus
1c3975beb8 * Add $app->openGroup to highlight left menu. 2021-03-02 09:25:09 +08:00
Yagami
50e496f6d9 * Fix program status logic. 2021-02-26 09:46:17 +08:00
holan20180123
3ca1f79fd2 * Code for task #36042. 2021-02-23 15:33:23 +08:00
Yagami
f6c0564234 * Code for task #36042. 2021-02-23 13:59:53 +08:00
wangyidong
6bf40e474d Merge branch '12.x' 2021-02-19 13:17:23 +08:00
wangyidong
c7aa400995 * fix bug for check decrypted password. 2021-02-19 10:19:47 +08:00
Yagami
f44f079b91 * Add default preference. 2021-01-28 10:38:40 +08:00
wangyidong
b12d189779 * Merge from github. 2021-01-26 13:35:21 +08:00
holan20180123
c567300e9e Merge branch 'master' of https://git.zcorp.cc/zentaopms 2021-01-19 15:39:02 +08:00
holan20180123
ce82f05142 * Finish task #9002. 2021-01-19 15:38:55 +08:00