Commit Graph
261 Commits
Author SHA1 Message Date
z b42d47e257 Merge branch '12.x' 2020-11-23 20:42:59 +08:00
holan20180123 d1bb42ad3a * Finish task #8376. 2020-11-18 11:34:41 +08:00
holan20180123 4943ce7bbe * Finish task #8387. 2020-11-17 15:25:16 +08:00
holan20180123 bb34dfe79b * Finish task #8378. 2020-11-17 14:04:50 +08:00
holan20180123 97770dd00f * Finish task #8379. 2020-11-17 13:17:15 +08:00
holan20180123 a7533f722d * Finish task #8194. 2020-11-12 10:09:16 +08:00
holan20180123 c241b1051f * Finish task #8194. 2020-11-11 13:32:01 +08:00
holan20180123 8b1e4808c2 * Finish task #8194. 2020-11-10 08:49:00 +08:00
holan20180123 09d6f83f85 * Finish task #8194. 2020-11-06 14:01:01 +08:00
z 5644b81408 Merge branch '12.x' 2020-10-30 16:58:47 +08:00
tianshujie98 593aab8967 * Adjust code style. 2020-10-28 11:30:20 +08:00
z f802c93bde * finish task #12675. 2020-09-29 08:54:28 +08:00
z a9df6f3b9c * merge after 12.4.1 changes. 2020-08-31 15:31:55 +08:00
Yagami bc69f6fb81 * Finish task #7772. 2020-08-31 13:05:24 +08:00
holan20180123 1062033526 * Finish Task #7711. 2020-08-27 13:42:16 +08:00
Yagami b72a7dee43 Merge branch 'master' into 20.x 2020-08-26 16:10:36 +08:00
tianshujie98 595e3e35c4 * Fix bug #2573. 2020-08-13 09:38:57 +08:00
Catouse 35e78313a0 * task #7591, auto refresh table statistic and pager after delete items. 2020-08-06 17:26:00 +08:00
holan20180123 794534a0a1 Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-08-06 14:10:22 +08:00
holan20180123 6f0fe410ad * Finish task #7596. 2020-08-06 14:08:32 +08:00
z 9ad6a18008 * revert jquery and compatible this jquery. 2020-08-06 11:00:47 +08:00
z 01fada7c12 * finish task #7585. 2020-08-06 10:58:54 +08:00
z 02caeb1437 * finish task #7256. 2020-06-18 14:48:00 +08:00
sgm0422 09c2a265f4 * Delete program in link. 2020-06-12 17:16:55 +08:00
zhaohaibo d4b09b733d add param currentProgram 2020-05-27 13:26:08 +08:00
wangyidong 3ba2f42aef * show child label. 2020-03-13 11:22:54 +08:00
wangyidong c32bd3d3d6 * fix bug #2906. 2019-12-30 14:29:33 +08:00
wangyidong 28a7743f61 * finish task #6675. 2019-12-18 10:16:41 +08:00
Catouse b45f5c8a68 * add multi-language support, and fix UI of table statistic. 2019-12-16 17:42:26 +08:00
wangyidong e8e1357b90 * finish task #6601. 2019-11-28 09:45:28 +08:00
wangyidong 41c510df8d * code for task #6584. 2019-11-26 14:06:19 +08:00
wangyidong eaba6528f1 * finish task #6598. 2019-11-26 11:04:47 +08:00
wangyidong 3fd71d9708 * finish task #6531. 2019-11-19 11:12:29 +08:00
wangyidong 5f96873413 * finish task #6285. 2019-08-30 10:00:15 +08:00
wangyidong 923a18f5d6 * finish task #6248. 2019-08-21 09:53:35 +08:00
liugang dc022ad849 * Optimize function to printExtendFields. 2019-08-13 14:58:15 +08:00
liugang 551acd6ddb * Optimize. 2019-08-09 17:35:34 +08:00
liugang ca3032e325 * Set hidden status in pages. 2019-08-05 17:25:30 +08:00
liugang 9c53dd8e6b * Use the function zget to get users. 2019-07-30 17:33:59 +08:00
liugang 0552f20bf0 * Use function processStatus to get status of a record. 2019-07-30 10:49:12 +08:00
chenfei 8e0f54cf6e * Finish task: https://backyard.cnezsoft.com/pms/task-view-8372.html 2019-07-26 16:04:09 +08:00
wangyidong ff55e2267f * add printExtendFields method. 2019-07-24 13:44:01 +08:00
wyd621 f858660ceb Merge branch 'master' into zentaopms_workflow 2019-07-24 09:14:23 +08:00
Yagami 7c989eaf12 * Code for task #8292. 2019-07-23 11:11:09 +08:00
wangyidong e71d8fa75f * fix bug for select table. 2019-07-12 15:23:14 +08:00
Yagami 8a313c4ef4 * Fix param for printFields. 2019-07-12 11:19:23 +08:00
chenfei f74deb1497 * Code for task #8276 of inner backyard pms. 2019-07-10 14:24:33 +08:00
Yagami 5ac4461926 * Finish task #8274. 2019-07-09 13:40:21 +08:00
chenfei 32d7fd7bc3 * Adjust for task #8275 of inner backyard pms. 2019-07-09 11:19:21 +08:00
chenfei 526682cffe * Finish task #8257 for zentao inner backyard. 2019-07-08 15:57:03 +08:00