Commit Graph
16763 Commits
Author SHA1 Message Date
wangyidong f8c530b3ee * code for task #6707. 2019-12-10 15:52:57 +08:00
wangyidong 52460dd80d * code for task #6708. 2019-12-10 15:45:06 +08:00
wangyidong 2d979228eb Merge branch 'master' of github.com:easysoft/zentaopms 2019-12-10 14:20:19 +08:00
wangyidong cd5c44f211 * rm useless code. 2019-12-10 14:07:42 +08:00
wangyidong 6630dd0bb7 * code for task #6708. 2019-12-10 13:55:01 +08:00
guanxiying 727c591a68 * Fix bug #2471. 2019-12-10 10:58:07 +08:00
guanxiying 0064f79335 * Fix miss ) bug. 2019-12-10 10:39:45 +08:00
wangyidong 0c8fd46f7b Merge branch 'master' of github.com:easysoft/zentaopms 2019-12-09 14:30:35 +08:00
wangyidong 8d0f8521ba * finish task #6623. 2019-12-09 14:29:43 +08:00
aaron 85355b6498 test 2019-12-09 14:06:56 +08:00
aaron cba972f895 test 2019-12-09 14:06:03 +08:00
Catouse 1d0ce812f7 * fix error when .main-actions is empty. 2019-12-09 11:06:52 +08:00
reneeteng 0e897d7963 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-12-06 14:50:57 +08:00
reneeteng 4e19d01118 * Update social media links. 2019-12-06 14:50:04 +08:00
wangyidong 995bfb84d5 * finish task #6651. 2019-12-06 14:05:43 +08:00
wangyidong f77442271e * finish task #6616. 2019-12-06 13:50:47 +08:00
wangyidong 845ff37b23 Merge branch 'master' of github.com:easysoft/zentaopms 2019-12-06 13:12:48 +08:00
wangyidong 7570923bc0 * finish task #6651. 2019-12-06 13:12:26 +08:00
Catouse dfdb95be06 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-12-06 11:19:03 +08:00
Catouse add871b1a8 * prevent hotkey for navigation when page with modal opened, task #6643, bug #2240. 2019-12-06 11:18:58 +08:00
wangyidong bfe2535178 * finish task #6649. 2019-12-06 09:29:59 +08:00
wangyidong ca9293ba98 * finish task #6627. 2019-12-06 08:49:05 +08:00
wangyidong 168ce93203 * finish task #6620. 2019-12-05 17:00:08 +08:00
wangyidong 103568e629 * finish task #6628. 2019-12-05 15:01:11 +08:00
wangyidong ae2c117104 * finish task #6640. 2019-12-05 14:26:30 +08:00
wangyidong 34fb809d31 * die for apiModel sql method. 2019-12-05 14:25:42 +08:00
wangyidong bedeaaf39e * code for tutorial. 2019-12-05 13:16:27 +08:00
wangyidong 7d6913d91c * finish task #6656. 2019-12-05 11:25:12 +08:00
wangyidong 2115b47e59 * adjust style for edit module. 2019-12-05 10:18:08 +08:00
wangyidong ebde890513 * finish task #6658. 2019-12-05 09:58:47 +08:00
wangyidong 5b2cdc573f * finish task #6659. 2019-12-05 09:33:32 +08:00
wangyidong 3d68e30c67 * finish task #6650. 2019-12-05 09:13:32 +08:00
wangyidong a4cf41780c * fix error. 2019-12-05 08:58:44 +08:00
wangyidong 329fa9056e * fix for pro login. 2019-12-05 08:58:10 +08:00
wangyidong 68de6d0ff2 * code for task #6638. 2019-12-04 17:27:44 +08:00
wangyidong e97a72469e * adjust bug for show task module. 2019-12-04 16:42:25 +08:00
wangyidong ef36818cad * fix sql error. 2019-12-04 16:33:31 +08:00
wangyidong 36c1a6d2c4 * finish task #6647. 2019-12-04 16:10:06 +08:00
wangyidong 7276d8fbf8 * finish task #6646. 2019-12-04 15:43:16 +08:00
wangyidong 2bfbd7b122 * finish task #6641. 2019-12-04 15:12:30 +08:00
wangyidong 71fffa5458 * finish task #6638. 2019-12-04 15:03:29 +08:00
wangyidong de4818c724 * finish task #6637. 2019-12-04 14:47:33 +08:00
wangyidong 32d9b71668 * finish task #6630. 2019-12-04 13:52:35 +08:00
wangyidong 023ae5e5ac Merge branch 'master' of github.com:easysoft/zentaopms 2019-12-04 13:30:02 +08:00
wangyidong 6f205e288b * finish task #6629. 2019-12-04 13:28:51 +08:00
reneeteng d165267bc5 * Update German and French install files. 2019-12-04 13:23:43 +08:00
reneeteng 41479d2d00 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-12-04 13:17:31 +08:00
reneeteng eaf3d47dd0 * Removed whatsapp group info. 2019-12-04 13:17:01 +08:00
wangyidong c844b24c46 * finish task #6625. 2019-12-04 13:15:44 +08:00
wangyidong e8db459f5f * finish task #6622. 2019-12-04 11:33:00 +08:00