Commit Graph
17907 Commits
Author SHA1 Message Date
z 6265da18b9 Merge branch '20.x' of github.com:easysoft/zentaopms into 20.x 2020-08-26 13:10:36 +08:00
z 6b93c993aa * set default isCat in edit program. 2020-08-26 13:10:05 +08:00
leiyong 17744cc4b5 * Merger code. 2020-08-26 13:09:51 +08:00
tianshujie98 6252c1b0eb * Fix sort bug. 2020-08-26 12:03:58 +08:00
tianshujie98 704382ce01 * Add required field ID. 2020-08-26 11:28:35 +08:00
Catouse a2851c968f * fix dropmenu position of datetimepicker. 2020-08-26 11:18:56 +08:00
Catouse 543e58ada0 * fix task not show in cmmigantt block sometimes. 2020-08-26 11:15:35 +08:00
Catouse a6828eaa07 * typo. 2020-08-26 11:15:35 +08:00
Catouse 00266f9118 * fix variable name typo. 2020-08-26 11:15:35 +08:00
Catouse 295238a203 * fix js object difinition error. 2020-08-26 11:15:35 +08:00
qiyu-xie b1def9c9ca * Add repo module lang. 2020-08-26 11:12:59 +08:00
qiyu-xie e8c9d1e5e9 * Add story module lang. 2020-08-26 11:03:00 +08:00
tianshujie98 4c4367f7fe * Remove duplicate definitions. 2020-08-26 11:00:08 +08:00
tianshujie98 18153da73f Merge branch '20.x' of github.com:easysoft/zentaopms into 20.x 2020-08-26 10:55:15 +08:00
tianshujie98 aedaea4336 * Add English file content. 2020-08-26 10:52:51 +08:00
hufangzhou fe6c181224 * Finish task#7652. 2020-08-26 10:42:31 +08:00
qiyu-xie dd49d9e613 * Add task module lang. 2020-08-26 10:34:58 +08:00
qiyu-xie 75df9a7300 Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x 2020-08-26 10:33:45 +08:00
z 971d2b0cfa Merge branch '20.x' of github.com:easysoft/zentaopms into 20.x 2020-08-26 10:31:01 +08:00
z 518ca3027e * adjust for en lang. 2020-08-26 10:30:41 +08:00
holan20180123 31b533eac1 * Fix bug #3404. 2020-08-26 10:24:28 +08:00
holan20180123 f2238e567f Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x 2020-08-26 10:21:09 +08:00
holan20180123 c8e660380a * Fix bug #3397,3398,3399. 2020-08-26 10:20:32 +08:00
z e6879f283d * adjust code for update. 2020-08-26 10:19:39 +08:00
qiyu-xie 1a9df49057 * Add task module lang. 2020-08-26 10:14:41 +08:00
z 35304da79a Merge branch '20.x' of github.com:easysoft/zentaopms into 20.x 2020-08-26 10:11:44 +08:00
z b55ef50a46 Merge branch '20.x' of github.com:easysoft/zentaopms into 20.x 2020-08-26 10:11:25 +08:00
leiyong aa6f7b5d5f * Finish task#7654. 2020-08-26 10:11:20 +08:00
z 8eb7358131 * adjust for check begin and end. 2020-08-26 10:10:01 +08:00
Catouse 2942519ed8 * improve UI of recentprogram block. 2020-08-26 09:56:55 +08:00
Catouse 413a53019e * refactor. 2020-08-26 09:56:55 +08:00
Catouse 24064443ac * change font size to 14 in menu and navbar. 2020-08-26 09:56:55 +08:00
Yagami d9e9623e07 Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x 2020-08-26 09:48:14 +08:00
Yagami ed353f7ebd * Fix en menu. 2020-08-26 09:47:58 +08:00
holan20180123 7b3c3b65a8 Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x 2020-08-26 09:46:50 +08:00
holan20180123 f6ec68ffe8 * Add English lang file for progranplan module. 2020-08-26 09:46:17 +08:00
tianshujie98 5095245438 Merge branch '20.x' of github.com:easysoft/zentaopms into 20.x 2020-08-26 09:32:30 +08:00
tianshujie98 82a3cdadde * Unified action/lang file. 2020-08-26 09:30:00 +08:00
Yagami 4240f51ae5 Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x 2020-08-26 09:23:26 +08:00
Yagami 77cf55dd79 * Fix system menu header. 2020-08-26 09:23:01 +08:00
holan20180123 bd2cf28ff1 Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x 2020-08-26 09:10:56 +08:00
holan20180123 f4ccf99b1d * Edit English lang file for user module. 2020-08-26 09:10:23 +08:00
tianshujie98 640bb8c7d3 Merge branch '20.x' of github.com:easysoft/zentaopms into 20.x 2020-08-26 09:06:41 +08:00
tianshujie98 41ecce79d5 * Add comment. 2020-08-26 09:05:49 +08:00
holan20180123 76628a20a5 * Add English lang file. 2020-08-26 09:02:43 +08:00
tianshujie98 2ea4545a7c Merge branch '20.x' of github.com:easysoft/zentaopms into 20.x 2020-08-26 08:35:48 +08:00
tianshujie98 00fe28cc80 * Unified button format. 2020-08-26 08:33:11 +08:00
Catouse f73b816280 * improve UI of program cards view. 2020-08-26 08:26:50 +08:00
tianshujie98 f71882401e Merge branch '20.x' of github.com:easysoft/zentaopms into 20.x 2020-08-26 08:12:27 +08:00
tianshujie98 89f8a86f3f * Add judgment when the database is empty. 2020-08-26 08:11:21 +08:00