 wangyidong
|
ceeeb89435
|
Merge branch 'master' of github.com:easysoft/zentaopms
|
2016-04-12 17:35:08 +08:00 |
|
|
wangyidong
|
23ee51e7ea
|
* finsh task #2538.
|
2016-04-12 17:34:23 +08:00 |
|
|
Catouse
|
e87801ebd1
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2016-04-12 16:59:55 +08:00 |
|
|
Catouse
|
e7a72856a0
|
* improve UI for manage modules, code for task #2549.
|
2016-04-12 16:59:30 +08:00 |
|
|
wangyidong
|
9acf763a61
|
Merge branch 'master' of github.com:easysoft/zentaopms
|
2016-04-12 16:53:05 +08:00 |
|
|
wangyidong
|
9e840b7367
|
* finish task #2537.
|
2016-04-12 16:52:35 +08:00 |
|
|
chenfeiCF
|
9a07d9ef4f
|
* fix bug #786.
|
2016-04-12 16:15:12 +08:00 |
|
|
Catouse
|
663fb0a558
|
* update tree in zui.
|
2016-04-12 15:37:39 +08:00 |
|
|
chenfeiCF
|
93c00ba10b
|
* fix table head and foot if module tree is hidden or displayed.
|
2016-04-12 14:18:29 +08:00 |
|
|
wangyidong
|
d7b5cd085c
|
Merge branch 'master' of github.com:easysoft/zentaopms
Conflicts:
module/bug/model.php
|
2016-04-12 13:54:03 +08:00 |
|
|
wangyidong
|
9c2f9dfa32
|
* fix error and adjust code.
|
2016-04-12 13:51:09 +08:00 |
|
|
Catouse
|
47628c8d3a
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2016-04-12 13:40:39 +08:00 |
|
|
Catouse
|
8a8f7715ac
|
* fix error on add department to root.
|
2016-04-12 13:40:30 +08:00 |
|
|
Catouse
|
430c9359fe
|
* update zui.
|
2016-04-12 13:33:13 +08:00 |
|
|
Catouse
|
6b5f1228c8
|
* finish task #2576.
|
2016-04-12 13:32:54 +08:00 |
|
|
wangyidong
|
7a40bbeaec
|
Merge branch 'master' of github.com:easysoft/zentaopms
|
2016-04-12 11:23:49 +08:00 |
|
|
wangyidong
|
cb5d368c48
|
* finish task #2524.
|
2016-04-12 11:23:05 +08:00 |
|
|
chenfeiCF
|
52370d1855
|
* fix bug #817.
|
2016-04-12 09:44:02 +08:00 |
|
|
chenfeiCF
|
b1e147fec3
|
* code for task #2528.
|
2016-04-12 08:28:42 +08:00 |
|
|
Catouse
|
12925bc1cd
|
* change UI of department manage view.
|
2016-04-11 19:22:51 +08:00 |
|
|
Catouse
|
e6712a3a4b
|
* update zui and fix tree style.
|
2016-04-11 19:22:25 +08:00 |
|
|
Catouse
|
4b08db0b40
|
* fix error in modal trigger extension.
|
2016-04-11 19:22:03 +08:00 |
|
|
Catouse
|
21da156bd1
|
* change front helpers.
|
2016-04-11 19:21:45 +08:00 |
|
|
chenfeiCF
|
64f837231a
|
Merge branch 'master' of github.com:easysoft/zentaopms
|
2016-04-11 17:38:23 +08:00 |
|
|
chenfeiCF
|
ca4710fa99
|
* fix bug #820.
|
2016-04-11 17:36:30 +08:00 |
|
|
wangyidong
|
ac2bfc94dd
|
* adjust for integrate ranzhi.
|
2016-04-11 17:30:27 +08:00 |
|
|
wangyidong
|
7fea820831
|
* code for fix error and adjust default block.
|
2016-04-11 17:05:05 +08:00 |
|
|
chenfeiCF
|
25648f4067
|
* fix bug 822.
|
2016-04-11 16:58:37 +08:00 |
|
|
wangyidong
|
322b895c96
|
Merge branch 'master' of github.com:easysoft/zentaopms
|
2016-04-11 16:57:51 +08:00 |
|
|
wangyidong
|
3630f79874
|
* change for check priv.
|
2016-04-11 16:57:26 +08:00 |
|
|
chenfeiCF
|
ddbf65ab50
|
* fix bug #823.
|
2016-04-11 16:54:15 +08:00 |
|
|
wangyidong
|
37bc93aa53
|
Merge branch 'master' of github.com:easysoft/zentaopms
|
2016-04-11 15:49:34 +08:00 |
|
|
wangyidong
|
13f1fd6bf7
|
* change for print blok.
|
2016-04-11 15:48:58 +08:00 |
|
|
Catouse
|
3cda13683f
|
* update zui.
|
2016-04-11 15:10:14 +08:00 |
|
|
wangyidong
|
13f7011a05
|
* add color field for task/story/bug/case.
|
2016-04-11 10:58:08 +08:00 |
|
|
wangyidong
|
bfeaca5fa3
|
* change for browse in mobile.
|
2016-04-11 10:14:46 +08:00 |
|
|
wangyidong
|
6006efd721
|
* code for task #2529.
|
2016-04-11 09:29:33 +08:00 |
|
|
chenfeiCF
|
b6ef7dd961
|
* adjust for task #2531:Process the post data in model when value is 'ditto'.
|
2016-04-09 13:37:25 +08:00 |
|
|
Catouse
|
2cb3981b38
|
* update zui.
|
2016-04-08 17:53:18 +08:00 |
|
|
Catouse
|
1aec16628e
|
* code for task #2576.
|
2016-04-08 17:53:10 +08:00 |
|
|
Catouse
|
18363ef7d4
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2016-04-08 16:12:17 +08:00 |
|
|
Catouse
|
ce53e54709
|
* update zui: add color picker module.
|
2016-04-08 16:11:31 +08:00 |
|
|
wangyidong
|
ceb50edff9
|
* code for task #2527.
|
2016-04-08 13:28:33 +08:00 |
|
|
wangyidong
|
4d38fbdad1
|
* add index page.
|
2016-04-08 11:40:37 +08:00 |
|
|
wangyidong
|
ea7aabdd3e
|
* add function sort and delete block.
|
2016-04-08 11:01:24 +08:00 |
|
|
wangyidong
|
c50c181700
|
* code for task #2529.
|
2016-04-08 10:41:20 +08:00 |
|
|
wangyidong
|
1c851a0f59
|
* adjust style for file export.html.php.
|
2016-04-08 10:40:36 +08:00 |
|
|
wangyidong
|
f3b933a3d4
|
Merge branch 'master' of github.com:easysoft/zentaopms
|
2016-04-08 10:39:15 +08:00 |
|
|
wangyidong
|
85d5058ff3
|
* code for block.
|
2016-04-08 10:38:15 +08:00 |
|
|
wangyidong
|
36999dc907
|
* fix for removeDuplicate when batchCreate.
|
2016-04-08 10:34:17 +08:00 |
|