Commit Graph
382 Commits
Author SHA1 Message Date
tianshujie 91f8db484c * Fix bug #15511. 2021-10-14 15:09:20 +08:00
hufangzhou bf78fe9be4 * Add the 15.6 version and upgrade. 2021-10-12 09:35:39 +08:00
王怡栋 96a8ef6b04 Merge branch '15.5' into 165 2021-10-09 10:06:05 +08:00
tianshujie 07bbef9251 * Modify language item. 2021-10-08 13:58:22 +08:00
朱金勇 98f93d563d Merge branch 'spirnt/165_tianshujie_42867' into 'sprint/165'
* Finish task #42867.

See merge request easycorp/zentaopms!28
2021-09-28 07:42:48 +00:00
tianshujie 353bef2e83 * Finish task #42867. 2021-09-28 15:38:34 +08:00
tianshujie 4f977efaeb * Finish task #42854. 2021-09-28 13:14:32 +08:00
tianshujie c5e340855d * Finish task #42867. 2021-09-27 15:12:59 +08:00
tianshujie 5e0068701e * Finish task #42867. 2021-09-27 13:55:09 +08:00
zenggang ed613b4377 * Fix bug#15202 2021-09-17 14:59:25 +08:00
liyuchun 48254bab16 * Code for task #41764. 2021-09-14 15:02:34 +08:00
tianshujie 00a0484612 * Fix bug #14814. 2021-09-08 11:09:05 +08:00
Hao Sun 30fcb005cf * bug #14857, improve table layout of page company/browse for tutorial mode. 2021-09-07 17:13:04 +08:00
Hao Sun e99fb59620 * fix tutorial mode not work as expected sometimes. 2021-09-01 10:31:45 +08:00
zhujinyong 664e290f97 * Rename openApp to tab. 2021-08-31 00:30:48 +08:00
liyuchun 7eb5c6142c * Code for task #41764. 2021-08-27 16:40:43 +08:00
tianshujie98 6fdb4fd97f * Finish task #41721. 2021-08-23 14:39:58 +08:00
王怡栋 8a484a5431 * finish task #41541. 2021-08-20 14:04:10 +08:00
王怡栋 d0632b8ff3 * adjust show action. 2021-08-10 14:06:35 +08:00
wangyidong f11a030bfc * adjust for company dynamic. 2021-07-19 16:47:56 +08:00
tianshujie98 49d1c35356 * Adjust code. 2021-06-29 16:44:54 +08:00
tianshujie98 facb35a4e5 * Adjust code. 2021-06-29 09:23:37 +08:00
tianshujie98 626f7346fa * Adjust code. 2021-06-28 13:03:16 +08:00
tianshujie98 420a526d54 * Adjust code. 2021-06-16 14:08:34 +08:00
tianshujie98 7ac9d6450d * Record return session. 2021-05-28 11:30:57 +08:00
tianshujie98 bcc1dc1484 * Fix dynamic issue. 2021-05-28 08:57:38 +08:00
wangyidong b386033870 * fix bug #12142. 2021-04-16 10:22:27 +08:00
leiyong e97e88f0c5 * Adjust language items. 2021-04-01 12:52:15 +03:00
holan20180123 0bea1eb1c4 * Adjust session. 2021-03-25 09:46:17 +08:00
zhujinyong 2d68f7dd45 * Fix dynamic bug. 2021-03-24 18:06:47 +08:00
zhujinyong 4c237e2601 * Fix dynamic logic. 2021-03-24 14:51:28 +08:00
Yagami 7f7bfa5578 * Drop no menu module. 2021-03-22 16:21:48 +08:00
zhujinyong a6eff425ca * Adjust menu logic. 2021-03-21 12:15:55 +08:00
Yagami 39ae71ddcb * Remove all menugroup. 2021-03-17 13:56:42 +08:00
Yagami 20cf8a0c8d * Fix menu group. 2021-03-11 17:02:56 +08:00
Yagami d0016bab64 * Finish task #36465. 2021-03-11 11:30:10 +08:00
zhujinyong f54307a4cc * Fix code style. 2021-03-10 23:07:20 +08:00
hufangzhou 98417780b3 * Adjust the company module. 2021-03-04 15:57:23 +08:00
holan20180123 80b1c44d4a Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms 2021-02-19 15:24:07 +08:00
holan20180123 1e7beb09af * Finish task #36018. 2021-02-19 15:23:32 +08:00
wangyidong 6bf40e474d Merge branch '12.x' 2021-02-19 13:17:23 +08:00
holan20180123 e48c66c1d4 * Finish task #9118. 2021-02-01 10:09:25 +08:00
holan20180123 c26a63e7fb * Finish task #9118. 2021-01-28 14:46:12 +08:00
wangyidong b12d189779 * Merge from github. 2021-01-26 13:35:21 +08:00
tianshujie98 e8975e0fed * Fix the user list sorting problem. 2020-12-22 11:37:14 +08:00
Yagami 66747a8069 * Rename project common to execution common. 2020-12-18 10:04:30 +08:00
tianshujie98 aaf3c65aec * Fix bug. 2020-12-17 10:00:11 +08:00
tianshujie98 4bde79bc36 * Fix bug. 2020-12-17 09:57:07 +08:00
leiyong 47cebcb39b * Fix bug. 2020-12-17 09:14:13 +08:00
wangyidong c771e1947c Merge branch '12.x' 2020-12-11 20:42:10 +08:00