chenfeiCF
|
dcead9593f
|
* adjust code for task #2577.
|
2016-04-28 09:13:28 +08:00 |
|
wangyidong
|
a95d623dec
|
* fix bug for show dashboard first.
|
2016-04-28 08:38:45 +08:00 |
|
wangyidong
|
d01ba354a2
|
Merge branch 'master' of github.com:easysoft/zentaopms
|
2016-04-27 17:32:44 +08:00 |
|
wangyidong
|
64ba2bc34f
|
* adjust for block.
|
2016-04-27 17:32:00 +08:00 |
|
Catouse
|
65a591a8f4
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2016-04-27 17:13:49 +08:00 |
|
Catouse
|
6b2375b028
|
* change menu UI.
|
2016-04-27 17:13:19 +08:00 |
|
Catouse
|
5707226b82
|
* change tutorial UI.
|
2016-04-27 17:13:03 +08:00 |
|
wangyidong
|
2f794905bf
|
Merge branch 'master' of github.com:easysoft/zentaopms
|
2016-04-27 16:56:06 +08:00 |
|
wangyidong
|
ef016ae98a
|
* change for md5 password.
|
2016-04-27 16:55:33 +08:00 |
|
Catouse
|
281173aefe
|
* fix UI of tree edit view.
|
2016-04-27 16:32:03 +08:00 |
|
Catouse
|
7c95170c7d
|
* fix style of table in report charts.
|
2016-04-27 15:07:30 +08:00 |
|
Catouse
|
763aeda1cd
|
* fix style of datatable menu.
|
2016-04-27 14:51:19 +08:00 |
|
Catouse
|
b880e32ddb
|
* change color of dashboard action links.
|
2016-04-27 14:50:53 +08:00 |
|
Catouse
|
6870ce3684
|
* fix bug #824.
|
2016-04-27 13:49:13 +08:00 |
|
Catouse
|
5ba877d710
|
* fix bug #826.
|
2016-04-27 13:48:37 +08:00 |
|
Catouse
|
8ca15e50b9
|
* change list group style in my/managecontacts.
|
2016-04-27 13:43:41 +08:00 |
|
Catouse
|
5a2364454a
|
* change dashboard UI.
|
2016-04-27 11:55:40 +08:00 |
|
Catouse
|
1b4639d5f9
|
* change tree UI.
|
2016-04-27 11:39:13 +08:00 |
|
chenfeiCF
|
dfe818bd11
|
Merge branch 'master' of github.com:easysoft/zentaopms
|
2016-04-27 10:13:09 +08:00 |
|
chenfeiCF
|
3f16cc786b
|
* change code for addPriv8_2 method.
|
2016-04-27 10:12:29 +08:00 |
|
wangyidong
|
a974ec32d0
|
Merge branch 'master' of github.com:easysoft/zentaopms
|
2016-04-27 09:59:52 +08:00 |
|
wangyidong
|
93001c037c
|
* add zh-tw lang and check en lang.
|
2016-04-27 09:59:23 +08:00 |
|
chenfeiCF
|
4967d2d5e5
|
* adjust code for buildexporttpl view.
|
2016-04-27 09:52:39 +08:00 |
|
wangyidong
|
54cba0a9e5
|
Merge branch 'master' of github.com:easysoft/zentaopms
|
2016-04-27 09:27:38 +08:00 |
|
wangyidong
|
e019ddbba3
|
* add fullchart block in index page.
|
2016-04-27 09:26:58 +08:00 |
|
chenfeiCF
|
f7063f570f
|
* fix bug #828.
|
2016-04-27 09:25:56 +08:00 |
|
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
|
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 |
|