Commit Graph
401 Commits
Author SHA1 Message Date
tianshujie98 bfce366ef1 * Fix bug. 2020-12-08 08:24:20 +08:00
tianshujie98 5be348e08e * Fix bug #3730. 2020-12-07 15:34:59 +08:00
wangyidong a1ae7b15bf * fix bug. 2020-12-01 13:24:04 +08:00
wangyidong e10897a838 * fix bug. 2020-12-01 09:03:32 +08:00
z b42d47e257 Merge branch '12.x' 2020-11-23 20:42:59 +08:00
qiyu-xie 3d85fc9346 * Finish task#8423. 2020-11-17 16:58:46 +08:00
qiyu-xie 1ea321fea5 * Finish task#8239. 2020-11-05 11:10:53 +08:00
Catouse eb01165a2e * storage template html as templateHtml property of keditor instance. 2020-10-12 20:10:01 +08:00
Catouse 2c6d7d153b * storage template html as templateHtml property of keditor instance. 2020-10-12 20:08:20 +08:00
tianshujie98 677fa52863 * Revert submission. 2020-10-09 08:31:30 +08:00
tianshujie98 48c178e9a6 * Revert submission. 2020-10-09 08:27:33 +08:00
tianshujie98 77739b6d92 * Adjust code style. 2020-09-25 16:57:59 +08:00
tianshujie98 dd3c2677b6 * Adjust code style. 2020-09-25 16:51:31 +08:00
tianshujie98 31687d6856 * Finish task #8009. 2020-09-24 09:37:49 +08:00
tianshujie98 ac8ab8d868 * Finish task #8009. 2020-09-24 09:30:55 +08:00
tianshujie98 5657235d84 * Fix bug 3464. 2020-09-11 14:44:29 +08:00
tianshujie98 66c636d771 * Fix bug #3464. 2020-09-10 15:59:00 +08:00
tianshujie98 d27efffa6d * Fix bug #3464. 2020-09-09 09:10:17 +08:00
z a9df6f3b9c * merge after 12.4.1 changes. 2020-08-31 15:31:55 +08:00
holan20180123 7cb74a6158 * Finish task #7711. 2020-08-27 14:06:35 +08:00
tianshujie98 fba9a11c58 * Fix bug #2581. 2020-08-11 09:30:12 +08:00
tianshujie98 a99aab00ea *Finish task #7587. 2020-08-05 17:04:47 +08:00
Yagami f41ce9cdaa * Fix bug #2980. 2020-02-27 15:25:14 +08:00
wangyidong 61e0a9d4f1 * finish task #6505. 2019-11-19 17:18:35 +08:00
wangyidong a5411a8aca * adjust for dashboard. 2019-11-07 11:30:43 +08:00
Yagami f4375dc9f0 * Finish task #6457. 2019-10-12 13:56:51 +08:00
wangyidong da2a9751dc * finish task #6447. 2019-10-12 10:28:02 +08:00
wangyidong 475fb0732a * finish task #6260. 2019-08-21 08:47:53 +08:00
wangyidong cd52f39438 * finish task #6261. 2019-08-21 08:43:55 +08:00
wangyidong f40bd1adb5 * fix bug #2688. 2019-08-15 15:26:15 +08:00
wangyidong 321b27c81b * finish task #6208. 2019-08-08 13:12:49 +08:00
jinianlan 4deb236c54 * finish task #6193. 2019-08-06 17:03:44 +08:00
jinianlan b03634638a * fix Bug #2679,#2637,#2590,finish task #6172,#6182 2019-08-06 10:40:22 +08:00
liugang 9c53dd8e6b * Use the function zget to get users. 2019-07-30 17:33:59 +08:00
wangyidong 53ffb2ab78 Merge branch 'master' of github.com:easysoft/zentaopms 2019-07-30 15:39:19 +08:00
wangyidong 17b53acaa9 * finish task #6161. 2019-07-30 15:38:49 +08:00
liugang 0ec5dadb1c * Use the function processStatus to get status of a record. 2019-07-30 15:17:27 +08:00
jinianlan c90aac3512 * finish task #6166,#6149,6139 2019-07-29 15:54:08 +08:00
wangyidong 2671f7a044 * finish task #6090. 2019-07-15 15:56:31 +08:00
wangyidong dc87304782 * finish task #6025. 2019-07-05 15:35:13 +08:00
Yagami 68dc518853 * Finish task #5922. 2019-07-02 16:10:37 +08:00
Yagami a5650354ad * Finish task #5919. 2019-07-02 15:33:26 +08:00
Yagami 80683b35d3 * Finish task #5877. 2019-06-27 09:59:51 +08:00
wangyidong f937f4cb65 * adjust for page style. 2019-06-12 13:14:38 +08:00
wangyidong 96d2cdca60 * adjust for style. 2019-06-11 10:04:25 +08:00
wangyidong 1fbf720cae * adjust for task #5783 2019-06-05 16:16:21 +08:00
wangyidong 10e0c46c71 * finish task #5784. 2019-06-05 15:11:31 +08:00
wangyidong 5b75894610 * finish task #5690. 2019-06-05 11:25:42 +08:00
wangyidong 228333562a * finish task #5689. 2019-06-05 11:15:36 +08:00
wangyidong 6143a0ae5b * adjust for user contact. 2019-05-31 10:31:00 +08:00