Commit Graph
19758 Commits
Author SHA1 Message Date
leiyong 32b1adc195 * Adjust style. 2020-11-13 13:04:17 +08:00
Yagami 3a00d645ec * Merge code. 2020-11-13 11:38:22 +08:00
Yagami 13c924c5f5 * Merge code. 2020-11-13 11:38:22 +08:00
Catouse 1d9a0c736c * change global nest table toggle size. 2020-11-13 11:30:53 +08:00
Catouse a3f3ce5ee2 * task #8347, add global nest toggle to table in page "program/pgmbrowse". 2020-11-13 11:27:39 +08:00
leiyong b4b1ab7ae4 * Add the update20.0.alpha1.sql file 2020-11-13 10:31:57 +08:00
leiyong f98cba63ab * Adjust code. 2020-11-13 10:28:53 +08:00
leiyong 015af00fcd * Adjust code. 2020-11-13 10:25:31 +08:00
leiyong 90f9182ddc * Adjust the doc module. 2020-11-13 09:58:53 +08:00
leiyong 1065817f17 * Adjust the doc module code. 2020-11-12 18:25:05 +08:00
leiyong db4328a225 * Finish task#8334. 2020-11-12 13:23:39 +08:00
leiyong 29b585ba35 * Finish task#8338. 2020-11-12 11:27:36 +08:00
Yagami 3c0523d47e * Fix common lang. 2020-11-12 10:33:03 +08:00
Yagami f3bee6424f * Finish task #8326. 2020-11-12 10:33:03 +08:00
leiyong c01934f8ba * Finish task#8339. 2020-11-12 10:20:06 +08:00
leiyong e4dcf11d58 * Finish task#8340. 2020-11-12 09:48:18 +08:00
leiyong adca539b56 * Finish task#8341. 2020-11-12 09:33:43 +08:00
leiyong 37be45492b * Finish task#8342. 2020-11-12 09:14:59 +08:00
leiyong c1322442fd * Adjust the holiday module. 2020-11-11 18:21:47 +08:00
Catouse aa56f5567f * task #8244, bug #3543, fix recording wrong user ip on user login. 2020-11-11 14:57:00 +08:00
leiyong 03a29b0a90 * Adjust code. 2020-11-11 14:14:40 +08:00
leiyong f814b46198 * The waterfall model displays hierarchies and associated products. 2020-11-11 14:11:38 +08:00
Catouse c298d66d86 * task #8233, bug #3567, fix server url in im/debug view. 2020-11-11 13:53:50 +08:00
leiyong e58df36f7a * Fix error. 2020-11-11 11:45:14 +08:00
leiyong a5e562377f Merge branch 'master' of github.com:easysoft/zentaopms 2020-11-11 11:42:24 +08:00
leiyong edc9e1593f * Fix bug. 2020-11-11 11:42:03 +08:00
Yagami 2760096a18 * Fix detail. 2020-11-11 11:39:21 +08:00
Catouse aac9e22af6 * task #8234, bug #3565, fix stripedRows setting of table not work in kindeditor, see http://pms.zentao.net/bug-view-3565.html
# Conflicts:
#	www/js/kindeditor/kindeditor.min.js
2020-11-11 09:58:38 +08:00
Catouse 30efec994c * task #8225, bug #3577, improve UI of picker. 2020-11-10 16:58:32 +08:00
Catouse 345a4d1a95 * task #8224, bug #3578, update zentao-integrated file for zentao client extension. 2020-11-10 16:58:32 +08:00
Catouse 0a9544136e * task #8227, bug #3575, enable submit button on check hours. 2020-11-10 16:58:32 +08:00
Yagami 0024682188 * Fix detail. 2020-11-10 16:39:45 +08:00
leiyong 759bf9e1e7 * Adjust code. 2020-11-10 16:38:19 +08:00
Yagami 35b0c16a06 * Fix create project link product logic. 2020-11-10 13:13:06 +08:00
Yagami b12cf02ef0 * Code for UR name and SR name. 2020-11-09 15:35:24 +08:00
leiyong 320fda0933 * Adjust code. 2020-11-09 09:57:51 +08:00
leiyong 1ac59794cb * Adjust code. 2020-11-09 09:55:25 +08:00
Yagami 9adb0c9d38 * Fix sql. 2020-11-06 16:54:44 +08:00
Yagami da9abfa77c * Fix bug. 2020-11-06 16:54:03 +08:00
Yagami 2414c8b3eb * Fix bug. 2020-11-06 16:53:42 +08:00
Yagami aaf01e4afd * Fix sql. 2020-11-06 16:53:42 +08:00
Yagami 8767cd2382 * Add story track. 2020-11-06 16:53:42 +08:00
Yagami c3d3745cdc * Fix sql error. 2020-11-06 16:53:42 +08:00
Yagami 89de3231b2 * Fix code error. 2020-11-06 16:53:42 +08:00
Yagami f85b13e696 * Fix sql. 2020-11-06 16:53:42 +08:00
Yagami 3c1fe9d75e * Fix sub menu. 2020-11-06 16:53:42 +08:00
Yagami 0bfa64a220 * Fix common header. 2020-11-06 16:53:42 +08:00
Yagami d5f2af0cfe * Fix install error. 2020-11-06 16:53:42 +08:00
leiyong 827a884575 * Adjust the program to PRJ. 2020-11-06 13:45:27 +08:00
leiyong f561462a0e * Adjust code. 2020-11-06 13:20:35 +08:00