Commit Graph
15174 Commits
Author SHA1 Message Date
tianshujie98 2a4927cfc6 * Adjust code style. 2020-11-06 10:08:46 +08:00
qiyu-xie a8d9f1d796 * Finish task#8211. 2020-11-06 09:28:53 +08:00
tianshujie98 838a05196d * Adjust code style. 2020-11-06 08:42:48 +08:00
hufangzhou 56c180f2ec * Finish task#8243. 2020-11-06 08:30:58 +08:00
hufangzhou 981f8b25ad * Adjust the indent of the code. 2020-11-05 17:39:08 +08:00
hufangzhou 4f61fbef1b Merge branch '12.x' of https://github.com/easysoft/zentaopms into 12.x 2020-11-05 16:29:55 +08:00
hufangzhou 0a30b6b09f * Fix a bug. 2020-11-05 16:29:43 +08:00
tianshujie98 dfb3c73551 * Adjust code style. 2020-11-05 16:29:18 +08:00
hufangzhou 6896823f78 Merge branch '12.x' of https://github.com/easysoft/zentaopms into 12.x 2020-11-05 16:05:24 +08:00
hufangzhou 76a793ab03 * Fix a bug. 2020-11-05 16:05:03 +08:00
tianshujie98 8a15ec21d9 * Fix bug. 2020-11-05 15:52:31 +08:00
tianshujie98 1db241cb43 * Fix bug. 2020-11-05 15:30:33 +08:00
tianshujie98 592a6b6a5c * Finish task #8197. 2020-11-05 13:23:17 +08:00
qiyu-xie 386114979d * Finish task#8230. 2020-11-05 11:28:35 +08:00
qiyu-xie 1ea321fea5 * Finish task#8239. 2020-11-05 11:10:53 +08:00
hufangzhou 1534428895 * Finish task#8196. 2020-11-05 09:53:40 +08:00
qiyu-xie 7a8e3bec38 * Finish task#8207. 2020-11-04 14:31:10 +08:00
tianshujie98 b400af6ffc * Finish task #8262. 2020-11-04 14:07:15 +08:00
z f1c5b256bf * code for task #8279. 2020-11-04 10:42:23 +08:00
z 6bb99132e2 Merge branch '12.x' of github.com:easysoft/zentaopms into 12.x 2020-11-04 10:38:43 +08:00
tianshujie98 d3356b1675 * Finish task #8228. 2020-11-04 10:36:36 +08:00
z eb53d44b81 * code for task #8279. 2020-11-04 10:33:20 +08:00
tianshujie98 770309794d * Add comment. 2020-11-04 10:12:49 +08:00
tianshujie98 1dd736e9ed * Finish task #8264. 2020-11-04 10:05:51 +08:00
qiyu-xie 47aa8bd9b5 * Finish task#8212. 2020-11-04 09:58:15 +08:00
qiyu-xie 0e31686cdc * Finish task#8219. 2020-11-04 09:15:45 +08:00
hufangzhou 43174e39ec * Finish task#8200: Add the lib field for search testcase. 2020-11-04 09:06:41 +08:00
hufangzhou 18bd8a6e26 Merge branch '12.x' of https://github.com/easysoft/zentaopms into 12.x 2020-11-03 17:41:51 +08:00
hufangzhou 7ef58a2d40 * Add the title of the doc. 2020-11-03 17:41:31 +08:00
tianshujie98 fd4876f1d0 * Adjust code style. 2020-11-03 17:30:47 +08:00
hufangzhou 07ff6c4b84 Merge branch '12.x' of https://github.com/easysoft/zentaopms into 12.x 2020-11-03 17:27:04 +08:00
hufangzhou a13f8cd4c0 * Adjust the logic of the assigned to. 2020-11-03 17:26:51 +08:00
tianshujie98 a2a50698ee * Finish task #8199. 2020-11-03 17:25:01 +08:00
hufangzhou 4ea37d68a2 Merge branch '12.x' of https://github.com/easysoft/zentaopms into 12.x 2020-11-03 16:49:19 +08:00
hufangzhou a6e6f7a8a2 * Finish task#8201: Add the assignedTo field for the start task page. 2020-11-03 16:49:03 +08:00
qiyu-xie 066046658d * Finish task#8240. 2020-11-03 16:10:02 +08:00
qiyu-xie f60cc9d374 * Finish task#8221. 2020-11-03 15:34:25 +08:00
holan20180123 43089f346b * Finish task #8235. 2020-11-03 14:58:17 +08:00
holan20180123 18db4d9740 * Finish task #8229. 2020-11-03 13:55:06 +08:00
hufangzhou 3e591a2d60 Merge branch '12.x' of https://github.com/easysoft/zentaopms into 12.x 2020-11-03 11:31:07 +08:00
hufangzhou 0669bbab5a * Fix bug#3410: the display of the doc title. 2020-11-03 11:30:54 +08:00
tianshujie98 8be947a1e8 * Finish task #8195. 2020-11-03 10:52:38 +08:00
guanxiying c9026fd5ca Merge branch '12.x' of github.com:easysoft/zentaopms into 12.x 2020-11-02 16:35:27 +08:00
guanxiying 7bcea20380 * Add bind and oauth register function. 2020-11-02 16:33:22 +08:00
guanxiying 7f1029c349 * Add usermodel::login function 2020-11-02 16:31:10 +08:00
guanxiying b29244195c * Add login function. 2020-11-02 16:30:38 +08:00
holan20180123 37c672a2ed * Fix bug #2490. 2020-11-02 10:08:23 +08:00
z 2c36700bc1 * adjust for install. 2020-11-01 09:03:45 +08:00
z 1bccfd5744 * add new version and upgrade. 2020-10-30 10:40:00 +08:00
z bd59b4a920 * finish task #12974. 2020-10-29 13:24:46 +08:00