Commit Graph

1423 Commits

Author SHA1 Message Date
daitingting
f7f3638ca7 Merge branch 'master' of https://github.com/easysoft/zentaopms
Conflicts:
	module/bug/lang/zh-cn.php
2018-04-27 11:00:34 +08:00
daitingting
0188883601 * Add project statistic block. 2018-04-27 10:58:57 +08:00
wangyidong
a28f947bb3 * finish task #3961. 2018-04-27 10:45:55 +08:00
liugang
50336ef762 * Refact bug page of project. 2018-04-26 17:09:02 +08:00
wangyidong
b59ac8b1a0 * finish task #3915,3917,3955. 2018-04-26 11:25:40 +08:00
daitingting
eafdacf022 * Rewrite view page of task. 2018-04-25 16:23:06 +08:00
daitingting
fd1a63eb5b * Add tip when index page has no project. 2018-04-25 14:01:53 +08:00
daitingting
41e6cb4670 * Rewrite browse page of product without module. 2018-04-23 15:09:25 +08:00
wangyidong
9a73f45563 Merge branch 'master' of github.com:easysoft/zentaopms 2018-04-19 14:31:11 +08:00
wangyidong
5d69dce5af * adjust for report page. 2018-04-19 14:30:45 +08:00
liugang
b0472a7bad * Refact browse page of company. 2018-04-19 14:24:56 +08:00
liugang
093898d482 * Finish task #3834. 2018-04-19 10:12:12 +08:00
wangyidong
b9ab24ef89 * adjust for release module. 2018-04-18 11:18:41 +08:00
liugang
eb3ecce61e Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-04-17 15:56:58 +08:00
liugang
e522b82a7e * Add saveSuccess to common lang files. 2018-04-17 15:53:36 +08:00
daitingting
f481b228ea * Add saveSuccess and fail for send message. 2018-04-17 15:36:34 +08:00
liugang
d8560cefed * Refact task page of project. 2018-04-17 11:25:26 +08:00
daitingting
bf326f57ff * Rewrite view page of product. 2018-04-16 16:55:32 +08:00
wangyidong
a4bc9d3287 * replace featurebar to mainMenu. 2018-04-16 15:28:21 +08:00
daitingting
dafec6b33d * Rewrite create page of story. 2018-04-16 10:20:32 +08:00
daitingting
f191c19548 * Note useless codes. 2018-04-16 09:47:29 +08:00
daitingting
1ba9381258 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-04-14 14:59:07 +08:00
daitingting
42779bde4d * Add language for customField. 2018-04-14 14:58:24 +08:00
wangyidong
8b139725b2 * adjust menu order. 2018-04-13 14:55:44 +08:00
wangyidong
8830e1095d * code for task #3810. 2018-04-13 10:11:54 +08:00
wangyidong
d1e76a176f Merge branch 'master' of github.com:easysoft/zentaopms 2018-04-13 09:37:19 +08:00
wangyidong
579cae8b25 * adjust for batchcreate page. 2018-04-13 09:36:34 +08:00
daitingting
bdc6d78993 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-04-13 09:09:39 +08:00
daitingting
de204f6813 * Rewrite create view of product. 2018-04-13 09:08:57 +08:00
wangyidong
de2cedd799 * adjust for task #3819. 2018-04-12 15:59:04 +08:00
wangyidong
a3e304ffd7 * code for task #3819. 2018-04-12 15:18:54 +08:00
wangyidong
eca3405b27 Merge branch 'master' of github.com:easysoft/zentaopms 2018-04-11 10:10:41 +08:00
wangyidong
c60070b991 * code for task #3810. 2018-04-11 10:09:33 +08:00
liugang
fe3027623e * Finish task #3846. 2018-04-10 16:54:38 +08:00
wangyidong
5105af3d89 * adjust for show history in view page. 2018-04-04 13:51:45 +08:00
wangyidong
2ecdc58a3d * finish task #3769. 2018-04-04 09:39:01 +08:00
wangyidong
9d16d860c9 * finish task #3761. 2018-04-03 17:03:49 +08:00
wangyidong
9c7712d7da * finish task #3764. 2018-03-29 13:56:05 +08:00
wangyidong
315a6f931f * adjust for datatable. 2018-03-28 16:20:28 +08:00
wangyidong
f459f4a3da * code for task #3663. 2018-03-28 13:52:26 +08:00
liugang
bffd215f7d Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-03-12 18:23:31 +08:00
liugang
c31114116d * Move error of entry to entry's config. 2018-03-12 18:23:04 +08:00
wangyidong
816e5d1ff9 * adjust for ui. 2018-03-05 09:57:32 +08:00
wangyidong
003db1f422 * change for todo batch create page. 2018-03-02 10:57:26 +08:00
wangyidong
ea74787b87 * change todo to calendar. 2018-02-09 11:01:02 +08:00
wangyidong
6f2c3c1b93 * change for 9.8.1 version. 2018-02-07 14:19:57 +08:00
wangyidong
a623b9016b * change for upgrade. 2018-02-06 10:42:51 +08:00
wangyidong
c9ee62c897 * adjust for block view. 2018-02-01 15:39:52 +08:00
wangyidong
8e2dee9fb6 * adjust for case block. 2018-02-01 14:23:19 +08:00
wangyidong
30bc8d7709 * adjust for task #3592. 2018-01-31 15:16:29 +08:00