Commit Graph

1029 Commits

Author SHA1 Message Date
wangyidong
0f6e89bd70 - rm treeview.html.php. 2016-03-14 11:28:01 +08:00
wangyidong
516b1f0034 * change hasEdited to editedByOther in common lang. 2016-03-14 10:48:42 +08:00
wangyidong
5188f6aa0b Merge branch 'master' of github.com:easysoft/zentaopms 2016-03-14 08:10:15 +08:00
chenfeiCF
0bebfe176a * delete lang items which have not been used. 2016-03-14 02:44:40 +08:00
chenfeiCF
bbbd0891ff * put the hint of preAndNext shortcut key on the back of title. 2016-03-12 21:16:34 +08:00
wangyidong
1a8a8a0be4 * adjust mail style. 2016-03-11 17:31:39 +08:00
wangyidong
470eb3a281 * adjust code for common. 2016-03-11 14:56:36 +08:00
wangyidong
c96be8964a * change for framework. 2016-03-10 11:15:24 +08:00
Catouse
18f97e6478 * change UI of buttons in table footer. 2016-03-07 13:35:13 +08:00
wangyidong
e23311969d * change for new framework. 2016-03-01 10:57:53 +08:00
wangyidong
a261867468 Merge branch 'master' of github.com:easysoft/zentaopms 2016-02-24 08:41:08 +08:00
wangyidong
b8474bddf5 * fix bug. 2016-02-24 08:38:49 +08:00
Catouse
334a0b1009 * change UI of mail content for user. 2016-02-23 16:55:50 +08:00
chenfeiCF
98e7f59798 * finish task #2482. 2016-02-23 13:41:52 +08:00
chenfeiCF
baa2b472c2 * finish task #2493. 2016-02-22 21:49:51 +08:00
Catouse
9141bb13d7 * fix style of tree menu. 2016-02-22 15:03:44 +08:00
Catouse
4b76d36e9e * finish task #2469. 2016-02-22 10:29:28 +08:00
wangyidong
33d94add3b * code for task #2460. 2016-02-19 11:04:53 +08:00
wangyidong
83d41f0345 * finish task #2502. 2016-02-18 10:59:37 +08:00
wangyidong
d01b8eb8df * finish task #2489. 2016-02-17 14:18:54 +08:00
wangyidong
8b1c8fb46f * code for task #1799. 2016-02-17 10:40:17 +08:00
wangyidong
26e611bee5 * finish task #1799. 2016-02-17 10:16:18 +08:00
wangyidong
e8bb9aa1ee * finish task #1295. 2016-02-15 17:29:23 +08:00
wangyidong
1f9055b610 * fix bugs and adjust code. 2016-01-25 13:50:58 +08:00
wangyidong
7007f4b888 * finish task #2425. 2015-12-22 13:27:26 +08:00
wangyidong
9c6d301c9c * finish task #2428. 2015-12-21 16:02:41 +08:00
wangyidong
5933daa169 * change js parents to closest. 2015-12-01 11:03:29 +08:00
wangyidong
2d61ca8d34 * change zh-tw. 2015-11-13 10:55:50 +08:00
wangyidong
275c833e02 * finish task #2394. 2015-11-12 10:14:43 +08:00
wangyidong
4cf14c3e43 Merge branch 'master' of github.com:easysoft/zentaopms 2015-11-10 10:56:35 +08:00
wangyidong
a0c97d7e01 * adjust for branch name by product name. 2015-11-10 10:55:34 +08:00
chenfeiCF
fe99321c45 * finish task #2396. 2015-11-10 10:43:23 +08:00
wangyidong
951f843615 * change for en and zh-tw lang. 2015-11-06 15:35:18 +08:00
wangyidong
5f70edfbfd * fix bug and adjust sso-bind page. 2015-11-06 09:26:00 +08:00
wangyidong
e003ed01f0 * finish task #2363,2364. 2015-11-05 17:27:59 +08:00
wangyidong
015401d1e0 * change zpl 1.1 to 1.2. 2015-11-05 14:09:52 +08:00
wangyidong
b65a72e141 * change code and add notice. 2015-11-03 16:05:40 +08:00
wangyidong
fa09186c68 * fix bug for WooYun-2015-137380. 2015-11-03 08:25:03 +08:00
wangyidong
5d7126f5ca * finish task #2335. 2015-11-02 15:30:43 +08:00
wangyidong
e58fe08c46 * adjust search config for branch. 2015-10-30 09:13:43 +08:00
wangyidong
3673201509 * adjust for task #2336. 2015-10-27 15:03:20 +08:00
wangyidong
9ad38472fc * finish task #2336,2337,2338,2339. 2015-10-20 10:11:46 +08:00
wangyidong
9ec0520b34 * finish task #2371. 2015-10-14 11:11:52 +08:00
wangyidong
abf8b97904 * change for zh-tw. 2015-09-18 09:59:43 +08:00
wangyidong
b54316ef32 * adjust for import. 2015-09-17 13:30:14 +08:00
wangyidong
0571ffe6a3 * finish task #2276. 2015-09-07 16:56:44 +08:00
wangyidong
474e1fe5bd + finish task #2279. 2015-09-07 09:23:21 +08:00
wangyidong
79fea4c0b1 * code for task #2288. 2015-09-02 10:13:15 +08:00
Catouse
615fb2ff1f * finish task #2312. 2015-08-26 15:23:34 +08:00
wangyidong
d1d56b2a6a * change for zh-tw. 2015-08-06 10:46:30 +08:00