Commit Graph
6940 Commits
Author SHA1 Message Date
chenfeiCF a4a8120beb * finish task #2774. 2016-11-21 13:13:30 +08:00
wangyidong 30eafa9b80 Merge branch 'master' of github.com:easysoft/zentaopms 2016-11-21 12:04:13 +08:00
wangyidong c4e8cef7f8 * finish task #2776. 2016-11-21 12:03:44 +08:00
chenfeiCF 332f262b54 * finish task #2739. 2016-11-21 10:48:51 +08:00
chenfeiCF b32c4eb6de * fix bug when get story tasks. 2016-11-21 10:26:29 +08:00
chenfeiCF 1cf66e4b78 * finish task #2758. 2016-11-21 10:03:59 +08:00
wangyidong 21c11b9edb * finish task #2783. 2016-11-21 09:57:06 +08:00
wangyidong a886430fd0 * finish task #2779. 2016-11-21 09:19:01 +08:00
wangyidong b3432912e5 * finish task #2779. 2016-11-18 17:33:49 +08:00
wangyidong 8824427340 Merge branch 'master' of github.com:easysoft/zentaopms 2016-11-18 17:18:30 +08:00
wangyidong 3aa41586a7 * finish task #2692. 2016-11-18 17:17:55 +08:00
wangyidong 582e392429 * code for task #2699,2791. 2016-11-18 17:12:09 +08:00
chenfeiCF db7859a808 * finish task #2707. 2016-11-18 16:51:55 +08:00
chenfeiCF 08ce64e737 * finish task #2701. 2016-11-18 15:26:31 +08:00
chenfeiCF 3041a53124 * finish task #2709. 2016-11-18 13:13:13 +08:00
wangyidong f1d1663d4f Merge branch 'master' of github.com:easysoft/zentaopms 2016-11-18 13:12:23 +08:00
Catouse 846804cbcb Merge branch 'master' of https://github.com/easysoft/zentaopms 2016-11-18 11:12:31 +08:00
chenfeiCF 4ae5f6e018 * finish task #2697. 2016-11-18 09:46:52 +08:00
Catouse a6210b9eb7 Merge branch 'master' of https://github.com/easysoft/zentaopms 2016-11-17 17:32:54 +08:00
Catouse 88b0595290 * finish task #2734. 2016-11-17 17:32:10 +08:00
chenfeiCF 0bcb1b5cc8 * finish task #2713. 2016-11-17 17:25:16 +08:00
wangyidong f3dbc6f52a * adjust for notice when view deny doc. 2016-11-17 15:24:55 +08:00
chenfeiCF 58693b20c3 * finish task #2706. 2016-11-17 15:04:16 +08:00
chenfeiCF 6dfdf69b6f Merge branch 'master' of github.com:easysoft/zentaopms 2016-11-17 14:43:59 +08:00
chenfeiCF befa5a2a80 * finish task #2704. 2016-11-17 14:42:06 +08:00
Catouse fd7742ce14 Merge branches 'master' and 'master' of https://github.com/easysoft/zentaopms 2016-11-17 14:37:22 +08:00
Catouse e9b329df4c * finish task #2723. 2016-11-17 14:36:28 +08:00
chenfeiCF 9fba07add1 * finish task #2702. 2016-11-17 14:10:52 +08:00
wangyidong ea6244405f Merge branch 'master' of github.com:easysoft/zentaopms 2016-11-17 13:34:55 +08:00
wangyidong fb5bb21f97 * change for afterexec css. 2016-11-17 13:34:25 +08:00
chenfeiCF 9be3d4b00e * finish task #2700. 2016-11-17 13:32:21 +08:00
wangyidong 120ac37bdc * change for upgrade 8.3.1. 2016-11-17 13:13:57 +08:00
wangyidong 67a54b2c42 Merge branch 'master' of github.com:easysoft/zentaopms 2016-11-17 11:37:19 +08:00
wangyidong 35594d8d50 * change for doc priv. 2016-11-17 11:36:53 +08:00
wangyidong c49352eca5 * fix bug for doc view link. 2016-11-17 11:36:29 +08:00
wangyidong 0a2bb5b52c * change for upgrade. 2016-11-17 11:36:04 +08:00
wangyidong b4fd8e184f * change for sendcloud async. 2016-11-17 11:35:24 +08:00
chenfeiCF 86439a699e * finish task #2695. 2016-11-17 11:22:14 +08:00
chenfeiCF 45ff373197 * finish task #2694. 2016-11-17 09:02:25 +08:00
chenfeiCF e8bcd89181 * finish task #2683. 2016-11-16 13:19:57 +08:00
chenfeiCF dd4e5d63f3 * finish task #2690. 2016-11-16 10:17:32 +08:00
wangyidong f605f772c9 Merge branch 'master' of github.com:easysoft/zentaopms 2016-11-15 18:04:19 +08:00
wangyidong 3559b3c03e * finish task #2786. 2016-11-15 18:03:29 +08:00
chenfeiCF e2d06a1858 * finish task #2778. 2016-11-15 17:35:29 +08:00
chenfeiCF c4878d4522 * finish task #2784. 2016-11-15 16:59:44 +08:00
wangyidong 8bea7509c3 Merge branch 'master' of github.com:easysoft/zentaopms 2016-11-15 15:53:00 +08:00
wangyidong 314190a3de * finish task #2796. 2016-11-15 15:52:29 +08:00
wangyidong e7991f415b * finish task #2798. 2016-11-15 14:59:42 +08:00
Renee 90312c8124 Update en.php 2016-11-15 14:46:58 +08:00
chenfeiCF 49c5f6346b * finish task #2693. 2016-11-15 14:45:57 +08:00