Commit Graph

90 Commits

Author SHA1 Message Date
Yagami
b72a7dee43 Merge branch 'master' into 20.x 2020-08-26 16:10:36 +08:00
Yagami
77cf55dd79 * Fix system menu header. 2020-08-26 09:23:01 +08:00
z
a76b09bef2 * adjust code for flow. 2020-07-13 16:21:10 +08:00
leiyong
d2a7566f3f * Finish cmmi task#869. 2020-07-01 18:51:09 -07:00
leiyong
91ecc5764b * Finish cmmi task#869. 2020-06-18 19:16:47 -07:00
sgm0422
23a2df6a50 * Fix vars. 2020-05-21 09:31:25 +08:00
sgm0422
005eca6d81 * Hide some menu. 2020-05-19 19:13:14 +08:00
sgm0422
7cd2453f35 * Add program swapper. 2020-05-19 10:39:39 +08:00
sgm0422
5dc4fbcec8 * Fix menu and program. 2020-05-18 16:46:40 +08:00
sgm0422
7478fb8c30 * Fix details. 2020-05-18 13:54:00 +08:00
Catouse
3a7d84aa55 * remove menuHeader element. 2020-05-18 10:16:42 +08:00
Yagami
cf2d5cc26f * Fix menu. 2020-05-15 17:11:30 +08:00
Yagami
2f249572f7 * Fix menu. 2020-05-14 10:14:02 +08:00
Yagami
6fe5f81780 Merge branch '15.x' of https://github.com/easysoft/zentaopms into 15.x 2020-05-12 17:29:57 +08:00
Yagami
9e131109d0 * Fix menu. 2020-05-12 14:30:57 +08:00
Catouse
326d45d0c5 * task #7131, task #7132, task #7133, add cards view for program index page. 2020-05-08 11:37:28 +08:00
Yagami
b55e3730f5 Merge branch '15.x' of https://github.com/easysoft/zentaopms into 15.x 2020-05-08 08:58:39 +08:00
Yagami
27fc29b764 * Code for task #7121. 2020-05-08 08:51:32 +08:00
Catouse
97474dcac5 * task #7129, add program swapper menu to header. 2020-05-07 14:50:59 +08:00
Yagami
6d1a047b02 * Finish task #7119. 2020-05-06 11:13:13 +08:00
Catouse
bf33d10b9d * task #7116, task #7127, task #7128, task #7130, implement new menu. 2020-05-05 17:20:44 +08:00
Catouse
b45f5c8a68 * add multi-language support, and fix UI of table statistic. 2019-12-16 17:42:26 +08:00
wangyidong
e71d8fa75f * fix bug for select table. 2019-07-12 15:23:14 +08:00
Catouse
b8af440e13 * change header UI. 2018-09-13 15:42:46 +08:00
Yagami
8a4cf98a21 * Finish task #4692. 2018-09-12 09:13:28 +08:00
wangyidong
68746993ba * finish task #4752. 2018-09-11 13:29:47 +08:00
wangyidong
ef46086f77 * adjust for bind ranzhi style. 2018-07-02 14:16:23 +08:00
chenfeiCF
9089a57d70 * Fix bug #1969. 2018-06-27 13:38:39 +08:00
wangyidong
6506886dc3 * adjust for ux. 2018-06-19 10:59:20 +08:00
liugang
35bcf01ff5 * Replace $this->config with $config in view files. 2018-06-14 14:34:41 +08:00
daitingting
7777c806fd * Add link for company name. 2018-05-31 14:59:54 +08:00
Catouse
b1b257da1f * support display long title in header. 2018-05-21 15:20:29 +08:00
Catouse
61c2e0c6e7 * improve modal UI. 2018-05-18 10:33:42 +08:00
wangyidong
5d69dce5af * adjust for report page. 2018-04-19 14:30:45 +08:00
daitingting
f191c19548 * Note useless codes. 2018-04-16 09:47:29 +08:00
liugang
fe3027623e * Finish task #3846. 2018-04-10 16:54:38 +08:00
wangyidong
9d16d860c9 * finish task #3761. 2018-04-03 17:03:49 +08:00
wangyidong
a623b9016b * change for upgrade. 2018-02-06 10:42:51 +08:00
wangyidong
30bc8d7709 * adjust for task #3592. 2018-01-31 15:16:29 +08:00
wangyidong
b557f3896d * adjust for action and header. 2018-01-29 15:07:26 +08:00
wangyidong
e2dc1c80d9 * add title for company name. 2018-01-26 15:38:28 +08:00
wangyidong
0dd8eb6f05 * adjust for ux. 2018-01-24 09:53:47 +08:00
滔哥
1de783bf74 * Fix bug 2017-12-15 15:15:08 +08:00
wangyidong
da39880a1c * adjust code for zentaobiz and fix bug. 2017-08-08 08:21:58 +08:00
pengjiangxiu
bc5f724eaa * Fix bug #1127. 2017-07-24 17:02:57 +08:00
pengjiangxiu
1b5465b57b * Finish task #3078. 2017-07-17 10:54:17 +08:00
wangyidong
2c0696ba21 * code for task #2994. 2017-05-03 15:53:21 +08:00
wangyidong
099bd94ebb Finish task#2994 禅道如果和然之集成后,样式做调整,cost:3 left:0 2017-05-03 14:39:38 +08:00
Catouse
8188be9ee7 * moved company name actions to the 'topNavbar'. 2014-04-22 17:26:51 +08:00
wwccss
11a252a872 * adjust the companyname. 2014-04-21 13:44:05 +08:00