Commit Graph
1191 Commits
Author SHA1 Message Date
Yagami 13c924c5f5 * Merge code. 2020-11-13 11:38:22 +08:00
Yagami e1616ab27d * Fix video URL. 2020-11-03 16:09:49 +08:00
Yagami 1004009e7b * Change demo url. 2020-11-03 15:29:11 +08:00
Yagami 4a5b1437c1 * Fix detials. 2020-11-03 14:49:58 +08:00
Yagami efeea142bc * Add video. 2020-11-03 13:33:30 +08:00
Yagami 478d51813f * Add sql. 2020-11-02 16:17:57 +08:00
leiyong c66f0f9bc5 * Adjustment language files. 2020-11-02 11:48:43 +08:00
Yagami 18131e47ef * Fix bugs. 2020-11-02 10:09:40 +08:00
z 5644b81408 Merge branch '12.x' 2020-10-30 16:58:47 +08:00
Yagami c78025b8cf * Fix upgrade logic. 2020-10-30 14:48:41 +08:00
Yagami 77a1d561a0 * Fix upgrade lang. 2020-10-30 14:14:03 +08:00
Yagami f3270f48d3 * Add upgrade version. 2020-10-30 14:14:03 +08:00
Yagami 10b4182206 * Fix upgrade error. 2020-10-30 13:55:45 +08:00
Yagami 755513d9cd * Fix details. 2020-10-30 13:43:05 +08:00
Catouse 6c4885cd24 * task #8164, improve UI of upgrade/mergeprogram view. 2020-10-30 11:08:18 +08:00
Yagami 04c6164681 * Fix bug. 2020-10-30 10:47:16 +08:00
z 1bccfd5744 * add new version and upgrade. 2020-10-30 10:40:00 +08:00
Yagami d1f2919365 * Fix details. 2020-10-30 10:30:38 +08:00
Yagami 77e3053176 * Fix details. 2020-10-29 16:59:21 +08:00
leiyong f409040e3c Merge branch 'master' of github.com:easysoft/zentaopms 2020-10-29 16:39:14 +08:00
leiyong 71a6c3b318 * Fix upgrade errors. 2020-10-29 16:37:02 +08:00
Yagami b4ea03a2fd * Fix details. 2020-10-29 14:04:46 +08:00
Yagami 30d7bb81b7 * Fix details. 2020-10-28 14:39:36 +08:00
Yagami a52a622ce4 * Merge code. 2020-10-28 11:45:26 +08:00
leiyong 0909592ea1 * Adjust whitelist setting logic. 2020-10-28 09:14:38 +08:00
Yagami 104d25ff49 * Fix bug. 2020-10-27 16:09:05 +08:00
leiyong abf386a1e3 * Adjust whitelist deletion logic. 2020-10-27 16:08:46 +08:00
Yagami 0f3348ad2a * Finish task #8164. 2020-10-27 14:46:03 +08:00
Yagami 27986da851 * Code for task #8164. 2020-10-26 16:36:32 +08:00
Yagami 6cafceeb0b * Fix merge program js. 2020-10-26 16:36:32 +08:00
Yagami 5082e5a913 * Add upgrade view. 2020-10-26 16:36:32 +08:00
Yagami 21ba4055ca * Fix bugs and add lang. 2020-10-21 13:24:05 +08:00
Yagami a16da916ab * Rename PRJadmin to PRJAdmin. 2020-10-20 14:18:39 +08:00
z 7509e74182 + add new version and upgrade. 2020-10-13 10:44:41 +08:00
holan20180123 050a884962 * Finish task #8160. 2020-10-12 16:18:58 +08:00
holan20180123 7f49f1f614 * Finish task #8085. 2020-10-12 15:49:46 +08:00
holan20180123 9d90cc9541 * Finish task #8090. 2020-10-12 10:57:49 +08:00
holan20180123 cf527ad972 Merge branch '12.x' of https://github.com/easysoft/zentaopms into 12.x 2020-10-12 10:19:42 +08:00
holan20180123 086252b0bd * Finish task #8090. 2020-10-12 10:19:19 +08:00
z 5c015ea501 * finish task #8046. 2020-10-12 10:17:01 +08:00
holan20180123 02eb03583d * Finish task #8085. 2020-10-10 16:56:36 +08:00
Yagami 4209766be3 * Rename var name. 2020-09-30 17:18:24 +08:00
z 855d6650f9 * fix for bug. 2020-09-27 14:37:01 +08:00
Yagami 92ee6ca3b2 * Rename program to prj. 2020-09-22 11:31:56 +08:00
Yagami 66f4f5403a * Fix sql and rename program to PRJ. 2020-09-16 11:28:55 +08:00
z 93581b34b4 * add new version. 2020-09-15 09:52:17 +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
Yagami d63e8916ea * Add empty line. 2020-09-07 14:18:32 +08:00
z 0244080f1a * finish task #7798. 2020-09-03 16:59:00 +08:00