Commit Graph
69 Commits
Author SHA1 Message Date
liushasha 99e3faa665 * Resolve ticket #484. 2023-03-27 08:32:44 +00:00
hufangzhou f3cd2e7d4d * Change the Easy Soft to ZenTao Software. 2023-02-15 17:01:22 +08:00
wangyuting2 d946208950 * Fix bug #28756. 2022-10-21 01:07:38 +00:00
wangyuting2 aa9bc2b8ec * Fix systemMode bug. 2022-10-10 07:32:11 +00:00
liumengyi 26b412ef35 * Fix bug #25688. 2022-07-26 14:23:46 +08:00
王怡栋 284aea9aac Merge branch 'sprint/220_liumengyi_61971' into 'master'
* Finish task #61971,#61972,#61973,#61974,#61975,#61976.

See merge request easycorp/zentaopms!4651
2022-07-26 05:01:29 +00:00
liumengyi 7afb73fabe * Fix bug for task #61976. 2022-07-26 11:19:10 +08:00
tianshujie 21f33a3ee9 * Finish task #61967. 2022-07-25 15:35:47 +08:00
tianshujie 96c71eb326 * Finish task #61967. 2022-07-25 13:36:14 +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
zhujinyong 5a334ccb86 * Fix bug: return error. 2022-02-22 09:26:31 +08:00
liyuchun 6359266cf9 * Adjust logic of update whitelist when update user view. 2021-10-13 16:37:24 +08:00
王怡栋 4eee4d5523 Merge branch '15.4' 2021-09-02 19:21:30 +08:00
zhujinyong 664e290f97 * Rename openApp to tab. 2021-08-31 00:30:48 +08:00
holan20180123 7c08153b7c * Fix bug #14543. 2021-08-23 14:39:23 +08:00
qiyu-xie a760652e04 * Finish task#41559. 2021-08-18 16:36:38 +08:00
holan20180123 487662ad62 * Finish task #41237. 2021-08-11 10:58:03 +08:00
zhujinyong 1677574443 * return before $this->send. 2021-07-16 09:40:41 +08:00
wangyidong ba2c8018d6 * fix for update userview. 2021-07-13 10:24:57 +08:00
wangyidong 4d5bacb823 * adjust for web page. 2021-06-11 16:51:28 +08:00
wangyidong 769e6b433b * merge from 15.0.beta3. 2021-06-05 13:01:53 +08:00
leiyong 4075817079 * Fix bug#11528. 2021-04-01 08:32:26 +03:00
holan20180123 e69671ec32 * Adjust session. 2021-03-24 16:43:54 +08:00
leiyong fe7fce9512 * Adjust code. 2021-03-24 10:29:10 +08:00
Yagami 7f7bfa5578 * Drop no menu module. 2021-03-22 16:21:48 +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
Yagami 08c42cf246 * Fix code. 2021-03-19 10:04:45 +08:00
zhujinyong 691e9392f0 - Remove PRJ param in url. 2021-03-17 14:13:22 +08:00
Yagami 02c3db0e1c * Merge code. 2021-03-17 11:08:43 +08:00
zhujinyong 6c5d084938 - Remove function: getMainAction. 2021-03-17 10:57:37 +08:00
zhujinyong a9015ba45d * Adjust main menu. 2021-03-17 09:35:51 +08:00
Yagami 7d1e377454 * Rename function. 2021-03-12 11:23:55 +08:00
Yagami 51944f67f5 * Code for personal. 2021-03-12 11:10:23 +08:00
Yagami 0b0cdcbda7 * Rename personnel. 2021-03-12 10:57:09 +08:00
Yagami d1e6e9265b * Rename project session to PRJ. 2021-03-09 15:29:06 +08:00
zhujinyong 4dc8157f9a * Adjust code of personnel. 2021-03-05 16:29:10 +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
Yagami 1ad514e0b0 * Divide program/project/execution. 2021-03-04 09:59:05 +08:00
hufangzhou 46df489385 * Finish task #36363. 2021-03-02 09:40:41 +08:00
qiyu-xie 7de8e1fd89 * Finish task#9101. Change whitelist return. 2021-01-25 15:06:15 +08:00
qiyu-xie abcae7f7c3 * Use session when link product return. 2021-01-21 09:22:40 +08:00
qiyu-xie df01cbe76a * Finish task#8970. Change to use session to record URL. 2021-01-20 09:27:43 +08:00
qiyu-xie ed625de092 * Finish task#8970. 2021-01-15 11:21:45 +08:00
qiyu-xie e61df30ace * Modify notes and adjust code style. 2021-01-05 16:04:31 +08:00
Yagami f2a39a0dbc * Add product program project menu group. 2021-01-01 16:03:51 +08:00
hufangzhou abd9b39619 * Finish task#8868, task#8873. 2021-01-01 15:16:34 +08:00
leiyong fef12243f1 * Finish task#8760. 2020-12-30 17:29:32 +08:00
tianshujie98 8f2f51a397 * Adjust code style. 2020-12-29 10:22:50 +08:00