Commit Graph
15674 Commits
Author SHA1 Message Date
reneeteng d082ebafad * Remove space in lang file. 2019-07-09 16:12:03 +08:00
reneeteng 29b399cbeb Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-07-09 16:05:13 +08:00
reneeteng a0a9d0fb39 * Lang file update. 2019-07-09 16:03:50 +08:00
wangyidong a407d26b84 Merge branch 'master' of github.com:easysoft/zentaopms 2019-07-09 13:33:30 +08:00
Catouse fee4f2d5c6 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-07-09 13:31:10 +08:00
Catouse 4bfd3962c6 * update chosen in zui.js. 2019-07-09 13:31:00 +08:00
wangyidong 124da7e5ab * finish task #5989. 2019-07-09 11:13:53 +08:00
wangyidong 0655c5f22d Merge branch 'master' of github.com:easysoft/zentaopms 2019-07-09 11:09:26 +08:00
wangyidong b884536307 * finish task #5990. 2019-07-09 11:08:21 +08:00
reneeteng 61beb0fa31 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-07-09 09:43:38 +08:00
reneeteng 7efd22a0ab * Lang file update. 2019-07-09 09:42:01 +08:00
liugang 6abbbf5955 * Refactor function to check the module and method is defined in workflow. 2019-07-08 17:27:58 +08:00
wangyidong a600039a67 Merge branch 'master' of github.com:easysoft/zentaopms 2019-07-08 17:16:53 +08:00
wangyidong ef17ab7f01 * finish task #5992. 2019-07-08 17:16:20 +08:00
jinianlan 13ae00955c Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-07-08 16:33:31 +08:00
wangyidong 6e1774bdc2 * finish task #5996. 2019-07-08 16:22:56 +08:00
wangyidong 4aad227e76 * finish task #5997. 2019-07-08 16:20:03 +08:00
wangyidong 8f7a54de05 * finish task #5999. 2019-07-08 15:44:40 +08:00
wangyidong f5fccb3cf7 Merge branch 'master' of github.com:easysoft/zentaopms 2019-07-08 15:19:20 +08:00
wangyidong ecacabac70 * finish task #6004. 2019-07-08 15:15:55 +08:00
jinianlan 23d5f2bd3e * finish task #6021,#6009,#6007,#6006 2019-07-08 15:05:26 +08:00
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 79b7a06c0d * finish task #6005. 2019-07-08 14:48:02 +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