 wangyidong
|
50cc2cdbf5
|
* adjust tutorial power.
|
2016-04-27 09:11:28 +08:00 |
|
|
chenfeiCF
|
4126db324d
|
* fix bug: can not get child dept users.
|
2016-04-27 09:03:23 +08:00 |
|
|
Catouse
|
b66ce7411a
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2016-04-27 08:59:54 +08:00 |
|
|
Catouse
|
b07caeefae
|
* finish task #2526, task #2525.
|
2016-04-27 08:59:20 +08:00 |
|
|
wangyidong
|
240b81f508
|
* adjust for tutorial.
|
2016-04-27 08:30:32 +08:00 |
|
|
Catouse
|
20520456b8
|
* add confirm dialog to tutorial mode.
|
2016-04-26 17:52:27 +08:00 |
|
|
Catouse
|
df065e18ed
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2016-04-26 17:12:37 +08:00 |
|
|
Catouse
|
12f5593d66
|
* improve tutorial UI.
|
2016-04-26 17:12:28 +08:00 |
|
|
chenfeiCF
|
b13972d91c
|
Merge branch 'master' of github.com:easysoft/zentaopms
|
2016-04-26 17:10:47 +08:00 |
|
|
wangyidong
|
6d0d9bd80e
|
* fix bug for feature bar custom menu.
|
2016-04-26 17:07:39 +08:00 |
|
|
chenfeiCF
|
b8825a18a2
|
* Create new contact list if no contact list when manage contacts.
|
2016-04-26 17:06:14 +08:00 |
|
|
wangyidong
|
ba10199096
|
* fix bug for build menu.
|
2016-04-26 16:47:38 +08:00 |
|
|
wangyidong
|
5107805a0f
|
Merge branch 'master' of github.com:easysoft/zentaopms
|
2016-04-26 16:24:02 +08:00 |
|
|
wangyidong
|
0e5971967b
|
* remove check domain in getSiteCode.
|
2016-04-26 16:23:24 +08:00 |
|
|
wangyidong
|
b2a03b7595
|
* adjust for init block.
|
2016-04-26 16:22:36 +08:00 |
|
|
Catouse
|
652dbbed75
|
* ajust code.
|
2016-04-26 15:59:47 +08:00 |
|
|
Catouse
|
cbbdbb63b8
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
Conflicts:
module/common/model.php
module/custom/model.php
|
2016-04-26 15:56:54 +08:00 |
|
|
Catouse
|
fb160e115d
|
* improve tutorial UI.
|
2016-04-26 15:54:12 +08:00 |
|
|
wangyidong
|
676a46f4be
|
Merge branch 'master' of github.com:easysoft/zentaopms
|
2016-04-26 15:52:45 +08:00 |
|
|
wangyidong
|
b69889c388
|
* adjust for user-create by tutorial-wizard.
|
2016-04-26 15:52:08 +08:00 |
|
|
chenfeiCF
|
ee047197cc
|
* adjust english lang item for tutorial module.
|
2016-04-26 15:46:34 +08:00 |
|
|
chenfeiCF
|
f91aad9e46
|
* fix error for english lang item of tutorial module.
|
2016-04-26 15:26:55 +08:00 |
|
|
wangyidong
|
a20671196a
|
* remove novice mode config.
|
2016-04-26 15:03:50 +08:00 |
|
|
wangyidong
|
7128018714
|
* change for encrypt password.
|
2016-04-26 15:00:55 +08:00 |
|
|
wangyidong
|
947ee783ff
|
* switch for encrypt password.
|
2016-04-26 14:59:17 +08:00 |
|
|
chenfeiCF
|
19d44f1eba
|
* fix colspan for product and project batch edit view.
|
2016-04-26 14:17:55 +08:00 |
|
|
chenfeiCF
|
f0f665cc01
|
* set chosen-drop min width for plan field when batch edit bugs.
|
2016-04-26 14:12:47 +08:00 |
|
|
chenfeiCF
|
4fb6f580c5
|
* fix textarea height in chrome.
|
2016-04-26 14:04:10 +08:00 |
|
|
chenfeiCF
|
796121e476
|
* Set default join date if join field is empty when batch create users.
|
2016-04-26 13:34:06 +08:00 |
|
|
chenfeiCF
|
6409895aa2
|
* fix tfoot style for todo method of my module: import button should not wrap.
|
2016-04-26 10:42:37 +08:00 |
|
|
Catouse
|
ff8c4bb5e9
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2016-04-26 10:37:13 +08:00 |
|
|
Catouse
|
cb5f7162c8
|
* change zentao help page link.
|
2016-04-26 10:36:58 +08:00 |
|
|
Catouse
|
956e2259ee
|
* change style of 'misc/feature' view.
|
2016-04-26 10:36:45 +08:00 |
|
|
wangyidong
|
23de8db1cd
|
Merge branch 'master' of github.com:easysoft/zentaopms
|
2016-04-26 10:26:17 +08:00 |
|
|
wangyidong
|
8362b154c7
|
* change for get viewType.
|
2016-04-26 10:25:45 +08:00 |
|
|
chenfeiCF
|
23773b99c8
|
* fix style for buildexporttpl view if template name is too long.
|
2016-04-26 10:18:26 +08:00 |
|
|
chenfeiCF
|
bf2a617c90
|
* fix style for block view.
|
2016-04-26 09:59:15 +08:00 |
|
|
chenfeiCF
|
af195c974d
|
* remove console.log.
|
2016-04-26 09:37:09 +08:00 |
|
|
chenfeiCF
|
734da9eb37
|
* remove 'arrow' for fixing product index page style.
* add english lang item for search module.
|
2016-04-26 09:26:13 +08:00 |
|
|
wangyidong
|
6f2024abac
|
Merge branch 'master' of github.com:easysoft/zentaopms
|
2016-04-26 09:23:24 +08:00 |
|
|
wangyidong
|
03a8e3a2d6
|
* build tutorial data and add wizard function.
|
2016-04-26 09:22:46 +08:00 |
|
|
chenfeiCF
|
1f84eac3e3
|
* fix colspan for results method of testtask module.
|
2016-04-26 09:03:03 +08:00 |
|
|
Catouse
|
5200d26e7b
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2016-04-25 18:31:35 +08:00 |
|
|
Catouse
|
40d5b4190c
|
* finish task #2544.
|
2016-04-25 18:31:25 +08:00 |
|
|
Catouse
|
131e996a59
|
* update zui.
|
2016-04-25 18:26:47 +08:00 |
|
|
Catouse
|
9ce9183d8b
|
* remove console.log.
|
2016-04-25 17:45:15 +08:00 |
|
|
chenfeiCF
|
81eea5e27d
|
* add english lang item.
|
2016-04-25 17:04:12 +08:00 |
|
|
chenfeiCF
|
044f7de265
|
Merge branch 'master' of github.com:easysoft/zentaopms
|
2016-04-25 16:34:37 +08:00 |
|
|
chenfeiCF
|
09059f6b7d
|
* add english lang item and change for zh-cn.
|
2016-04-25 16:33:03 +08:00 |
|
|
Catouse
|
6a48745fcb
|
* fix percent calculate method.
|
2016-04-25 16:28:28 +08:00 |
|