Commit Graph

104 Commits

Author SHA1 Message Date
chenfeiCF
087e5aed22 * finish task #2867. 2017-01-09 13:47:12 +08:00
wangyidong
afbe60c77f * readonly when key is null. 2017-01-03 10:41:37 +08:00
wangyidong
141b5c4df0 * change for en lang and zh-tw lang. 2017-01-03 10:18:33 +08:00
chenfeiCF
403e75c974 * fix bug #942. 2016-12-23 10:30:06 +08:00
chenfeiCF
4c2166b1c1 * fix bug #951. 2016-12-22 14:54:42 +08:00
wangyidong
01e94f8261 * fix bug for custom longlife. 2016-12-15 08:25:36 +08:00
tengfei
d8ea232ee7 *Adjust for screenshot 2016-12-14 11:32:57 +08:00
tengfei
0531694dab *edit new added items 2016-12-06 14:29:35 +08:00
wangyidong
21e8457d5e * change for resource and en zh-tw lang. 2016-12-06 13:25:25 +08:00
wangyidong
80ad4ce758 * finish task #2699. 2016-12-01 10:15:24 +08:00
wangyidong
582e392429 * code for task #2699,2791. 2016-11-18 17:12:09 +08:00
wangyidong
49b2e7b9ae * finish task #2797. 2016-11-15 14:02:14 +08:00
wangyidong
80a2e16111 * adjust for doc menu. 2016-11-09 11:00:37 +08:00
wangyidong
78db39b7dc * change for en lang. 2016-11-07 11:14:35 +08:00
wangyidong
9a83ebe44a * adjust for custom. 2016-10-26 15:03:11 +08:00
wangyidong
000addf392 * finish task #2671. 2016-10-25 15:52:23 +08:00
chenfeiCF
3e402d5459 * adjust code for json_encode method to be compatible with php 5.2 and which below 5.2. 2016-06-28 14:17:44 +08:00
wangyidong
15bb4129ac * adjust for mergeFeatureBar. 2016-06-07 15:58:33 +08:00
wangyidong
be4f6cedda * finish task #2593. 2016-06-07 13:21:17 +08:00
wangyidong
05b5a5fba1 * fix for custom menu. 2016-05-31 13:51:18 +08:00
wangyidong
02f387b8a7 * fix for mobile view. 2016-05-18 08:59:42 +08:00
wangyidong
a72f1f8fd4 * fix bug for custom menu. 2016-05-10 10:34:50 +08:00
wangyidong
6363622f27 * mark search query when custom menu. 2016-05-05 13:42:58 +08:00
wangyidong
f65262b094 * change for zh-tw and en lang. 2016-05-04 17:19:59 +08:00
wangyidong
5d70ec7e35 adjust code. 2016-05-04 14:59:39 +08:00
wangyidong
a512350363 * adjust code. 2016-05-03 17:13:11 +08:00
wangyidong
9dd48a815e * adjust code. 2016-05-03 10:10:51 +08:00
Catouse
80f3d591c0 * refactor code. 2016-04-29 09:40:38 +08:00
Catouse
b7c1125b30 * ajust code. 2016-04-28 15:17:30 +08:00
Catouse
6b2375b028 * change menu UI. 2016-04-27 17:13:19 +08:00
wangyidong
93001c037c * add zh-tw lang and check en lang. 2016-04-27 09:59:23 +08:00
wangyidong
6d0d9bd80e * fix bug for feature bar custom menu. 2016-04-26 17:07:39 +08:00
wangyidong
ba10199096 * fix bug for build menu. 2016-04-26 16:47:38 +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
a20671196a * remove novice mode config. 2016-04-26 15:03:50 +08:00
wangyidong
03a8e3a2d6 * build tutorial data and add wizard function. 2016-04-26 09:22:46 +08:00
wangyidong
1e49a490c4 * adjust for branch and add restore function. 2016-04-25 10:04:09 +08:00
Catouse
c39b58eaa6 Merge branch 'master' of https://github.com/easysoft/zentaopms 2016-04-22 20:38:26 +08:00
Catouse
37ffcf59d8 * code for task #2562. 2016-04-22 18:04:15 +08:00
wangyidong
ed4ad97ac3 * adjust for custom menu. 2016-04-22 14:16:22 +08:00
Catouse
063b1c97e2 * make close modal button work. 2016-04-22 09:58:31 +08:00
Catouse
2894c8b046 * fix menu custom UI. 2016-04-21 17:28:37 +08:00
Catouse
a64adf09c8 * ajust code. 2016-04-21 16:22:47 +08:00
Catouse
3663f341e9 * refactor code. 2016-04-21 15:43:36 +08:00
Catouse
70abc0efab * fix error for build menu config. 2016-04-21 13:48:40 +08:00
Catouse
825350f421 * improve custom menu UI. 2016-04-21 12:07:15 +08:00
Catouse
27676eeb4b * add menu custom UI. 2016-04-21 08:45:43 +08:00
Catouse
0d727fc3d8 * change menu method. 2016-04-20 15:39:47 +08:00