Commit Graph
18420 Commits
Author SHA1 Message Date
tianshujie98 ec58e2b528 * Adjust code style. 2020-11-13 14:16:33 +08:00
tianshujie98 a5eecec8aa * Adjust code style. 2020-11-13 13:20:42 +08:00
tianshujie98 7d18efad03 * Adjust code style. 2020-11-13 13:11:39 +08:00
holan20180123 fb9c44d0a1 * Finish task #8194. 2020-11-13 11:28:25 +08:00
holan20180123 ea9c93ba1c * Finish task #8194. 2020-11-13 09:18:26 +08:00
holan20180123 673693fbcd Merge branch '12.x' of https://github.com/easysoft/zentaopms into 12.x 2020-11-13 09:08:25 +08:00
holan20180123 583790a08e * Finish task #8194. 2020-11-13 09:08:04 +08:00
tianshujie98 8a20821f92 * Adjust code style. 2020-11-13 08:09:21 +08:00
qiyu-xie 9c0b8b1d22 * Finish task#8198. Fix bug. 2020-11-12 21:39:55 +08:00
z 3e28b36de7 Merge branch '12.x' of github.com:easysoft/zentaopms into 12.x 2020-11-12 17:21:38 +08:00
z 7e44e5b761 * code for story #8776. 2020-11-12 17:20:17 +08:00
tianshujie98 f08eaf98a1 * Finish task #8203. 2020-11-12 16:50:03 +08:00
qiyu-xie eca30c5d4a * Finish task#8198. Modify edit. 2020-11-12 16:30:58 +08:00
holan20180123 3ae9a9189e * Finish task #8194. 2020-11-12 16:25:23 +08:00
holan20180123 4e69741e70 * Finish task #8194. 2020-11-12 14:18:08 +08:00
z 70335707c8 * finish task #2669. 2020-11-12 11:31:03 +08:00
holan20180123 728ff92cf6 * Finish task #8194. 2020-11-12 11:25:05 +08:00
holan20180123 e9286e13d8 * Finish task #8194. 2020-11-12 11:04:17 +08:00
hufangzhou 8acfd6867f * Finish task#8205. 2020-11-12 10:49:33 +08:00
qiyu-xie 4ea3dc9f67 * Finish task#8198. 2020-11-12 10:35:07 +08:00
holan20180123 5fabab2a63 Merge branch '12.x' of https://github.com/easysoft/zentaopms into 12.x 2020-11-12 10:13:05 +08:00
holan20180123 a7533f722d * Finish task #8194. 2020-11-12 10:09:16 +08:00
z 189617857c Merge branch '12.x' of github.com:easysoft/zentaopms into 12.x 2020-11-12 09:26:11 +08:00
z 154ace870a * finish task #8265. 2020-11-12 09:25:13 +08:00
holan20180123 547ecde44d * Finish task #8194. 2020-11-11 16:11:27 +08:00
z e330353df3 Merge branch '12.x' of github.com:easysoft/zentaopms into 12.x 2020-11-11 15:41:06 +08:00
z 9eeae95349 Merge branch '12.x' of github.com:easysoft/zentaopms into 12.x 2020-11-11 15:40:47 +08:00
holan20180123 2d0ffc2b4a * Finish task #8194. 2020-11-11 15:40:26 +08:00
z 8021dd79c8 * adjust for minifyfront. 2020-11-11 15:34:46 +08:00
Catouse 30637fbca1 * task #8244, bug #3543, fix recording wrong user ip on user login. 2020-11-11 14:53:37 +08:00
z 24e55f7d2f * fix bug for validater. 2020-11-11 14:45:45 +08:00
z 305ceda937 * finish task #3665. 2020-11-11 14:43:05 +08:00
Catouse 279674a78a * task #8233, bug #3567, fix server url in im/debug view. 2020-11-11 13:53:00 +08:00
holan20180123 c241b1051f * Finish task #8194. 2020-11-11 13:32:01 +08:00
holan20180123 55b26ce3cd Merge branch '12.x' of https://github.com/easysoft/zentaopms into 12.x 2020-11-11 11:18:31 +08:00
holan20180123 15e8463347 * Finish task #8194. 2020-11-11 11:18:08 +08:00
Catouse 2593bbe991 * task #8234, bug #3565, fix stripedRows setting of table not work in kindeditor, see http://pms.zentao.net/bug-view-3565.html 2020-11-11 09:56:07 +08:00
Catouse 691048885f * task #8225, bug #3577, improve UI of picker. 2020-11-10 16:58:10 +08:00
holan20180123 de05a29a06 * Finish task #8255. 2020-11-10 16:53:29 +08:00
Catouse 6e6761546e * task #8224, bug #3578, update zentao-integrated file for zentao client extension. 2020-11-10 15:38:09 +08:00
Catouse 1becf91146 * task #8227, bug #3575, enable submit button on check hours. 2020-11-10 15:10:15 +08:00
holan20180123 498256388a Merge branch '12.x' of https://github.com/easysoft/zentaopms into 12.x 2020-11-10 14:06:12 +08:00
holan20180123 f80458f916 * Finish task #8194. 2020-11-10 14:06:00 +08:00
tianshujie98 97e77a11bc * Finish task #8202. 2020-11-10 11:44:22 +08:00
holan20180123 159cd5c41d * Finish task #8194. 2020-11-10 10:34:08 +08:00
tianshujie98 a10b52f3c6 Merge branch '12.x' of github.com:easysoft/zentaopms into 12.x 2020-11-10 10:10:01 +08:00
tianshujie98 b35cd2d1f2 * Fix bug. 2020-11-10 10:09:50 +08:00
holan20180123 bff623a7bc * Finish task #8194. 2020-11-10 09:31:52 +08:00
holan20180123 60402b9629 Merge branch '12.x' of https://github.com/easysoft/zentaopms into 12.x 2020-11-10 08:49:26 +08:00
holan20180123 8b1e4808c2 * Finish task #8194. 2020-11-10 08:49:00 +08:00