Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
16,067 Commits 2 Branches 292 Tags
dec97060a67c363cdd223bf5af325e2b1579c0c8
Commit Graph
1829 Commits
Author SHA1 Message Date
liugang 506aaa3d74 * Change sub status when status is changed and sub status is not set, and record the changes. 2019-08-06 18:05:31 +08:00
liugang cd0e4ee3fe * Adjust lang files. 2019-08-06 14:35:43 +08:00
jinianlan 8794e9c8df Merge branch 'master' of github.com:easysoft/zentaopms 2019-08-06 10:46:12 +08:00
jinianlan b03634638a * fix Bug #2679,#2637,#2590,finish task #6172,#6182 2019-08-06 10:40:22 +08:00
wangyidong 922800cb81 * change for task #8445. 2019-08-02 13:40:13 +08:00
jinianlan 15c6c30ee4 Merge branch 'master' of github.com:easysoft/zentaopms 2019-07-31 08:55:54 +08:00
jinianlan 7e26346313 * finish task #6155,#6151,#6147,#6144 2019-07-31 08:54:16 +08:00
liugang 9c53dd8e6b * Use the function zget to get users. 2019-07-30 17:33:59 +08:00
liugang 5e32ee1081 * Add subStatus in lang files. 
* Change sub status when status is changed and sub status is not set, and record the changes.
 2019-07-30 10:10:10 +08:00
Yagami 8d26d61fb1 * Finish task #6162. 2019-07-29 16:53:48 +08:00
wangyidong 6b3c34dba2 * finish task #6160. 2019-07-29 16:30:55 +08:00
jinianlan c90aac3512 * finish task #6166,#6149,6139 2019-07-29 15:54:08 +08:00
wangyidong 5ace83db9a * adjust for sendmail. 2019-07-26 17:48:52 +08:00
wangyidong 9b2174e001 * adjust for code style. 2019-07-26 15:48:56 +08:00
jinianlan aac0ce2554 * fix Bug #2656,#2653 2019-07-25 17:57:15 +08:00
wangyidong f1b0faf11b * adjust sortable file. 2019-07-24 09:35:40 +08:00
wyd621 f858660ceb Merge branch 'master' into zentaopms_workflow 2019-07-24 09:14:23 +08:00
jinianlan 0672bc7a0b * finish task #2656 2019-07-23 14:06:31 +08:00
wangyidong b17d7c2999 * add checkeEnLang method. 2019-07-19 11:34:38 +08:00
wangyidong 169a0fa5fb * adjust for import js/css with js::import/css::import. 2019-07-18 16:51:01 +08:00
wangyidong eb51c0fda2 * change for zh-tw lang. 2019-07-16 13:39:35 +08:00
wangyidong 853fbbd18e * adjust for aiux link. 2019-07-16 12:00:25 +08:00
wangyidong 37bda2cb51 * finish task #6091. 2019-07-15 16:00:41 +08:00
wangyidong 2671f7a044 * finish task #6090. 2019-07-15 15:56:31 +08:00
wangyidong 56dfe5030d * finish task #6084. 2019-07-15 13:37:59 +08:00
wangyidong a621ff9037 * add new version and upgrade. 2019-07-12 16:44:30 +08:00
wyd621 9143f4e38f Merge branch 'master' into 11.5 2019-07-12 15:55:04 +08:00
wangyidong e71d8fa75f * fix bug for select table. 2019-07-12 15:23:14 +08:00
reneeteng e80eed1007 * Lang file update. 2019-07-12 14:15:54 +08:00
reneeteng 56666d927f Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-07-12 13:21:11 +08:00
wangyidong 0bc93a387f * finish task #5929. 2019-07-12 11:15:23 +08:00
wangyidong 49d3fce657 * code task #5569. 2019-07-12 10:29:44 +08:00
wangyidong d27f5a513a + add Deutsch lang. 2019-07-12 09:58:14 +08:00
wangyidong 7234603458 * finish task #5569. 2019-07-11 17:14:19 +08:00
liugang 01674bdde5 * Fix bug of sortable.html.php. 2019-07-11 15:02:19 +08:00
Catouse 26643f3b79 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-07-11 14:29:40 +08:00
Catouse 22de5cc42c * fix orders incorrect. 2019-07-11 14:29:33 +08:00
wangyidong f47be36c0c * finish task #6017. 2019-07-11 13:41:06 +08:00
wangyidong 07f976db1a * finish task #5939. 2019-07-10 17:28:58 +08:00
jinianlan 673656fe47 * finish task #5953 2019-07-10 16:19:09 +08:00
reneeteng 2f203d6985 * Lang file update. 2019-07-10 16:02:55 +08:00
jinianlan 60e7014ef7 * finish task #6020,#6009,#6007,#5949 2019-07-10 13:41:13 +08:00
wangyidong 014c61e4e6 * finish task #5969. 2019-07-10 13:04:12 +08:00
reneeteng 4fc6ae4314 * Lang file update. 2019-07-09 16:45:18 +08:00
reneeteng c04441a40d * Lang file update. 2019-07-08 14:37:09 +08:00
reneeteng 45cfad82d6 * Lang files update. 2019-07-08 14:25:48 +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 9d624513e4 * Lang file update. 2019-07-05 18:05:13 +08:00
reneeteng af8ff0b270 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-07-05 16:30:16 +08:00