Commit Graph
15411 Commits
Author SHA1 Message Date
wangyidong 6143a0ae5b * adjust for user contact. 2019-05-31 10:31:00 +08:00
Yagami 7aa9cb1be3 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-05-31 10:14:50 +08:00
Yagami cf6c4f9359 * Fix story and doc span style. 2019-05-31 10:14:18 +08:00
Catouse f15df4e8c6 * upgrade zui files. 2019-05-31 10:11:51 +08:00
Catouse 76b8e28e83 * update zentao logo in login view for english version. 2019-05-31 10:11:22 +08:00
Catouse c397d5d545 * update zentao logo for english version. 2019-05-31 10:10:54 +08:00
wangyidong f98cad1eaf Merge branch 'master' of github.com:easysoft/zentaopms 2019-05-31 09:20:06 +08:00
wangyidong 9c1416edea * finish task #5565. 2019-05-31 09:19:45 +08:00
Yagami a6dde2652b Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-05-31 09:13:21 +08:00
Yagami cb78bc7afe * Finish task #5459. 2019-05-31 09:13:03 +08:00
wangyidong 01286bd284 adjust for fixFeatureBar. 2019-05-30 17:44:03 +08:00
wangyidong 0d2d17e9ad Merge branch 'master' of github.com:easysoft/zentaopms 2019-05-30 17:42:00 +08:00
wangyidong aca82aeded * finish task #5578. 2019-05-30 17:41:44 +08:00
wangyidong 9340af1598 * support ntlm. 2019-05-30 17:41:15 +08:00
wangyidong 2939be79aa * adjust for profile page. 2019-05-30 17:40:48 +08:00
reneeteng 9ab09b0a2b * To lang update. 2019-05-30 16:42:44 +08:00
reneeteng 78c230adea Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-05-30 15:45:37 +08:00
reneeteng 02245a104d * Lang file update. 2019-05-30 15:45:17 +08:00
Yagami fe465ed8d6 * Finish task #5610. 2019-05-30 15:01:38 +08:00
Yagami 66e4e3baf1 * Finish task #5457. 2019-05-30 14:50:08 +08:00
Yagami 09bddc2b30 * Finish task #5457. 2019-05-30 14:22:32 +08:00
Yagami 6df4c62727 * Finish task #5457. 2019-05-30 14:10:04 +08:00
Yagami c42f48895b Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-05-30 14:00:34 +08:00
Yagami 495d38d0c3 * Finish task #5533. 2019-05-30 13:59:02 +08:00
reneeteng c461480ec3 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-05-30 13:53:57 +08:00
reneeteng c2eba72a2c * Privilege lang file. 2019-05-30 13:53:16 +08:00
Yagami 59b2ea802d Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-05-30 13:41:49 +08:00
Yagami 5e9c7c10ea * Finish task #5533. 2019-05-30 13:41:33 +08:00
wangyidong 048556cc39 Merge branch 'master' of github.com:easysoft/zentaopms 2019-05-30 11:50:42 +08:00
wangyidong a3b6cfc687 * finish task #5446. 2019-05-30 11:50:21 +08:00
reneeteng eaba2135ad * Finish for proj 100 lang files. 2019-05-30 11:22:13 +08:00
reneeteng 52e0bea0c0 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-05-30 10:51:22 +08:00
reneeteng aacf02572b * Lang file update. 2019-05-30 10:50:56 +08:00
Yagami 9643076c38 * Finish task #5535. 2019-05-30 10:45:37 +08:00
Yagami 8b0cd09d92 * Finish task #5534. 2019-05-30 10:30:59 +08:00
Yagami 81c23f6984 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-05-30 10:27:45 +08:00
Yagami 6fdcdb2280 * Finish task #5532. 2019-05-30 10:26:53 +08:00
reneeteng 603fcb23be Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-05-30 10:19:32 +08:00
reneeteng fb1e8d10b1 * Lang file update. 2019-05-30 10:19:10 +08:00
Yagami d0fcd2d149 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-05-30 10:14:17 +08:00
Yagami 1a83466094 * Finish task #5517. 2019-05-30 10:13:54 +08:00
reneeteng 760bddd948 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-05-30 09:44:49 +08:00
reneeteng 36487eb12d * Lang file update. 2019-05-30 09:43:19 +08:00
Yagami 45c19a716a * Finish task #5526. 2019-05-30 09:16:55 +08:00
Yagami 5a0d991632 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-05-30 09:14:06 +08:00
Yagami beb330f8e2 * Finish task #5525. 2019-05-30 09:13:30 +08:00
reneeteng 441135cdab Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-05-30 07:58:29 +08:00
reneeteng cc4d468c15 * Lang file update. 2019-05-30 07:58:01 +08:00
wangyidong bbfe47008c Merge branch 'master' of github.com:easysoft/zentaopms 2019-05-29 17:11:14 +08:00
wangyidong ee327afadb * adjust for profile page. 2019-05-29 17:10:47 +08:00