Commit Graph
15652 Commits
Author SHA1 Message Date
reneeteng 19e1ddabae Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-07-08 14:59:43 +08:00
reneeteng befec1fc06 * Lang file update. 2019-07-08 14:58:48 +08:00
wangyidong 1754966886 Merge branch 'master' of github.com:easysoft/zentaopms 2019-07-08 14:41:39 +08:00
reneeteng c04441a40d * Lang file update. 2019-07-08 14:37:09 +08:00
wangyidong 42ecf57a99 Merge branch 'master' of github.com:easysoft/zentaopms 2019-07-08 14:36:59 +08:00
wangyidong bbd9ffdb07 * finish task #6012. 2019-07-08 14:33:14 +08:00
reneeteng af1093c597 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-07-08 14:27:26 +08:00
reneeteng 45cfad82d6 * Lang files update. 2019-07-08 14:25:48 +08:00
wangyidong e5a0a6c859 * finish task #6013. 2019-07-08 14:21:12 +08:00
wangyidong 066bc73dfd Merge branch 'master' of github.com:easysoft/zentaopms 2019-07-08 14:15:40 +08:00
wangyidong f5f1107026 * finish task #6019. 2019-07-08 14:14:23 +08:00
reneeteng 91f9847238 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-07-08 11:31:10 +08:00
reneeteng 3122bab037 * Lang file updated. 2019-07-08 11:30:43 +08:00
liugang 1fe889d697 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-07-08 10:58:56 +08:00
liugang 308bb3d1be * If the module and method if defined in workflow, run workflow engine. 2019-07-08 10:56:47 +08:00
reneeteng 6253eac328 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-07-08 10:49:00 +08:00
reneeteng a3e86de815 * Lang file update. 2019-07-08 10:48:13 +08:00
liugang d8d90d83f3 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-07-08 10:16:25 +08:00
liugang 2267a99a65 * Add default error lang for url. 2019-07-08 10:15:48 +08:00
reneeteng 9e634fcd63 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-07-05 18:06:51 +08:00
reneeteng 9d624513e4 * Lang file update. 2019-07-05 18:05:13 +08:00
wangyidong 00cb0df3bf * finish task #5998. 2019-07-05 17:32:55 +08:00
wangyidong c3ba4e8b3e * adjust for th width. 2019-07-05 17:03:54 +08:00
wangyidong 19eb87e0be Merge branch 'master' of github.com:easysoft/zentaopms 2019-07-05 16:43:50 +08:00
reneeteng af8ff0b270 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-07-05 16:30:16 +08:00
reneeteng c1f342e0bb * Lang file update for proj. 2019-07-05 16:28:38 +08:00
wangyidong 268a4fa2c2 * finish task #6024. 2019-07-05 16:02:10 +08:00
wangyidong dc87304782 * finish task #6025. 2019-07-05 15:35:13 +08:00
wangyidong 3c102bb3e9 * finish task #6026. 2019-07-05 11:31:32 +08:00
wangyidong 870b549175 * finish task #6029. 2019-07-05 11:22:26 +08:00
wangyidong ae89e7e9a4 * finish task #6030. 2019-07-05 11:20:53 +08:00
wangyidong d9b43a8c5e * finish task #6033. 2019-07-05 11:09:08 +08:00
wangyidong 9910fa461c * finish task #6034. 2019-07-05 10:52:30 +08:00
wangyidong e3da7312f2 * finish task #6035. 2019-07-05 10:23:08 +08:00
wangyidong dabd65f171 * finish task #6037,6038. 2019-07-05 09:53:43 +08:00
wangyidong 3c76568ca9 * finish task #6039. 2019-07-05 09:19:58 +08:00
wangyidong 6d1dbcebc4 * finish task #6042. 2019-07-05 09:13:01 +08:00
wangyidong 4df1ef92ff * finish task #6043. 2019-07-05 08:59:55 +08:00
wangyidong 3295637367 * finish task #6047. zentaopms_11.6.0.beta1_20190705 2019-07-05 08:20:04 +08:00
wangyidong c3fb6b69fd * finish task #6048. 2019-07-04 17:37:24 +08:00
wangyidong 7ce8398936 * finish task #6053. 2019-07-04 16:33:13 +08:00
wangyidong c5187c2328 * finish task #6051. 2019-07-04 15:31:57 +08:00
reneeteng 486bc640b7 * Testreport lang file updated. 2019-07-04 14:22:52 +08:00
wangyidong a9ef4789e6 * finish task #6052. 2019-07-04 14:17:58 +08:00
wangyidong b426af31b7 * finish task #6053. 2019-07-04 14:13:12 +08:00
wangyidong ea1c011786 Merge branch 'master' of github.com:easysoft/zentaopms 2019-07-04 13:41:59 +08:00
wangyidong 402bda7579 * finish task #6055. 2019-07-04 13:40:37 +08:00
wangyidong bdda1f889d * adjust for build lang file. 2019-07-04 13:40:03 +08:00
reneeteng 9a0698b347 * Lang optimized. 2019-07-04 10:12:43 +08:00
chenfei ab6e312dba * Adjust confirmed text-align. 2019-07-03 15:17:50 +08:00