Commit Graph

352 Commits

Author SHA1 Message Date
wangyidong
8b483f751c * fix for appendOrder when orderby is empty. 2018-10-24 17:36:40 +08:00
wangyidong
0558da4e38 * finish task #4967. 2018-10-12 14:00:09 +08:00
wangyidong
d98adeccba * finish task #4976. 2018-10-12 09:08:12 +08:00
wangyidong
75e0e6555b * finish task #4976. 2018-10-11 15:38:26 +08:00
wangyidong
cce187c7e4 * fix for upgrade. 2018-09-29 14:44:04 +08:00
wangyidong
3423acdcc3 * adjust code. 2018-09-28 09:03:52 +08:00
Catouse
e45a1e4d34 * finish task #4791. 2018-09-21 16:39:10 +08:00
滔哥
000c08e943 * Finished task#4890 2018-09-19 08:11:25 +08:00
wangyidong
ad5c25e843 * adjust for code format. 2018-09-17 09:19:16 +08:00
滔哥
e47515aa62 * Finish task#4794 2018-09-14 10:52:58 +08:00
Catouse
ef8317accc * finish task #4741. 2018-09-13 16:29:06 +08:00
Catouse
b8af440e13 * change header UI. 2018-09-13 15:42:46 +08:00
滔哥
020b26d2d9 * Fix bug. 2018-09-13 09:52:28 +08:00
wangyidong
87b9ed502a * fix bug. 2018-09-12 11:31:11 +08:00
wangyidong
800a77fff6 * finish task #4764. 2018-09-10 15:23:59 +08:00
wangyidong
adaed46a79 * finish task #4827. 2018-09-04 13:21:17 +08:00
wangyidong
4875eec38e * finish task #4668. 2018-08-07 17:09:11 +08:00
wangyidong
96355c532d * adjust code for subMenu. 2018-07-16 17:14:10 +08:00
wangyidong
bcef5cbbc5 * fix for project limited. 2018-07-12 11:55:32 +08:00
liugang
3f4e16fedb * Add function to create sub menu by settings in lang files. 2018-07-11 14:35:10 +08:00
liugang
f14c21dd62 * Finish task #4487, 4507 2018-07-11 13:52:59 +08:00
liugang
3d4f7b86d9 * finish task #4487. 2018-07-11 10:23:13 +08:00
liugang
b432ee4598 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-07-10 18:20:27 +08:00
liugang
f505416eb7 * Adjust sub menu settings. 2018-07-10 18:20:04 +08:00
wangyidong
86f38aa412 * finish task #4633. 2018-07-10 17:36:18 +08:00
wangyidong
4bd218b9a4 * finish task #4589. 2018-07-09 13:55:11 +08:00
liugang
c0e5909247 * Fix bug. 2018-07-09 11:15:03 +08:00
wangyidong
bac2527f2a Merge branch 'master' of github.com:easysoft/zentaopms 2018-07-05 15:03:18 +08:00
wangyidong
c3c9305775 * finish task #4556. 2018-07-05 14:58:46 +08:00
Yagami
3768276196 * Finish task #4557、#4521、#4531. 2018-07-05 13:35:08 +08:00
wangyidong
1da62a0412 * fix for misc-ping in login page. 2018-06-28 17:25:35 +08:00
daitingting
e8120ff55c * LoadCustomFromDB when version > 4.3.beta/pro.2.3.beta/biz. 2018-06-26 17:42:43 +08:00
liugang
7c5208c61a * Hide tutorial menu if the global flow is not full. 2018-06-22 10:48:22 +08:00
liugang
1eb7ed4198 * Finish task #4461. 2018-06-20 14:11:52 +08:00
Catouse
e8c822f670 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-06-19 13:56:32 +08:00
Catouse
d4edf035ae * support custom navbar menu items. 2018-06-19 13:56:24 +08:00
wangyidong
6506886dc3 * adjust for ux. 2018-06-19 10:59:20 +08:00
Catouse
5af1da0382 * improve UI for tutorial mode. 2018-06-15 14:11:11 +08:00
liugang
ff5c40d7f0 * Finish task #4429 2018-06-12 10:25:43 +08:00
Catouse
1ae50c4b1f * refactor themes. 2018-06-07 09:37:36 +08:00
Catouse
6c260365f6 + add zentao new themes. 2018-06-06 21:07:48 +08:00
滔哥
2a2e933f2b * Finish task#4355. 2018-06-01 13:23:30 +08:00
daitingting
4643931d3c * Adjust codes. 2018-05-31 16:22:40 +08:00
daitingting
568402d9bc * Do not display divider if the menu is the last. 2018-05-31 16:21:01 +08:00
daitingting
c16e2c2bd2 * Check is the super admin or not by admins of company when user's admin field is empty. 2018-05-29 09:21:51 +08:00
daitingting
996c25cd4b * Load custom from db when upgradeVersion > 4.3.beta. 2018-05-25 16:20:33 +08:00
Catouse
4c38efb845 * improve UI of links on footer. 2018-05-24 17:05:57 +08:00
滔哥
f1532b204d * Fix bug. 2018-05-23 16:09:30 +08:00
wangyidong
1035026243 * fix bug for high light and make int package. 2018-05-23 10:35:30 +08:00
Catouse
7fea6a86c6 * refactor codes. 2018-05-21 16:54:51 +08:00