Commit Graph
16867 Commits
Author SHA1 Message Date
wangyidong 0264e1bf1e * revert upgrade.php.tmp file. 2019-12-19 09:32:59 +08:00
wangyidong 33bcfd2fc8 * finish task #6605. 2019-12-19 09:31:17 +08:00
wangyidong fffcd64aa0 * finish task #6675. 2019-12-19 09:15:43 +08:00
wangyidong 3ed10d17f6 * adjust style. 2019-12-19 08:21:35 +08:00
wangyidong 2ff8e8afbe * update zentao-integrated for xuanxuan. 2019-12-19 08:19:41 +08:00
wangyidong ed5f700a86 * finish task #6694. 2019-12-19 08:17:01 +08:00
wangyidong 44ca492421 * finish task #6697. 2019-12-18 15:24:54 +08:00
wangyidong 24dd889cf0 * fix bug #2684. 2019-12-18 14:03:00 +08:00
wangyidong fff6abfaf6 * fix js error. 2019-12-18 13:11:43 +08:00
wangyidong f29fdfd106 * finish task #6760. 2019-12-18 13:07:49 +08:00
wangyidong d0c070436d * code for story #4411. 2019-12-18 13:05:52 +08:00
wangyidong 8849f38d4c * fix error. 2019-12-18 13:03:11 +08:00
wangyidong b0c98b5084 * fix bug for login use api. 2019-12-18 11:40:03 +08:00
wangyidong 84bf112841 Merge branch 'master' of github.com:easysoft/zentaopms 2019-12-18 10:17:13 +08:00
wangyidong 28a7743f61 * finish task #6675. 2019-12-18 10:16:41 +08:00
Catouse 714b7e3585 * update zui.css, task #6748, bug #2401. 2019-12-17 16:36:16 +08:00
reneeteng 880d95175d Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-12-17 15:04:52 +08:00
reneeteng d1cbf5429a * Xuan translation in ZenTao is updated. 2019-12-17 15:03:22 +08:00
wangyidong b3a214b819 * finish task #6668. 2019-12-17 15:01:51 +08:00
wangyidong 92e18a75f8 Merge branch 'master' of github.com:easysoft/zentaopms 2019-12-17 14:47:24 +08:00
Catouse 4517f9f4fd * fix cannot select text in kindeditor in ie11, task #6671, bug #2888. 2019-12-17 14:37:38 +08:00
wangyidong 251d465ea2 Merge branch 'master' of github.com:easysoft/zentaopms 2019-12-17 14:30:29 +08:00
wangyidong 0ade42620c * code for task #6759. 2019-12-17 14:29:25 +08:00
Catouse efa9ce5034 * fix dropdown search list UI, task #6746, bug #2420. 2019-12-17 14:07:34 +08:00
wangyidong 9e14f6c61b Merge branch 'master' of github.com:easysoft/zentaopms 2019-12-17 11:19:01 +08:00
wangyidong bf3a4ba42c * finish task #6668. 2019-12-17 11:07:04 +08:00
Catouse 914f3aaf19 * fix modal trigger error on load broken. 2019-12-17 11:04:45 +08:00
Catouse 2f8beb146f * fix clientLang undefined error. 2019-12-17 10:13:11 +08:00
Catouse 4ea90b2f0d * add ja language to zui and kindeditor. 2019-12-17 09:34:42 +08:00
Catouse b45f5c8a68 * add multi-language support, and fix UI of table statistic. 2019-12-16 17:42:26 +08:00
wangyidong a9f4bc8edd * finish task #6760. 2019-12-16 17:00:05 +08:00
wangyidong 714835adaf Merge branch 'master' of github.com:easysoft/zentaopms 2019-12-16 15:55:33 +08:00
wangyidong ee07401214 * fix bug. 2019-12-16 15:55:10 +08:00
liugang 5d68dfefc0 * Fix bug. 2019-12-16 15:06:31 +08:00
liugang 71bde53aa9 * User can set id of a textarea. 2019-12-16 15:05:52 +08:00
wangyidong 2b2671e7ab * finish task #6676. 2019-12-16 13:50:56 +08:00
wangyidong 76f4160ffc * finish task #6692. 2019-12-16 13:13:48 +08:00
wangyidong 784a0db6b6 * finish task #6697. 2019-12-16 13:06:30 +08:00
wangyidong 8e93cc9577 Merge branch 'master' of github.com:easysoft/zentaopms 2019-12-16 10:34:34 +08:00
wangyidong 7f056bc7e2 * finish task #6756. 2019-12-16 10:34:05 +08:00
wangyidong 80c7e0fa9b * finish task #6757. 2019-12-16 10:10:39 +08:00
Catouse 3f6ce05ee7 * fix chosen drop_direction option not work as expected sometimes, task #6739, #bug #2443. 2019-12-13 17:38:15 +08:00
Catouse b0782b1a26 * improve UI of textarea autoresize, task #6742, bug #2429. 2019-12-13 16:14:32 +08:00
wangyidong 6ad8a814ce * adjust for branch. 2019-12-13 16:13:50 +08:00
Catouse 39c8803c1e * fix input group border style in story views. 2019-12-13 16:05:25 +08:00
wangyidong 1925b1812e * finish task #2903. 2019-12-13 15:11:40 +08:00
Catouse 1c6449df08 * refactor code. 2019-12-13 14:47:26 +08:00
Catouse 5b6839ac7b * querybox support get params from data-module and data-url attributes. 2019-12-13 14:47:26 +08:00
Catouse 0f481a7f18 * fix can click module tree on hidden, task #6683, bug #2857. 2019-12-13 14:47:26 +08:00
Yagami 0fbb3d95b5 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-12-13 14:39:01 +08:00