Commit Graph
10750 Commits
Author SHA1 Message Date
wumo e7eedb4129 * Modify the prompt information when the user account is invalid 2018-03-16 15:35:13 +08:00
wumo eb45ec5a31 Merge branch 'zentaopms_9.8' of github.com:easysoft/zentaopms into zentaopms_9.8 2018-03-16 14:04:45 +08:00
wumo c817f579f4 * Fix the bug of delete in todo view page. 2018-03-16 14:03:42 +08:00
wangyidong 87a0679cbf * finish task #3720. 2018-03-16 13:23:16 +08:00
wangyidong 3a2cb30741 * finish task #3702. 2018-03-16 11:36:11 +08:00
wangyidong ecf59d2a97 Merge branch 'zentaopms_9.8' of github.com:easysoft/zentaopms into zentaopms_9.8 2018-03-15 16:38:37 +08:00
wangyidong adb6d59087 * finish task #3724. 2018-03-15 16:38:08 +08:00
wumo b4d93a9b7e Merge branch 'zentaopms_9.8' of github.com:easysoft/zentaopms into zentaopms_9.8 2018-03-15 15:45:42 +08:00
wumo 22afb60591 * Show pictures when edit product. 2018-03-15 15:44:26 +08:00
wangyidong e7189afaaf * finish task #3705. 2018-03-15 15:00:23 +08:00
wangyidong 4178e93824 * finish task #3701. 2018-03-15 14:52:35 +08:00
wangyidong d715b2ab99 * finish task #3669. 2018-03-15 13:33:34 +08:00
wangyidong 56a4f70e1a * finish task #3731. 2018-03-15 13:20:43 +08:00
wangyidong 9d0261a578 Merge branch 'zentaopms_9.8' of github.com:easysoft/zentaopms into zentaopms_9.8 2018-03-15 11:21:49 +08:00
wangyidong fb8b43ea4b * finish task #3726. 2018-03-15 11:19:26 +08:00
wumo aad4e06ca6 * roll back the config file.
* Check the legality of the mailbox when edit profile.
2018-03-15 11:06:43 +08:00
wumo e76ac1b147 * Test 2018-03-15 09:05:43 +08:00
wumo eb88de6a3f * Modify the error date in Changelog
* Adjust the order of product plan table columns.
2018-03-14 20:13:50 +08:00
wumo 75c8a6d18a * Add release time of the Modify log. 2018-03-14 17:22:32 +08:00
wumo 4ea0e404e1 * Display empty when delete product line
* Default assigned to the task creator when completed
2018-03-14 16:17:23 +08:00
wumo 6e2614f1e9 Merge branch 'zentaopms_9.8' of https://github.com/easysoft/zentaopms into zentaopms_9.8 2018-03-14 15:24:29 +08:00
wangyidong 9587e0bffc Merge branch 'zentaopms_9.8' of github.com:easysoft/zentaopms into zentaopms_9.8 2018-03-14 15:22:21 +08:00
wangyidong 5744a32e0f * finish task #3713. 2018-03-14 15:21:41 +08:00
wumo 38ca1a2c42 * Show the address link of download 2018-03-14 15:17:25 +08:00
wumo beee7b6850 * Show empty when there is no task 2018-03-14 14:02:11 +08:00
wumo cdb834b36a * Display the module level completely 2018-03-14 11:26:58 +08:00
wumo 2bbd10daae Merge branch 'zentaopms_9.8' of https://github.com/easysoft/zentaopms into zentaopms_9.8 2018-03-14 11:11:19 +08:00
wumo 479cf51461 Display the moduel level completely 2018-03-14 11:11:12 +08:00
wangyidong 40318ec8ad * finish task #3683. 2018-03-14 10:56:16 +08:00
wangyidong 0518e473a3 * finish task #3678. 2018-03-14 10:03:32 +08:00
wangyidong e5981e9643 * finish task #3680. 2018-03-14 09:58:24 +08:00
wangyidong 5e6d6aefe7 * finish task #3672. 2018-03-13 17:34:20 +08:00
wangyidong 17c161dc74 * finish task #3665. 2018-03-13 17:14:02 +08:00
wangyidong c8393b9e08 * finish task #3664. 2018-03-13 16:40:07 +08:00
wangyidong d35e51a15a * merge new change. 2018-03-13 12:26:20 +08:00
wangyidong dde68dcf1b * change for create ext dir. 2018-03-13 11:51:38 +08:00
wangyidong 8d64b4c9eb * change for 9.8.1 version. 2018-03-13 11:29:28 +08:00
wwccss 341a9ce721 * Remove English part from it. zentaopms_9.8_20180118 2018-01-18 12:17:47 +08:00
wwccss 474da336c1 * adjust Install module. 2018-01-18 12:11:59 +08:00
wwccss 74da1e424f * Split into License.EN and LICENSE.CN 2018-01-18 12:06:23 +08:00
dajiao007 8509e89b2b delete comma 2018-01-18 11:34:11 +08:00
wangyidong 3ef04af11b * adjust for productplan view. 2018-01-18 11:16:57 +08:00
wangyidong 95ce4d6f70 * change for demo. 2018-01-18 10:16:46 +08:00
dajiao007 18b6e57e84 modify translations of 'unconfirmed bug' 2018-01-17 16:09:19 +08:00
dajiao007 3b54116544 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-01-17 16:02:39 +08:00
dajiao007 2a8146f6fb modify translations of admin module 2018-01-17 16:01:59 +08:00
滔哥 a9dde0e3b4 * Format code. 2018-01-17 13:50:06 +08:00
wangyidong 577e5fbbbd * fix for group case. 2018-01-17 13:19:19 +08:00
wangyidong acce6ed11a Merge branch 'master' of github.com:easysoft/zentaopms 2018-01-17 13:03:54 +08:00
wangyidong 1d47fe7379 * fix for changelog. 2018-01-17 13:03:26 +08:00