Commit Graph
14662 Commits
Author SHA1 Message Date
wangyidong eba05eff7c Merge branch 'master' of github.com:easysoft/zentaopms 2019-02-21 15:36:25 +08:00
wangyidong 1b80201a5d * fix for show icon. 2019-02-21 15:35:08 +08:00
Yagami 806cf6761a * Code for task #5284. 2019-02-21 15:29:31 +08:00
wangyidong d1a1dba7f1 Merge branch 'master' of github.com:easysoft/zentaopms 2019-02-21 15:23:18 +08:00
wangyidong a594321eb5 * fix bug. 2019-02-21 15:23:03 +08:00
Yagami f49b2cb69a * Code for task #5284. 2019-02-21 15:15:17 +08:00
Yagami 1a09bbb3bb * Code for task #5284. 2019-02-21 15:13:09 +08:00
Yagami 9eccbad277 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-02-21 14:47:50 +08:00
Yagami c78b5cac38 * Code for task #5284. 2019-02-21 14:47:17 +08:00
wangyidong 373eb7dc03 Merge branch 'master' of github.com:easysoft/zentaopms 2019-02-21 14:24:40 +08:00
wangyidong 8460f65864 * fix for safe. 2019-02-21 14:20:43 +08:00
Yagami 9e2926aaa8 * Finish task #5286. 2019-02-21 14:15:08 +08:00
Yagami 413652c19f Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-02-21 13:49:29 +08:00
Yagami b623c536da * Finish task #5284. 2019-02-21 13:49:04 +08:00
wangyidong 2fe7444d26 * finish task #5303. 2019-02-21 13:33:42 +08:00
wangyidong 91c2085bc0 * finish task #5298. 2019-02-21 13:13:17 +08:00
wangyidong f102fd782c * finish task #5281. 2019-02-21 10:55:22 +08:00
wangyidong 399a57078e Merge branch 'master' of github.com:easysoft/zentaopms 2019-02-21 10:07:33 +08:00
wangyidong 4d03b12428 * adjust for custom menu. 2019-02-21 10:06:52 +08:00
Yagami 2a1f8df6cb Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-02-21 09:58:50 +08:00
Yagami 79ad5af58c * Finish task #5283. 2019-02-21 09:58:08 +08:00
reneeteng fce2b3241b * Lang changed. 2019-02-21 09:42:41 +08:00
Yagami 22759f3c56 * Finish task #5280. 2019-02-21 09:30:59 +08:00
Yagami 97dce2aa93 * Finish task #5273. 2019-02-21 09:12:53 +08:00
Yagami e0bc5ae107 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-02-21 08:54:56 +08:00
Yagami fd95328b4d * Fix task #5272. 2019-02-21 08:54:34 +08:00
wangyidong 9e3bdec8f8 * finish task #5301. 2019-02-20 19:58:03 +08:00
wangyidong 1d317c5fb3 * finish task #5278. 2019-02-20 18:01:00 +08:00
Yagami 4820641b36 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-02-20 15:54:37 +08:00
Yagami 6efbe82455 * Finish task #5309. 2019-02-20 15:53:47 +08:00
wangyidong 17fdbf84b8 Merge branch 'master' of github.com:easysoft/zentaopms 2019-02-20 14:35:02 +08:00
wangyidong 7bcd62dfdc * finish task #5279. 2019-02-20 14:34:22 +08:00
Yagami b5987e61a1 * Add autocomplete to front class. 2019-02-20 14:27:38 +08:00
Yagami 75c0f11b4f * Finish task #5272. 2019-02-20 13:59:05 +08:00
Yagami 8f3604ec7c * Finish task #5270. 2019-02-20 13:46:33 +08:00
Yagami b7651df91e * Finish task #5268. 2019-02-20 10:52:47 +08:00
Yagami ec66da7ced Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-02-20 10:48:20 +08:00
Yagami 1480e324af * Change the note. 2019-02-20 10:47:39 +08:00
Yagami c2121de201 * Finish task #5267. 2019-02-20 10:47:06 +08:00
reneeteng 17853c172a Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-02-20 09:59:15 +08:00
reneeteng ddf2014f10 *Upgrade lang changed. 2019-02-20 09:58:28 +08:00
wangyidong ac221ac35f Merge branch 'master' of github.com:easysoft/zentaopms 2019-02-19 17:18:43 +08:00
wangyidong e8d05a79bf * finish task #5310. 2019-02-19 17:17:07 +08:00
Yagami c8cc3619d9 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-02-19 17:14:19 +08:00
Yagami aec2573603 * Finish task #5311. 2019-02-19 17:13:56 +08:00
Catouse 2ef4099e1a * update zui and code for story #3578. 2019-02-19 14:22:38 +08:00
wangyidong 33b36fbabf Merge branch 'master' of github.com:easysoft/zentaopms 2019-02-19 11:26:39 +08:00
wangyidong b309c4a9c7 * adjust for children plan. 2019-02-19 11:25:50 +08:00
Catouse df175bb702 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-02-19 11:09:08 +08:00
Catouse 7d62e6582e * update zui and fix HTTP_X_REQUESTED_WITH param in ajax form. 2019-02-19 11:09:02 +08:00