Commit Graph
13923 Commits
Author SHA1 Message Date
wangyidong fab5c4a9d8 * adjust for qa role annualdata. 2019-12-25 11:27:30 +08:00
wangyidong 9a30b4a9d4 * add priv for annualData. 2019-12-25 10:36:32 +08:00
wangyidong 734ad0477a * remove xhtml js for create project or product. 2019-12-25 09:51:55 +08:00
wangyidong 3504dfefa7 * code for task #6759. 2019-12-25 09:50:17 +08:00
wangyidong 81e73e61f1 * finish task #6759. 2019-12-25 09:40:58 +08:00
wangyidong 5eb7f1c04c * finish task #6769,6768. 2019-12-25 09:33:40 +08:00
wangyidong 1c33392243 * fix error for create doc in project or product. 2019-12-25 09:32:21 +08:00
wangyidong 0a52b546ab * fix error. 2019-12-25 09:30:43 +08:00
Catouse 4b36aae25e * support export annual data to image file, task #6762. 2019-12-23 15:26:27 +08:00
wangyidong 19bf49917c * fix bug for show doc. 2019-12-23 14:31:09 +08:00
Catouse b52db4086b * update report/annualdata view. 2019-12-23 13:58:53 +08:00
Catouse 21175d9e75 * update report/annual data view.task #6762, task #6161. 2019-12-23 13:57:21 +08:00
Catouse 9032cf27fd * update report/annualdata view. 2019-12-23 10:44:16 +08:00
Catouse 9d5eb87b1a * update report/annualdata view. 2019-12-23 08:15:31 +08:00
Catouse dc96a7879a + add report/annual data view.task #6762, task #6161. 2019-12-20 17:33:37 +08:00
wangyidong 1a77048053 * fix bug for weixin note in webhook. 2019-12-20 14:25:33 +08:00
wangyidong 5771ab2a4b * code for task #6697. 2019-12-19 13:19:11 +08:00
wangyidong 33bcfd2fc8 * finish task #6605. 2019-12-19 09:31:17 +08:00
wangyidong fffcd64aa0 * finish task #6675. 2019-12-19 09:15:43 +08:00
wangyidong 3ed10d17f6 * adjust style. 2019-12-19 08:21:35 +08:00
wangyidong ed5f700a86 * finish task #6694. 2019-12-19 08:17:01 +08:00
wangyidong 44ca492421 * finish task #6697. 2019-12-18 15:24:54 +08:00
wangyidong 24dd889cf0 * fix bug #2684. 2019-12-18 14:03:00 +08:00
wangyidong fff6abfaf6 * fix js error. 2019-12-18 13:11:43 +08:00
wangyidong f29fdfd106 * finish task #6760. 2019-12-18 13:07:49 +08:00
wangyidong d0c070436d * code for story #4411. 2019-12-18 13:05:52 +08:00
wangyidong b0c98b5084 * fix bug for login use api. 2019-12-18 11:40:03 +08:00
wangyidong 28a7743f61 * finish task #6675. 2019-12-18 10:16:41 +08:00
wangyidong b3a214b819 * finish task #6668. 2019-12-17 15:01:51 +08:00
Catouse 4517f9f4fd * fix cannot select text in kindeditor in ie11, task #6671, bug #2888. 2019-12-17 14:37:38 +08:00
Catouse efa9ce5034 * fix dropdown search list UI, task #6746, bug #2420. 2019-12-17 14:07:34 +08:00
wangyidong bf3a4ba42c * finish task #6668. 2019-12-17 11:07:04 +08:00
Catouse 4ea90b2f0d * add ja language to zui and kindeditor. 2019-12-17 09:34:42 +08:00
Catouse b45f5c8a68 * add multi-language support, and fix UI of table statistic. 2019-12-16 17:42:26 +08:00
wangyidong a9f4bc8edd * finish task #6760. 2019-12-16 17:00:05 +08:00
wangyidong 714835adaf Merge branch 'master' of github.com:easysoft/zentaopms 2019-12-16 15:55:33 +08:00
wangyidong ee07401214 * fix bug. 2019-12-16 15:55:10 +08:00
liugang 5d68dfefc0 * Fix bug. 2019-12-16 15:06:31 +08:00
wangyidong 2b2671e7ab * finish task #6676. 2019-12-16 13:50:56 +08:00
wangyidong 76f4160ffc * finish task #6692. 2019-12-16 13:13:48 +08:00
wangyidong 784a0db6b6 * finish task #6697. 2019-12-16 13:06:30 +08:00
wangyidong 8e93cc9577 Merge branch 'master' of github.com:easysoft/zentaopms 2019-12-16 10:34:34 +08:00
wangyidong 7f056bc7e2 * finish task #6756. 2019-12-16 10:34:05 +08:00
wangyidong 80c7e0fa9b * finish task #6757. 2019-12-16 10:10:39 +08:00
wangyidong 6ad8a814ce * adjust for branch. 2019-12-13 16:13:50 +08:00
Catouse 39c8803c1e * fix input group border style in story views. 2019-12-13 16:05:25 +08:00
wangyidong 1925b1812e * finish task #2903. 2019-12-13 15:11:40 +08:00
Catouse 1c6449df08 * refactor code. 2019-12-13 14:47:26 +08:00
Yagami 0fbb3d95b5 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-12-13 14:39:01 +08:00
Yagami 4889c30d40 * Finish task #6678. 2019-12-13 14:38:42 +08:00