Commit Graph
100 Commits
Author SHA1 Message Date
wangyidong 95ce4d6f70 * change for demo. 2018-01-18 10:16:46 +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
wangyidong 2ba5e585dc Merge branch 'master' of github.com:easysoft/zentaopms 2018-01-17 11:11:37 +08:00
wangyidong 4e8b9f23d4 * change for misc changelog. 2018-01-17 11:10:58 +08:00
wangyidong 9aa48ff9f3 * add for changelog. 2018-01-17 10:58:03 +08:00
wangyidong a4d4683a93 * fix bug #1347. 2018-01-17 10:43:13 +08:00
wangyidong e072f2e95c Merge branch 'master' of github.com:easysoft/zentaopms 2018-01-17 10:10:36 +08:00
wangyidong e3317e2317 * fix bug #1377. 2018-01-17 10:10:02 +08:00
wangyidong fb5796b4c8 * adjust for message notice. 2018-01-16 17:18:54 +08:00
wangyidong 68f13738ea * fix bug #1385. 2018-01-16 16:36:18 +08:00
wangyidong 2c545e7ef1 * fix bug #1382. 2018-01-16 16:28:19 +08:00
wangyidong e92a36c947 * fix bug #1363. 2018-01-16 16:01:43 +08:00
wangyidong 1a593e062f * adjust for story report page. 2018-01-16 15:13:32 +08:00
wangyidong 4ca6479a21 Merge branch 'master' of github.com:easysoft/zentaopms 2018-01-16 15:08:42 +08:00
wangyidong 9af7afb162 * adjust for send notice to self. 2018-01-16 15:08:09 +08:00
wangyidong e83360f474 * adjust for print assigntome block. 2018-01-16 14:52:57 +08:00
wangyidong 037213761d * adjust for print assigntome block. 2018-01-16 14:26:38 +08:00
wangyidong 277dc2c2ec * change for upgrade. 2018-01-16 14:06:16 +08:00
wangyidong 80ed7e727f * fix bug. 2018-01-16 10:47:33 +08:00
wangyidong 99ca9c0fe7 Merge branch 'master' of github.com:easysoft/zentaopms 2018-01-16 10:29:02 +08:00
wangyidong 64f7ac5c32 Merge branch 'master' of github.com:easysoft/zentaopms 2018-01-16 10:28:48 +08:00
wangyidong 5dddac711b * adjus for todo to story and bug. 2018-01-16 10:25:51 +08:00
wangyidong d49cc7d23f * finish task #3559. 2018-01-15 14:12:00 +08:00
wangyidong f8dff350ae Merge branch 'master' of github.com:easysoft/zentaopms 2018-01-15 11:28:22 +08:00
wangyidong be5f8e7876 * finish task #3569. 2018-01-15 11:28:00 +08:00
wangyidong dc9de38e46 Merge branch 'master' of github.com:easysoft/zentaopms 2018-01-15 09:39:19 +08:00
wangyidong b387a55a3d * finish task #3572. 2018-01-15 09:38:46 +08:00
wangyidong 1a13bff2c0 Merge branch 'master' of github.com:easysoft/zentaopms 2018-01-12 10:02:36 +08:00
wangyidong b4446d53fc * finish task #3568. 2018-01-12 10:02:00 +08:00
wangyidong e75acb4b95 Merge branch 'master' of github.com:easysoft/zentaopms 2018-01-11 16:59:50 +08:00
wangyidong 4cc371b757 * finish task #3583. 2018-01-11 16:59:27 +08:00
wangyidong 0d77963c0a Merge branch 'master' of github.com:easysoft/zentaopms 2018-01-11 11:07:37 +08:00
wangyidong bd1ea46a9c * finish task #3560. 2018-01-11 11:05:50 +08:00
wangyidong 6301f40a61 Merge branch 'master' of github.com:easysoft/zentaopms 2018-01-08 15:51:49 +08:00
wangyidong b10b13b4b8 * finish task #3562. 2018-01-08 15:50:53 +08:00
wangyidong cf8b8902b4 * code for task #3579. 2018-01-05 09:15:59 +08:00
wangyidong 607076205e * finish task #3579. 2018-01-04 17:28:51 +08:00
wangyidong e35451994c * finish task #3582. 2018-01-04 14:18:49 +08:00
wangyidong ae2cd0e4a0 Merge branch 'master' of github.com:easysoft/zentaopms 2018-01-04 14:12:26 +08:00
wangyidong 8a9ad3f23a * finish task #3584. 2018-01-04 14:12:02 +08:00
wangyidong b5f462607c Merge branch 'master' of github.com:easysoft/zentaopms 2018-01-04 09:47:01 +08:00
wangyidong 783c5acfa3 * finish task #3570. 2018-01-04 09:46:30 +08:00
wangyidong 9f7b5146e8 Merge branch 'master' of github.com:easysoft/zentaopms 2018-01-03 16:40:44 +08:00
wangyidong fad9e34e8d * finish task #3585. 2018-01-03 16:40:27 +08:00
wangyidong 0ec4afb68b * finish task #3558. 2018-01-02 08:55:33 +08:00
wangyidong b36436dcf6 Merge branch 'master' of github.com:easysoft/zentaopms 2017-12-29 17:01:57 +08:00
wangyidong 9abd1d6cf3 * finish task #3588. 2017-12-29 17:01:35 +08:00
wangyidong 1e547a4bed Merge branch 'master' of github.com:easysoft/zentaopms 2017-12-29 11:27:19 +08:00
wangyidong d71d582f3d * adjust code. 2017-12-29 11:25:53 +08:00
wangyidong a8a1d0c11c * fix bug for search in link story. 2017-12-28 10:16:44 +08:00
wangyidong ee5036c632 * fix error with zget. 2017-12-28 09:59:06 +08:00
wangyidong f1e5a2c6dd * fix bug #1362. 2017-12-27 17:55:48 +08:00
wangyidong 0dad383f67 * fix bug #1352. 2017-12-27 17:36:32 +08:00
wangyidong 9cf249835e * fix bug for custom story review. 2017-12-27 17:29:20 +08:00
wangyidong 706fc34c5a Merge branch 'master' of github.com:easysoft/zentaopms 2017-12-27 16:22:28 +08:00
wangyidong 2bea6f457a * fix bug #1356. 2017-12-27 16:21:59 +08:00
wangyidong d09eabbad8 * fix bug and delete test code. 2017-12-26 16:40:18 +08:00
wangyidong f038c37608 * fix bug for ajax custom in english. 2017-12-25 10:12:21 +08:00
wangyidong 9e06211e66 * adjust for install cron lang. 2017-12-22 16:21:11 +08:00
wangyidong 2e83fc72f5 * change for changelog. 2017-12-22 10:13:23 +08:00
wangyidong 1eeb0ca399 * change for zh-tw. 2017-12-22 10:08:54 +08:00
wangyidong 63635f8716 * fix bug. 2017-12-22 10:05:26 +08:00
wangyidong 67a0089814 Merge branch 'master' of github.com:easysoft/zentaopms 2017-12-22 09:06:02 +08:00
wangyidong 60ebe9fa2e * fix for upgrade. 2017-12-22 09:05:34 +08:00
wangyidong cc8bf62fe5 * fix bug #1008. 2017-12-21 15:27:01 +08:00
wangyidong ee157b0e84 * fix bug #1342. 2017-12-21 15:18:16 +08:00
wangyidong c81d3a4ee7 Merge branch 'master' of github.com:easysoft/zentaopms 2017-12-21 14:51:28 +08:00
wangyidong c7d758b6f0 * fix bug #1337. 2017-12-21 14:50:49 +08:00
wangyidong 318c120538 Merge branch 'master' of github.com:easysoft/zentaopms 2017-12-21 11:22:33 +08:00
wangyidong 9e628c464b * fix bug for export with child. 2017-12-21 11:22:10 +08:00
wangyidong c6778fdd17 * adjust for doc showfiles page. 2017-12-20 17:04:55 +08:00
wangyidong afb023fca9 Merge branch 'master' of github.com:easysoft/zentaopms 2017-12-20 16:47:01 +08:00
wangyidong a42b0008c9 * adjust for demo. 2017-12-20 16:46:42 +08:00
wangyidong 6b3ed58d8b Merge branch 'master' of github.com:easysoft/zentaopms 2017-12-20 16:10:56 +08:00
wangyidong b7ce9dc971 * adjust for story field for custom. 2017-12-20 16:10:34 +08:00
wangyidong f0c123d2a8 * change for show demo in login. 2017-12-20 15:42:48 +08:00
wangyidong 32d218b92f * change for english demo. 2017-12-20 15:42:04 +08:00
wangyidong 5a915e7334 * adjust for bug printCell. 2017-12-20 15:41:01 +08:00
wangyidong 271b52a889 * fix bug #1330. 2017-12-20 11:17:05 +08:00
wangyidong 292d447578 Merge branch 'master' of github.com:easysoft/zentaopms 2017-12-20 10:45:11 +08:00
wangyidong 61d1e0ceec * fix bug for checked. 2017-12-20 10:44:49 +08:00
wangyidong 1829ecd6e7 Merge branch 'master' of github.com:easysoft/zentaopms 2017-12-20 09:15:43 +08:00
wangyidong 247fc74ec9 * fix bug #1340. 2017-12-20 09:15:20 +08:00
wangyidong 6574cecec4 Merge branch 'master' of github.com:easysoft/zentaopms 2017-12-19 17:21:43 +08:00
wangyidong 5c7ff9a216 * fix bug #1283. 2017-12-19 17:21:19 +08:00
wangyidong bd0694658c * adjust for project story. 2017-12-19 14:18:51 +08:00
wangyidong a0b1844984 Merge branch 'master' of github.com:easysoft/zentaopms 2017-12-19 14:00:27 +08:00
wangyidong ab4f445f19 * finish task #3475. 2017-12-19 14:00:08 +08:00
wangyidong ae57a9827f Merge branch 'master' of github.com:easysoft/zentaopms 2017-12-19 10:00:07 +08:00
wangyidong 39d39bc4d8 * finish task #3444. 2017-12-19 09:59:40 +08:00
wangyidong aeaaeb67d8 * fix bug for cache. 2017-12-18 17:30:01 +08:00
wangyidong c5d8eec378 Merge branch 'master' of github.com:easysoft/zentaopms 2017-12-18 17:17:01 +08:00
wangyidong 1060a606c6 * finish task #3455. 2017-12-18 17:16:34 +08:00
wangyidong 4e920d9133 Merge branch 'master' of github.com:easysoft/zentaopms 2017-12-18 14:36:54 +08:00
wangyidong 44bc56562f * finish task #3395. 2017-12-18 14:36:24 +08:00
wangyidong 5dab74c631 * finish task #3480. 2017-12-18 10:34:34 +08:00
wangyidong 020acf5f43 Merge branch 'master' of github.com:easysoft/zentaopms 2017-12-18 10:02:39 +08:00
wangyidong a68fe9adcd * finish task 3463. 2017-12-18 10:01:08 +08:00