Commit Graph
142 Commits
Author SHA1 Message Date
Yagami 6cd56309e2 * Finish task #8585. 2020-12-09 13:19:07 +08:00
Yagami fdd19cd2a1 * Finish task #8580. 2020-12-09 11:41:41 +08:00
wangyidong e10897a838 * fix bug. 2020-12-01 09:03:32 +08:00
Yagami 90446d239a * Merge code and finish task #8475. 2020-11-25 10:36:44 +08:00
z b42d47e257 Merge branch '12.x' 2020-11-23 20:42:59 +08:00
tianshujie98 9b811e95cb * Adjust code style and add language item. 2020-11-13 16:44:43 +08:00
guanxiying 7bcea20380 * Add bind and oauth register function. 2020-11-02 16:33:22 +08:00
tianshujie98 66c636d771 * Fix bug #3464. 2020-09-10 15:59:00 +08:00
tianshujie98 d27efffa6d * Fix bug #3464. 2020-09-09 09:10:17 +08:00
holan20180123 05d84a4e6d * Adjust singular to plural for contribute. 2020-09-04 13:55:10 +08:00
Yagami b72a7dee43 Merge branch 'master' into 20.x 2020-08-26 16:10:36 +08:00
Yagami 89eb2e6f34 * Code for qc. 2020-08-14 11:13:53 +08:00
wangyidong dfc8de0b65 * finish task #7085. 2020-04-30 16:42:52 +08:00
guanxiying 58357af226 * Finish task #6549. 2019-11-18 13:06:50 +08:00
wangyidong 793319d21b * add new version and upgrade. 2019-11-08 09:36:05 +08:00
wangyidong edb0a60041 * fix bug for alert when save template name. 2019-11-07 15:57:31 +08:00
wangyidong da2a9751dc * finish task #6447. 2019-10-12 10:28:02 +08:00
wangyidong f24b888446 * finish task #6259. 2019-08-21 08:55:13 +08:00
wangyidong 321b27c81b * finish task #6208. 2019-08-08 13:12:49 +08:00
jinianlan b03634638a * fix Bug #2679,#2637,#2590,finish task #6172,#6182 2019-08-06 10:40:22 +08:00
Yagami b3ea0b9834 * Add lang for workflow. 2019-07-31 14:17:54 +08:00
Yagami dca5030a98 * Finish task #6153. 2019-07-29 16:39:55 +08:00
jinianlan 23d5f2bd3e * finish task #6021,#6009,#6007,#6006 2019-07-08 15:05:26 +08:00
Yagami 3253089e1f * Finish task #5920. 2019-07-02 15:41:28 +08:00
Yagami 80683b35d3 * Finish task #5877. 2019-06-27 09:59:51 +08:00
wangyidong a3de0b750a * finish task #5639. 2019-06-05 17:01:00 +08:00
wangyidong 2ba14afdda * finish task #5616. 2019-05-28 17:10:43 +08:00
wangyidong 672a73dfad * finish task #5611. 2019-05-28 09:52:24 +08:00
wangyidong f08d1deb40 * finish task #5441. 2019-04-29 15:44:17 +08:00
wangyidong 75ebcb18dc * code for task #5387. 2019-04-25 09:10:42 +08:00
wangyidong 62513a6045 * adjust for remove gtalk field. 2019-02-26 11:01:38 +08:00
wangyidong 36de63e1fe Merge branch 'master' of github.com:easysoft/zentaopms 2019-02-25 08:54:56 +08:00
wangyidong 3e7caa0da1 * finish task #5271. 2019-02-25 08:43:53 +08:00
Yagami 07fe890768 * Code for task #5271. 2019-02-23 14:43:24 +08:00
Yagami 3daae171f0 * Delete yahoo and wangwang field. 2019-02-23 13:44:51 +08:00
Yagami 9922370141 * Finish task #5249. 2019-01-25 08:59:13 +08:00
wangyidong e38601e5ee * finish task #4865. 2018-09-21 15:17:09 +08:00
Yagami 6ac385f583 * Finish task #6865. 2018-07-23 11:25:24 +08:00
daitingting 0817ec73cc * Optimize text. 2018-07-05 17:55:30 +08:00
wangyidong 56489075b0 Merge branch 'zentaopms_9.8' 2018-05-07 16:48:59 +08:00
liugang b0472a7bad * Refact browse page of company. 2018-04-19 14:24:56 +08:00
wumo e7eedb4129 * Modify the prompt information when the user account is invalid 2018-03-16 15:35:13 +08:00
滔哥 f48be85a23 * Task #3459 2017-12-11 17:16:42 +08:00
wangyidong 50460830e2 * adjust for limited user. 2017-09-26 11:08:11 +08:00
pengjiangxiu 41a2fc9a8f * Finish task #3210. 2017-09-19 13:56:39 +08:00
pengjiangxiu 5a138ea592 * Finish task #3206. 2017-09-08 15:44:44 +08:00
wangyidong 094c960bf4 * finish task #3088. 2017-08-23 14:55:49 +08:00
chenfeiCF 5e44401a10 * fix bug #992. 2017-01-16 08:57:53 +08:00
chenfeiCF 20443bd8ec * adjust task #2701. 2016-12-01 11:31:04 +08:00
chenfeiCF 08ce64e737 * finish task #2701. 2016-11-18 15:26:31 +08:00