Commit Graph

269 Commits

Author SHA1 Message Date
z
b42d47e257 Merge branch '12.x' 2020-11-23 20:42:59 +08:00
Yagami
9b5c484cf9 * Add no product logic. 2020-11-19 17:29:06 +08:00
leiyong
b919cc45b2 * Adjust getProductPairsByProject to getProductByProject. 2020-11-19 09:07:31 +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
leiyong
3272d0c454 * Adjust the test module related code. 2020-11-16 14:50:04 +08:00
Catouse
5835a74378 * limit max width of .header-angle-btn. 2020-11-13 13:27:57 +08:00
holan20180123
a7533f722d * Finish task #8194. 2020-11-12 10:09:16 +08:00
holan20180123
15e8463347 * Finish task #8194. 2020-11-11 11:18:08 +08:00
holan20180123
159cd5c41d * Finish task #8194. 2020-11-10 10:34:08 +08:00
leiyong
98f37169e1 * Adjust code. 2020-11-05 13:45:48 +08:00
Yagami
5e6861d852 * Fix bugs. 2020-11-03 13:33:30 +08:00
Yagami
227d6c8211 * Adjust code detail. 2020-11-02 14:31:47 +08:00
z
5644b81408 Merge branch '12.x' 2020-10-30 16:58:47 +08:00
tianshujie98
80307f2457 * Finish task #12956. 2020-10-28 09:09:58 +08:00
tianshujie98
b42307a2ad * Finish task #12956. 2020-10-28 09:05:35 +08:00
Yagami
d6b59ef125 * Fix bugs. 2020-10-21 16:01:39 +08:00
tianshujie98
9cd4ea9835 * Finish task #12818. 2020-10-21 14:39:22 +08:00
tianshujie98
777956a658 * Finish task #12818. 2020-10-21 14:12:36 +08:00
leiyong
6af8ff9971 * modulePageActions is modified to TRActions. 2020-10-21 09:17:33 +08:00
leiyong
c1e6e6a82c modulePageActions is modified to TRActions. 2020-10-21 09:11:19 +08:00
leiyong
81d9b1de5d * Finish task#8059. 2020-10-09 17:42:15 +08:00
holan20180123
4b1c0ced7b * Finish task #7932. Fix bug #3422. 2020-09-23 13:55:32 +08:00
holan20180123
d85d370800 * Finish task #7932. Fix bug #3422. 2020-09-23 13:27:08 +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
z
5b8f0c4bc1 + add ja lang. 2020-09-12 10:55:23 +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
Catouse
35e78313a0 * task #7591, auto refresh table statistic and pager after delete items. 2020-08-06 17:26:00 +08:00
z
9d7a93bda5 * fix error. 2020-08-06 17:21:39 +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
08d40394b8 * adjust for onlyTest flow. 2020-04-08 10:06:47 +08:00
wangyidong
40fc4ad25b * adjust code. 2020-04-08 09:18:45 +08:00
wangyidong
d649cbcbaa * adjust for show unit. 2020-04-02 16:50:43 +08:00
wangyidong
7749555f92 * code for task #7006. 2020-03-30 16:11:36 +08:00
wangyidong
a1f9c6b4bd * fix bug for search. 2019-12-25 16:56:06 +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
41c510df8d * code for task #6584. 2019-11-26 14:06:19 +08:00
guanxiying
bad6bbd39c * Add httpOnly param when setcooki. 2019-11-21 14:20:11 +08:00
Yagami
9b3afc02ce * Finish task #6523. 2019-11-19 14:19:33 +08:00
wangyidong
20a1c5b375 * add CHANGELOG and change de fr zh-tw lang. 2019-10-17 10:14:57 +08:00