Commit Graph
16839 Commits
Author SHA1 Message Date
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
Yagami 4889c30d40 * Finish task #6678. 2019-12-13 14:38:42 +08:00
Catouse 03203d01fb * fix auto scrolll page on search on #dropMenu. 2019-12-13 14:11:47 +08:00
Catouse 3a12adb09c * fix cannot resize image witch pasted from clipboard. 2019-12-13 14:11:47 +08:00
Catouse a5a8751b8d * finish task #6695, fix bug #2337. 2019-12-13 14:11:47 +08:00
Yagami 76a7942daa * Finish task #6679. 2019-12-13 13:21:12 +08:00
Yagami 93e801dff4 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-12-13 10:20:01 +08:00
Yagami 4760eb835c * Fix project lang. 2019-12-13 10:19:40 +08:00
wangyidong 16b6da25af * finish task #6685. 2019-12-12 16:32:52 +08:00
wangyidong fa83c25215 * finish task #6715. 2019-12-12 16:25:17 +08:00
wangyidong f8ab23abf9 Merge branch 'master' of github.com:easysoft/zentaopms 2019-12-12 15:35:21 +08:00
wangyidong 739ecf718d * finish task #6670. 2019-12-12 15:34:50 +08:00
Yagami b6604c1cb1 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-12-12 15:06:14 +08:00
Yagami 99e7df4a91 * Finish task #6682. 2019-12-12 15:05:55 +08:00
guanxiying cf814726d9 * Fix bug #2338. 2019-12-12 14:50:05 +08:00
guanxiying 4cd74bd08a * Fix comments and add default referer. 2019-12-12 14:49:02 +08:00
wangyidong 192a412426 Merge branch 'master' of github.com:easysoft/zentaopms 2019-12-12 14:38:39 +08:00
wangyidong ad947eb802 * finish task #6668. 2019-12-12 14:36:18 +08:00
guanxiying df74bb80cc * Finish task #6667. 2019-12-12 14:05:24 +08:00
wangyidong 4640b5dabb Merge branch 'master' of github.com:easysoft/zentaopms 2019-12-12 13:50:08 +08:00
wangyidong 2ff715ce71 * finish task #6672. 2019-12-12 13:48:52 +08:00
guanxiying 46b48a5363 * Fix bug #2462. 2019-12-12 13:35:59 +08:00
Yagami f4e0e729f3 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-12-12 13:17:56 +08:00
Yagami 3c2c1c4762 * Finish task #6684. 2019-12-12 13:17:42 +08:00
wangyidong f487b70a36 Merge branch 'master' of github.com:easysoft/zentaopms 2019-12-12 10:33:40 +08:00
wangyidong e0c079e6c3 * finish task #6697. 2019-12-12 10:13:29 +08:00
Yagami 35d81782ac * Finish task #6687. 2019-12-12 09:56:44 +08:00
guanxiying b0175bb868 * Fix bug #2475. 2019-12-12 09:48:54 +08:00
guanxiying afc452bc22 * Fix bug #2460. 2019-12-12 09:17:45 +08:00