Commit Graph
13861 Commits
Author SHA1 Message Date
wangyidong 192a412426 Merge branch 'master' of github.com:easysoft/zentaopms 2019-12-12 14:38:39 +08:00
wangyidong ad947eb802 * finish task #6668. 2019-12-12 14:36:18 +08:00
guanxiying df74bb80cc * Finish task #6667. 2019-12-12 14:05:24 +08:00
wangyidong 4640b5dabb Merge branch 'master' of github.com:easysoft/zentaopms 2019-12-12 13:50:08 +08:00
wangyidong 2ff715ce71 * finish task #6672. 2019-12-12 13:48:52 +08:00
guanxiying 46b48a5363 * Fix bug #2462. 2019-12-12 13:35:59 +08:00
Yagami f4e0e729f3 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-12-12 13:17:56 +08:00
Yagami 3c2c1c4762 * Finish task #6684. 2019-12-12 13:17:42 +08:00
wangyidong f487b70a36 Merge branch 'master' of github.com:easysoft/zentaopms 2019-12-12 10:33:40 +08:00
wangyidong e0c079e6c3 * finish task #6697. 2019-12-12 10:13:29 +08:00
Yagami 35d81782ac * Finish task #6687. 2019-12-12 09:56:44 +08:00
guanxiying b0175bb868 * Fix bug #2475. 2019-12-12 09:48:54 +08:00
guanxiying afc452bc22 * Fix bug #2460. 2019-12-12 09:17:45 +08:00
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