Commit Graph
537 Commits
Author SHA1 Message Date
leiyong d308a7e9ea * Fix bug. 2020-11-03 11:00:27 +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
Yagami 1b9c6b0e98 * Merge code. 2020-09-23 14:54:16 +08:00
Yagami a95a72b579 * Fix product lang. 2020-09-23 10:27:49 +08:00
qiyu-xie 44eb729a9e * Fix bug#3438. 2020-09-16 15:58:22 +08:00
Yagami 66f4f5403a * Fix sql and rename program to PRJ. 2020-09-16 11:28:55 +08:00
z 0940140b9d * adjust for ja lang. 2020-09-15 09:07:42 +08:00
qiyu-xie fe74778306 * Fix bug#3438. 2020-09-14 16:15:04 +08:00
z 5b8f0c4bc1 + add ja lang. 2020-09-12 10:55:23 +08:00
z a9df6f3b9c * merge after 12.4.1 changes. 2020-08-31 15:31:55 +08:00
holan20180123 521cea2844 Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-08-31 15:04:28 +08:00
holan20180123 7a661001da * Finish task #7758. 2020-08-31 14:57:44 +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
holan20180123 fb15224b42 Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-08-13 13:53:57 +08:00
holan20180123 99f7f0c4df * Fix bug #3276. 2020-08-13 13:48:29 +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
z b753e06149 Merge branch 'master' of github.com:easysoft/zentaopms 2020-08-06 15:32:27 +08:00
z 6aca289707 * finish task #7585. 2020-08-06 15:28:46 +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
qiyu-xie 76381c1fd2 * Merge. 2020-08-05 11:16:37 +08:00
holan20180123 4545fa25ca * Finish task #7547. 2020-07-27 14:52:48 +08:00
holan20180123 97bfc8fd50 * Finish task #7547. 2020-07-25 12:19:12 +08:00
holan20180123 fdc44afd2f * Finish task #7471. 2020-07-16 13:05:53 +08:00
z 2801f04e4c * code for task #7305. 2020-07-06 14:29:44 +08:00
z 9b80f4d9de * code for task #7302. 2020-07-06 09:08:09 +08:00
z 36dfb8eb36 * adjust code. 2020-07-01 17:47: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 523162eac5 * add new version and upgrade and add vi lang. 2020-04-10 13:55:45 +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 ecbf8220da * add new version and upgrade. 2019-11-28 09:29:36 +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
guanxiying 58357af226 * Finish task #6549. 2019-11-18 13:06:50 +08:00
wangyidong 20a1c5b375 * add CHANGELOG and change de fr zh-tw lang. 2019-10-17 10:14:57 +08:00
wangyidong 6e2a0996d9 + add for Françalang. 2019-10-16 17:28:10 +08:00