Commit Graph
2792 Commits
Author SHA1 Message Date
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
滔哥 92601443c9 * Finish Task#3565. 2017-12-29 11:04:50 +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
滔哥 eee6b9d62f * Rollback Bug#1344. 2017-12-26 13:06:48 +08:00
滔哥 e9419639d6 * Fix bug. 2017-12-22 14:23:55 +08:00
wangyidong 1eeb0ca399 * change for zh-tw. 2017-12-22 10:08:54 +08:00
wangyidong 60ebe9fa2e * fix for upgrade. 2017-12-22 09:05:34 +08:00
Your Name 2089850a63 Merge branch 'master' of https://github.com/easysoft/zentaopms 2017-12-20 16:26:50 +08:00
Your Name 40a653554d * Fix Bug #1245. 2017-12-20 16:25:25 +08:00
tengfei 7df4d8febf Merge branch 'master' of https://github.com/easysoft/zentaopms 2017-12-20 16:13:58 +08:00
tengfei 117096919d bug open on change 2017-12-20 16:13:43 +08:00
wangyidong 5a915e7334 * adjust for bug printCell. 2017-12-20 15:41:01 +08:00
滔哥 674d840161 * Fix bug#1344 2017-12-20 11:21:53 +08:00
wangyidong 247fc74ec9 * fix bug #1340. 2017-12-20 09:15:20 +08:00
滔哥 1e05a84212 * Task#3467 2017-12-19 10:28:20 +08:00
滔哥 c4f8508e5a * Task#3467 2017-12-18 18:44:36 +08:00
滔哥 073ff8fdb4 * Format code 2017-12-14 18:27:26 +08:00
wangyidong 11d80a5d93 * finish task #3442. 2017-12-14 15:29:09 +08:00
wangyidong fc70d4ffdb * finish task #3491. 2017-12-14 14:06:47 +08:00
wangyidong 221291c0f3 * finish task #3429. 2017-12-13 15:52:36 +08:00
滔哥 dc817f3e54 Merge branch 'master' of https://github.com/easysoft/zentaopms 2017-12-13 10:09:32 +08:00
tengfei 7dacfb2f78 action-common 2017-12-13 09:54:06 +08:00
滔哥 a2672a6c44 * Task #3446 2017-12-12 17:42:42 +08:00
滔哥 fc235d0381 * Task #3440 2017-12-12 10:52:11 +08:00
滔哥 0f70d62399 * Task #3485 2017-12-08 16:18:43 +08:00
滔哥 5ee2c261f6 * Task#3436 2017-12-07 16:16:35 +08:00
滔哥 95c957e4bd * Task#3483 2017-12-07 15:27:37 +08:00
tengfei 8314d813cb 12/6 trans error done 2017-12-06 17:47:31 +08:00
Catouse b0feda7029 Merge branch 'master' of https://github.com/easysoft/zentaopms 2017-12-04 15:53:45 +08:00
wangyidong da6a23e7bc * fix bug #1132. 2017-12-04 15:24:27 +08:00
Catouse 5a76b904b3 * fix bug #1294. 2017-12-04 15:14:45 +08:00
wangyidong 6df5ea2645 * fix bug #1293. 2017-12-01 14:45:51 +08:00
滔哥 ba7422ca22 Merge branch 'master' of https://github.com/easysoft/zentaopms 2017-12-01 14:24:03 +08:00
滔哥 7b9b7d4a40 * Fix bug 2017-12-01 14:23:57 +08:00
wangyidong 18cb10cfa3 * fix bug #1306. 2017-12-01 13:48:33 +08:00
wangyidong ec8fcb6521 * change for export bug. 2017-11-23 16:53:06 +08:00
wangyidong 5d6609181d * fix bug #1265. 2017-11-10 11:23:22 +08:00
wangyidong 528c6934ee Merge branch 'master' of github.com:easysoft/zentaopms 2017-11-09 13:46:49 +08:00
wangyidong 7dd879c8d6 * finish task #3334,3323. 2017-11-09 13:46:10 +08:00
滔哥 e627415f6c * Fix bug 2017-11-09 13:39:41 +08:00
Xiying Guan f1ba417162 * Format codes. 2017-11-08 13:28:26 +08:00
wangyidong 7293086b45 * fix for required. 2017-11-06 16:57:13 +08:00
wangyidong fbc5b38585 * change for zh-tw lang. 2017-11-06 10:13:16 +08:00
wangyidong a10e725ba5 Finish task#3311 普通表格太宽时不要滚动整个页面,cost:2 left:0 2017-11-03 16:02:15 +08:00
wangyidong 38073d2ad7 * finish task #3310. 2017-11-03 13:22:27 +08:00
滔哥 0dc610f36b * fix score and child task bug 2017-11-03 00:27:58 +08:00
wangyidong d4dd502c31 Merge branch 'master' of github.com:easysoft/zentaopms 2017-11-01 13:28:14 +08:00