Commit Graph
1595 Commits
Author SHA1 Message Date
Yagami 451a2f3e41 * Fix common lang. 2018-09-12 09:46:07 +08:00
wangyidong c4e473df14 * finish task #4712. 2018-09-12 09:32:24 +08:00
wangyidong 8c5a015c6c Merge branch 'master' of github.com:easysoft/zentaopms 2018-09-12 09:28:28 +08:00
wangyidong 7883005c1f * finish task #4737. 2018-09-12 09:28:02 +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
Yagami 3d0258a6d9 * Fix task #4836. 2018-09-11 08:53:45 +08:00
wangyidong 800a77fff6 * finish task #4764. 2018-09-10 15:23:59 +08:00
wangyidong e69e353e99 * finish task #4823. 2018-09-04 16:00:04 +08:00
wangyidong 3fdefc81e9 Merge branch 'master' of github.com:easysoft/zentaopms 2018-09-04 13:23:33 +08:00
wangyidong adaed46a79 * finish task #4827. 2018-09-04 13:21:17 +08:00
Yagami 2154470cd1 * Finish task #4836. 2018-09-04 13:15:41 +08:00
wangyidong 4875eec38e * finish task #4668. 2018-08-07 17:09:11 +08:00
Catouse 6a1f87bd26 * swap js and css import order to improve frontend perfermance. 2018-08-02 15:31:00 +08:00
wangyidong 2a85d52eeb * fix bug #1433 2018-07-25 13:14:36 +08:00
Catouse 0305c59f31 * fix datatable not work in hot reload table mode. 2018-07-24 10:17:51 +08:00
reneteng 1a0046c7a5 * remove support 2018-07-23 11:25:53 +08:00
wangyidong 96355c532d * adjust code for subMenu. 2018-07-16 17:14:10 +08:00
dajiao007 df18627679 * modify English Version 2018-07-14 15:20:53 +08:00
wangyidong bcef5cbbc5 * fix for project limited. 2018-07-12 11:55:32 +08:00
Catouse 1476846934 * fix chosen usage. 2018-07-12 08:50:17 +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
Catouse 2ea0c5002f * fix chosen usage. 2018-07-09 18:41:53 +08:00
Catouse b430451d0b Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-07-09 14:09:06 +08:00
wangyidong 4bd218b9a4 * finish task #4589. 2018-07-09 13:55:11 +08:00
Catouse 599cfd7183 * refactor code. modalTrigger usage @see http://zui.sexy/#javascript/modaltrigger. 2018-07-09 13:46:44 +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 634ab84121 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-07-05 13:38:24 +08:00
Yagami 3768276196 * Finish task #4557、#4521、#4531. 2018-07-05 13:35:08 +08:00
Catouse 2e213c6eb5 * add commas. 2018-07-05 10:25:32 +08:00
Catouse 7f28cc1697 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-07-05 10:24:44 +08:00
Catouse f1018cde93 * improve UI of dashboard. 2018-07-05 10:24:38 +08:00
Catouse 5baae8f3ff * refactor code. 2018-07-05 10:24:09 +08:00
wangyidong 646d9d60ec * finish task #4636. 2018-07-05 10:02:47 +08:00
daitingting a886e98b26 * Set word wrap. 2018-07-04 17:23:19 +08:00
wangyidong 831e54eb3e Merge branch 'master' of github.com:easysoft/zentaopms 2018-07-02 14:17:00 +08:00
wangyidong ef46086f77 * adjust for bind ranzhi style. 2018-07-02 14:16:23 +08:00
reneteng 89002bdd5a Merge branch 'master' of https://github.com/easysoft/zentaopms
*change for 10.0
2018-07-02 13:37:27 +08:00
reneteng a0044b641b *chang for 10.0 2018-07-02 13:34:04 +08:00
wangyidong 79c506aed5 Merge branch 'master' of github.com:easysoft/zentaopms 2018-07-02 09:40:06 +08:00
daitingting a4ab3d9a51 * Set forceSync as true. 2018-06-28 17:56:56 +08:00
wangyidong 1da62a0412 * fix for misc-ping in login page. 2018-06-28 17:25:35 +08:00
chenfeiCF 9089a57d70 * Fix bug #1969. 2018-06-27 13:38:39 +08:00