Commit Graph
386 Commits
Author SHA1 Message Date
Yagami f6db670dbc * Fix block code style. 2020-08-28 08:55:02 +08:00
Yagami b72a7dee43 Merge branch 'master' into 20.x 2020-08-26 16:10:36 +08:00
Yagami 77cf55dd79 * Fix system menu header. 2020-08-26 09:23:01 +08:00
holan20180123 865cda58f7 * Finish task #7627. 2020-08-25 13:21:39 +08:00
z bd27e5b0ed * finish task #7645. 2020-08-21 16:01:44 +08:00
Yagami de3c53ec94 * Add blocks. 2020-08-20 11:09:23 +08:00
Yagami a86cb31895 * Add holiday and fix project and product menu. 2020-08-19 10:58:29 +08:00
Yagami 5639a2a7f1 * Fix details. 2020-08-19 08:30:12 +08:00
Yagami 4056b73d6c Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x 2020-08-18 14:40:22 +08:00
Yagami bfd9f8e5d1 * Code for task #7625. 2020-08-18 14:36:39 +08:00
leiyong c49f14443b * Conflict resolution. 2020-08-18 13:53:42 +08:00
leiyong 4c058b4c4b * Add issue module. 2020-08-18 13:36:15 +08:00
Yagami e2378b2dde * Add risk browse method. 2020-08-18 10:38:30 +08:00
Yagami 0579a713c4 * Add risk module. 2020-08-18 09:08:13 +08:00
Yagami 3965976022 * Code for task #7632. 2020-08-17 15:31:44 +08:00
Yagami 4fe2e5f278 * Move stage method to zentaopms. 2020-08-17 14:41:58 +08:00
z cad991a948 * add new version and upgrade. 2020-08-10 13:37:28 +08:00
qiyu-xie 76381c1fd2 * Merge. 2020-08-05 11:16:37 +08:00
Yagami e42279b792 * Fix version. 2020-08-03 11:04:26 +08:00
z 97e800bd9c * change version to 12.4.stable 2020-07-28 14:05:45 +08:00
z 1e932f160c * add new version and upgrade. 2020-07-27 14:14:19 +08:00
holan20180123 d4d49466b4 * Finish task #7521. 2020-07-26 21:16:48 +08:00
holan20180123 78e714df92 * Finish task #7361. 2020-07-23 15:49:13 +08:00
leiyong e0967b579f * Finish task#7376. 2020-07-19 19:18:02 -07:00
chenfei 7768b040d4 * Finish task #7383. 2020-07-17 16:39:49 +08:00
z a7ab0a84a4 * finish task #7303,7316. 2020-07-06 13:19:13 +08:00
z d5a2b481ee * add new version and upgrade. 2020-07-02 10:14:16 +08:00
z 0e70771cd8 * finish task #7274. 2020-06-28 13:16:47 +08:00
z 7ab4e53714 * finish task #7274. 2020-06-28 11:26:54 +08:00
sgm0422 5c5ef4eb0c * Fix acl and rights. 2020-06-12 16:41:40 +08:00
z 2539193d30 * add new version and upgrade. 2020-06-01 14:58:04 +08:00
sgm0422 48e0bf9043 * Change version. 2020-05-20 10:22:59 +08:00
wangyidong 65c64de03a * add new version and upgrade. 2020-05-15 13:03:14 +08:00
wangyidong edc9766587 * finish task #7165. 2020-05-11 11:22:11 +08:00
Yagami b55e3730f5 Merge branch '15.x' of https://github.com/easysoft/zentaopms into 15.x 2020-05-08 08:58:39 +08:00
Yagami 27fc29b764 * Code for task #7121. 2020-05-08 08:51:32 +08:00
Catouse 71eb6e7022 * fix menu state error on page load with cookie. 2020-05-07 17:38:40 +08:00
Yagami 9c7b057c43 * Finish task #7123. 2020-05-07 11:29:42 +08:00
Yagami ef44299d7e * Finish task #7117/7125/7124. 2020-05-06 15:42:56 +08:00
wangyidong 5f912e1a2f * fix for sync commit. 2020-04-13 14:19:36 +08:00
wangyidong 523162eac5 * add new version and upgrade and add vi lang. 2020-04-10 13:55:45 +08:00
wangyidong 1687ac4e65 * add new version and upgrade. 2020-03-25 14:30:48 +08:00
zbx b72ddf92d1 * Code for requirement. 2020-03-12 14:51:17 +08:00
wangyidong 26177e362e * fix bug #6974. 2020-03-10 15:51:47 +08:00
wangyidong 904df3224b * add new version and upgrade. 2020-03-10 15:14:18 +08:00
wangyidong 31aba45ddc * move integration to job. 2020-03-06 17:35:33 +08:00
wangyidong e2c02c246b Merge branch 'master' into zentaopms_12.0.1 2020-02-26 18:27:08 +08:00
wangyidong f9867d5da6 * adjust for merge. 2020-02-26 15:05:24 +08:00
wangyidong a7120e1e4d * code for task #6890. 2020-02-18 13:15:06 +08:00
wangyidong d24304332f * add new version and upgrade. 2020-02-12 09:48:05 +08:00