Commit Graph
13848 Commits
Author SHA1 Message Date
Yagami 97ed76efde Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-12-12 09:04:04 +08:00
Yagami d6f0dfb6bd * Finish task #6688. 2019-12-12 09:03:47 +08:00
wangyidong a76611d906 Merge branch 'master' of github.com:easysoft/zentaopms 2019-12-12 08:59:43 +08:00
wangyidong b68c0ace0f * finihsh task #6669. 2019-12-12 08:59:19 +08:00
wangyidong 5688747029 * fix page count. 2019-12-12 08:58:32 +08:00
guanxiying 83dbfde648 * Fix bug #2461. 2019-12-11 17:37:26 +08:00
guanxiying b5df580b60 * update user view when delete a project. 2019-12-11 17:37:22 +08:00
wangyidong 8a7c25b601 * finish task #6673. 2019-12-11 17:37:22 +08:00
Yagami e4bcb12af3 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-12-11 17:15:05 +08:00
Yagami 1553a3258c * Finish task #6689. 2019-12-11 17:14:47 +08:00
guanxiying db77ddfd47 * update user view when delete a project. 2019-12-11 16:41:43 +08:00
wangyidong ca4b178c7d * adjust for get file by object. 2019-12-11 16:09:03 +08:00
wangyidong ddddf58813 * finish task #6673. 2019-12-11 16:07:49 +08:00
wangyidong f1444e22fb * code for task #2335. 2019-12-11 15:24:09 +08:00
wangyidong f5fd7e5909 * finish task #6698. 2019-12-11 14:58:29 +08:00
wangyidong 97c7515b4c * finish task #6702. 2019-12-11 14:19:31 +08:00
wangyidong f4f330db30 * finish task #6703. 2019-12-11 14:04:11 +08:00
wangyidong 3b767bcf5e Merge branch 'master' of github.com:easysoft/zentaopms 2019-12-11 11:32:14 +08:00
wangyidong e619c68e58 * finish task #6705. 2019-12-11 11:31:48 +08:00
chenfei 125e2375f8 * Adjust variable name. 2019-12-11 11:15:00 +08:00
Yagami f686ca29be Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-12-11 09:56:29 +08:00
Yagami eac983c703 * Finish task #6730. 2019-12-11 09:56:11 +08:00
guanxiying 0b62823d89 * Fix bug #2463. 2019-12-11 08:59:13 +08:00
wangyidong 9d1e3969e8 * adjust for task #6709. 2019-12-10 17:08:58 +08:00
Yagami df18cbefb0 * Fix doc order. 2019-12-10 16:36:52 +08:00
wangyidong f8c530b3ee * code for task #6707. 2019-12-10 15:52:57 +08:00
wangyidong 52460dd80d * code for task #6708. 2019-12-10 15:45:06 +08:00
wangyidong 2d979228eb Merge branch 'master' of github.com:easysoft/zentaopms 2019-12-10 14:20:19 +08:00
wangyidong cd5c44f211 * rm useless code. 2019-12-10 14:07:42 +08:00
wangyidong 6630dd0bb7 * code for task #6708. 2019-12-10 13:55:01 +08:00
guanxiying 727c591a68 * Fix bug #2471. 2019-12-10 10:58:07 +08:00
guanxiying 0064f79335 * Fix miss ) bug. 2019-12-10 10:39:45 +08:00
wangyidong 8d0f8521ba * finish task #6623. 2019-12-09 14:29:43 +08:00
reneeteng 0e897d7963 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-12-06 14:50:57 +08:00
reneeteng 4e19d01118 * Update social media links. 2019-12-06 14:50:04 +08:00
wangyidong 995bfb84d5 * finish task #6651. 2019-12-06 14:05:43 +08:00
wangyidong f77442271e * finish task #6616. 2019-12-06 13:50:47 +08:00
wangyidong 7570923bc0 * finish task #6651. 2019-12-06 13:12:26 +08:00
wangyidong bfe2535178 * finish task #6649. 2019-12-06 09:29:59 +08:00
wangyidong ca9293ba98 * finish task #6627. 2019-12-06 08:49:05 +08:00
wangyidong 168ce93203 * finish task #6620. 2019-12-05 17:00:08 +08:00
wangyidong ae2c117104 * finish task #6640. 2019-12-05 14:26:30 +08:00
wangyidong 34fb809d31 * die for apiModel sql method. 2019-12-05 14:25:42 +08:00
wangyidong bedeaaf39e * code for tutorial. 2019-12-05 13:16:27 +08:00
wangyidong 7d6913d91c * finish task #6656. 2019-12-05 11:25:12 +08:00
wangyidong 2115b47e59 * adjust style for edit module. 2019-12-05 10:18:08 +08:00
wangyidong ebde890513 * finish task #6658. 2019-12-05 09:58:47 +08:00
wangyidong 5b2cdc573f * finish task #6659. 2019-12-05 09:33:32 +08:00
wangyidong 3d68e30c67 * finish task #6650. 2019-12-05 09:13:32 +08:00
wangyidong a4cf41780c * fix error. 2019-12-05 08:58:44 +08:00