 wangyidong
|
8e6a61a178
|
Merge branch 'master' of github.com:easysoft/zentaopms
|
2018-07-12 11:56:15 +08:00 |
|
|
wangyidong
|
bcef5cbbc5
|
* fix for project limited.
|
2018-07-12 11:55:32 +08:00 |
|
|
Yagami
|
c8ceb6567e
|
*Fix bugs.
|
2018-07-12 11:15:47 +08:00 |
|
|
Yagami
|
f532e7d060
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2018-07-12 11:08:38 +08:00 |
|
|
Yagami
|
1cd38835e6
|
*Fix require field.
|
2018-07-12 11:08:03 +08:00 |
|
|
daitingting
|
51ce3062dd
|
* Delete done status of project.
* Update data.
|
2018-07-12 10:57:06 +08:00 |
|
|
daitingting
|
4e26d81591
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2018-07-12 10:43:48 +08:00 |
|
|
daitingting
|
b9e042dc56
|
* Adjust computeHours4Multiple function.
|
2018-07-12 10:43:17 +08:00 |
|
|
Yagami
|
187c1bb78f
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2018-07-12 10:25:37 +08:00 |
|
|
Yagami
|
27f06f4153
|
*Fix bugs.
|
2018-07-12 10:25:19 +08:00 |
|
|
liugang
|
d525b78184
|
* Change createlib and editlib to upper case and finish task #4628.
|
2018-07-12 10:24:51 +08:00 |
|
|
liugang
|
9918877a5d
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2018-07-12 10:09:09 +08:00 |
|
|
liugang
|
e48c46e84e
|
* Change createLib and editLib to lower case.
|
2018-07-12 10:08:40 +08:00 |
|
|
Catouse
|
6d8d499272
|
* finish task #4566.
|
2018-07-12 09:59:51 +08:00 |
|
|
Catouse
|
406efc28ed
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2018-07-12 09:43:25 +08:00 |
|
|
Catouse
|
4bb44dcb07
|
* update zui.
|
2018-07-12 09:43:08 +08:00 |
|
|
liugang
|
70d1aa8c8f
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2018-07-12 09:18:03 +08:00 |
|
|
liugang
|
d7cd324f90
|
* Remove defaultChosenOptions.
|
2018-07-12 09:17:50 +08:00 |
|
|
Catouse
|
1476846934
|
* fix chosen usage.
|
2018-07-12 08:50:17 +08:00 |
|
|
Catouse
|
2dc1aa7375
|
* fix chosen usage.
|
2018-07-12 08:49:35 +08:00 |
|
|
chenfeiCF
|
d52c878ba5
|
* Add new version.
|
2018-07-11 17:40:42 +08:00 |
|
|
chenfeiCF
|
1992a70e9c
|
* Adjust for task #4496.
|
2018-07-11 14:58:30 +08:00 |
|
|
liugang
|
525c467c72
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2018-07-11 14:35:53 +08:00 |
|
|
liugang
|
3f4e16fedb
|
* Add function to create sub menu by settings in lang files.
|
2018-07-11 14:35:10 +08:00 |
|
|
wangyidong
|
8925112a6c
|
Merge branch 'master' of github.com:easysoft/zentaopms
|
2018-07-11 14:30:35 +08:00 |
|
|
liugang
|
35e424ddfa
|
* Set privileges for sub menu.
|
2018-07-11 14:18:15 +08:00 |
|
|
wangyidong
|
563b7bfd76
|
Merge branch 'master' of github.com:easysoft/zentaopms
|
2018-07-11 14:10:47 +08:00 |
|
|
wangyidong
|
0470d557d0
|
* adjust for kanban.
|
2018-07-11 14:10:20 +08:00 |
|
|
liugang
|
e375a18a05
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2018-07-11 13:55:34 +08:00 |
|
|
liugang
|
f14c21dd62
|
* Finish task #4487, 4507
|
2018-07-11 13:52:59 +08:00 |
|
|
estellbright
|
70c5556aae
|
Fix Bug Delete the Last Plan.
|
2018-07-11 13:48:06 +08:00 |
|
|
Yagami
|
c400f14b79
|
*Fix bug #2038.
|
2018-07-11 13:42:09 +08:00 |
|
|
Yagami
|
deaf51117f
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2018-07-11 13:30:50 +08:00 |
|
|
Yagami
|
b7326b28ef
|
*Fix bug edit project loadPlan.
|
2018-07-11 13:30:02 +08:00 |
|
|
estellbright
|
203fd21ff2
|
Fix Bug #1943,1997,1998,2001,2015.
|
2018-07-11 10:27:04 +08:00 |
|
|
liugang
|
3d4f7b86d9
|
* finish task #4487.
|
2018-07-11 10:23:13 +08:00 |
|
|
Yagami
|
39b0115f55
|
*Fix Bug #4516.
|
2018-07-11 10:21:05 +08:00 |
|
|
Yagami
|
2ff2e04f54
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2018-07-11 09:36:36 +08:00 |
|
|
Yagami
|
510559dd99
|
*Fix bug #4516. *Fix bug #4516. *Fix bug #4516. *Fix bug #4516. *Fix bug #4516. *Fix bug #4516. *Fix bug #4516. *Fix bug #4516.
|
2018-07-11 09:35:24 +08:00 |
|
|
liugang
|
b432ee4598
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2018-07-10 18:20:27 +08:00 |
|
|
liugang
|
f505416eb7
|
* Adjust sub menu settings.
|
2018-07-10 18:20:04 +08:00 |
|
|
wangyidong
|
db9eebee67
|
Merge branch 'master' of github.com:easysoft/zentaopms
|
2018-07-10 17:36:42 +08:00 |
|
|
wangyidong
|
86f38aa412
|
* finish task #4633.
|
2018-07-10 17:36:18 +08:00 |
|
|
daitingting
|
a8f1f63101
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2018-07-10 17:30:07 +08:00 |
|
|
daitingting
|
5b09738c95
|
* Adjust ajaxmenu style for hidden dropdown menu.
|
2018-07-10 17:29:19 +08:00 |
|
|
Yagami
|
0891061e34
|
*Finish task #4630.
|
2018-07-10 16:15:16 +08:00 |
|
|
Yagami
|
6eadda51af
|
*Finish task #4509.
|
2018-07-10 15:59:35 +08:00 |
|
|
daitingting
|
06a1e11532
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2018-07-10 15:43:38 +08:00 |
|
|
daitingting
|
f0958e21e2
|
* Use can not edit and delete file if he has no rights with file's object, fix bug #1521.
|
2018-07-10 15:41:56 +08:00 |
|
|
wangyidong
|
f2c54d74e9
|
Merge branch 'master' of github.com:easysoft/zentaopms
|
2018-07-10 15:21:52 +08:00 |
|