Commit Graph
13937 Commits
Author SHA1 Message Date
Catouse f7db7a39ec Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-10-31 16:56:44 +08:00
Catouse 6a9fa87552 * update zui and finish backyard task #7081. 2018-10-31 16:56:31 +08:00
yfl 537f484576 * add title 2018-10-31 16:38:34 +08:00
yfl eb05c61122 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-10-31 16:22:10 +08:00
Catouse 8f93ca7875 * finish task #7106 and fix bug #1430. 2018-10-31 15:46:10 +08:00
wangyidong fb27ad2775 Merge branch 'master' of github.com:easysoft/zentaopms 2018-10-31 14:23:49 +08:00
wangyidong 9687651633 * adjust for export word. 2018-10-31 14:23:13 +08:00
Yagami 01fa8a628e * Finish task #7095. 2018-10-31 09:30:57 +08:00
Yagami 178905fccd Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-10-30 10:28:36 +08:00
Yagami ec15e13b25 * Finish task #7080. 2018-10-30 10:28:09 +08:00
wangyidong fb9a368cea * fix bug #2256. 2018-10-29 14:09:39 +08:00
Catouse fb1e83ffdc * fix bug #2255. 2018-10-29 13:49:52 +08:00
reneeteng e0a7489095 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-10-29 11:13:49 +08:00
reneeteng f9dcfd9323 * Bbug lang change. 2018-10-29 11:13:05 +08:00
Yagami 30c66ff864 * Fix child task export name. 2018-10-29 10:08:03 +08:00
reneeteng 57a736820d * Change lan. 2018-10-26 14:27:12 +08:00
reneeteng e394e2c5a6 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-10-26 14:22:50 +08:00
reneeteng 47abbc3e87 * Change lang 2018-10-26 14:21:51 +08:00
滔哥 617c1a40ac Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-10-26 11:18:19 +08:00
滔哥 f22ed2b6c2 * Fix bug. 2018-10-26 11:18:12 +08:00
wangyidong 9466e7193e Merge branch 'master' of github.com:easysoft/zentaopms 2018-10-26 10:49:10 +08:00
wangyidong bcaaed2692 * change for doc custom. 2018-10-26 10:48:43 +08:00
wangyidong 1b2965d3ad * fix bug for php5.3. 2018-10-26 10:48:23 +08:00
Catouse 487bc83361 * add fade effection. 2018-10-25 14:03:39 +08:00
Catouse d13b06db7a Merge branch 'master' of https://github.com/easysoft/zentaopms zentaopms_10.5.stable_20181025 2018-10-25 13:55:23 +08:00
Catouse faddacafef * improve kanban UI. 2018-10-25 13:55:17 +08:00
reneeteng 4d8a4f3aff Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-10-25 11:16:01 +08:00
reneeteng d6c0786d6e * Lang changed. 2018-10-25 11:15:21 +08:00
wangyidong 3314fb028d Merge branch 'master' of github.com:easysoft/zentaopms 2018-10-25 10:48:25 +08:00
wangyidong 25f860c6ef * fix for upgrade. 2018-10-25 10:48:03 +08:00
Catouse a0fbccf7ce Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-10-25 10:32:37 +08:00
Catouse 33cfcdea08 * improve kanban UI. 2018-10-25 10:32:31 +08:00
wangyidong 0944c9e8c9 * round estimate in browse page. 2018-10-25 10:21:08 +08:00
wangyidong d7e0222b1b * adjust for show queryBox by search. 2018-10-25 10:08:19 +08:00
wangyidong 0a19fbec29 Merge branch 'master' of github.com:easysoft/zentaopms 2018-10-25 09:33:38 +08:00
wangyidong 223db4372e * fix bug for upgrade. 2018-10-25 09:33:16 +08:00
wangyidong 2cd31f731e * change version and upgrade. 2018-10-25 09:30:44 +08:00
Yagami 78182537b1 * Delete doc search condition. 2018-10-25 09:06:31 +08:00
滔哥 4077923c22 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-10-25 07:57:42 +08:00
滔哥 51fb6934f1 * Fix bug. 2018-10-25 07:57:36 +08:00
Catouse 8ddea902dc * improve UI of kanban, finish task #5053. 2018-10-24 20:13:48 +08:00
Catouse e72654b335 * code for task #5039. 2018-10-24 19:59:52 +08:00
Catouse af0e3b1670 * finish task #5039. 2018-10-24 19:48:58 +08:00
wangyidong 8b483f751c * fix for appendOrder when orderby is empty. 2018-10-24 17:36:40 +08:00
wangyidong ca214c3a27 Merge branch 'master' of github.com:easysoft/zentaopms 2018-10-24 17:23:13 +08:00
wangyidong 2a0a11bb92 * add projectID for export tree and calendar. 2018-10-24 17:22:25 +08:00
滔哥 af842dfddb * Format code. 2018-10-24 16:18:41 +08:00
滔哥 033044acca Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-10-24 16:13:56 +08:00
滔哥 8c0940c039 * Fix bug. 2018-10-24 16:13:50 +08:00
Yagami b3540188da Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-10-24 15:21:26 +08:00