Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
13,107 Commits 2 Branches 292 Tags
628db3acfad4aa85486b6f8adcc24295d74bbf16
Commit Graph
13107 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Catouse 628db3acfa Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-08-09 11:34:26 +08:00
Catouse 87f9579d77 * fix bug #2105. 2018-08-09 11:34:01 +08:00
wangyidong fc91ec89dd Merge branch 'master' of github.com:easysoft/zentaopms 2018-08-09 11:26:21 +08:00
wangyidong 63f929e329 * finish task #4661. 2018-08-09 11:25:03 +08:00
Catouse 14c9d661a4 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-08-09 10:56:43 +08:00
Catouse 1a08ec91fa * finish task #4652 and fix bug #2093. 2018-08-09 10:54:01 +08:00
wangyidong 28f0f30770 * finish task #4680. 2018-08-09 10:31:05 +08:00
滔哥 a5c34a10ed Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-08-08 19:30:41 +08:00
滔哥 c8a78acbb9 * Fix bug for php7.2. 2018-08-08 19:29:51 +08:00
wangyidong 116ea815b5 * finish task #4685. 2018-08-08 17:40:00 +08:00
wangyidong 4d5b63086c * finish task #4657. 2018-08-08 17:15:29 +08:00
wangyidong fae8e48325 * finish task #4667. 2018-08-08 17:14:52 +08:00
wangyidong 4f9d50bfdc * finish task #4648. 2018-08-08 15:36:01 +08:00
wangyidong c9e196bb64 * code for task #4679. 2018-08-08 15:16:30 +08:00
wangyidong 2c2c86bf62 Merge branch 'master' of github.com:easysoft/zentaopms 2018-08-08 15:08:05 +08:00
wangyidong d71811ab17 * finish task #4679. 2018-08-08 15:07:31 +08:00
chenfeiCF 2c24472bae * Finish task #4647. 2018-08-08 14:06:14 +08:00
wangyidong 90ad70d440 * finish task #4687. 2018-08-08 13:51:54 +08:00
wangyidong 70653a09a0 * finish task #4673. 2018-08-08 13:41:25 +08:00
wangyidong 321d665abb * finish task #4655. 2018-08-08 11:30:57 +08:00
wangyidong 40c92e7648 * finish task #4686. 2018-08-08 10:21:35 +08:00
wangyidong c7dbd80562 * code for task #4652. 2018-08-08 09:59:28 +08:00
wangyidong 95454cd35b * finish task #4650 and delete useless file. 2018-08-07 17:27:06 +08:00
wangyidong b66095e78a * fix bug #2003. 2018-08-07 17:18:28 +08:00
wangyidong 4875eec38e * finish task #4668. 2018-08-07 17:09:11 +08:00
wangyidong 3c897623e9 Merge branch 'master' of github.com:easysoft/zentaopms 2018-08-07 16:30:36 +08:00
wangyidong 1bcbddf649 * finish task #4659. 2018-08-07 16:30:00 +08:00
chenfeiCF 6264ffc4ce * Finish task #4645. 2018-08-07 16:24:49 +08:00
wangyidong 4a8805f424 * finish task #4644. 2018-08-07 16:11:32 +08:00
wangyidong 5c548cf121 * finish task #4664. 2018-08-06 17:39:55 +08:00
wangyidong c5c850bb02 Merge branch 'master' of github.com:easysoft/zentaopms 2018-08-06 15:36:36 +08:00
wangyidong f04d90faf4 * fix bug for export story when search. 2018-08-06 15:35:08 +08:00
Catouse 2566eeeda7 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-08-02 15:31:15 +08:00
Catouse 6a1f87bd26 * swap js and css import order to improve frontend perfermance. 2018-08-02 15:31:00 +08:00
wangyidong e316487734 * add xuanxuan when build zentaopms. 2018-08-02 11:46:49 +08:00
wangyidong 90945e3bd7 * adjust for upgrade. zentaopms_10.2_20180802 2018-08-02 10:02:21 +08:00
dajiao007 4c6c3f461f * modify english words 2018-08-01 09:36:58 +08:00
Catouse ca473bc803 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-07-31 13:23:38 +08:00
Catouse 5cf6a5be39 * fix pager language option not work by update zui js. 2018-07-31 13:23:26 +08:00
liugang df0f7d3c00 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-07-30 10:42:34 +08:00
liugang dcd0f98a73 * Set buttons in view page as same as in browse page. 2018-07-30 10:41:47 +08:00
estellbright e295fd0203 Fix Team Bug. 2018-07-26 09:56:10 +08:00
liugang 8b7a79a6e1 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-07-26 09:42:10 +08:00
liugang e39a5f0014 * Fix bug #2019 2018-07-26 09:40:27 +08:00
estellbright 375850e6b1 Fix Bug. 2018-07-26 09:38:03 +08:00
reneteng 5238216a30 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-07-25 17:26:11 +08:00
reneteng 5c63c7f6fd *stage to phase 2018-07-25 17:25:15 +08:00
estellbright 5ceae019fe *Finish Task #6833. 2018-07-25 17:17:49 +08:00
wangyidong 2a85d52eeb * fix bug #1433 2018-07-25 13:14:36 +08:00
wangyidong 7891bf8591 * fix bug #1440. 2018-07-25 11:05:36 +08:00