Commit Graph

7768 Commits

Author SHA1 Message Date
wangyidong
dffd808378 * change for lib can extend with base. 2016-03-10 09:30:15 +08:00
wangyidong
e617014b65 * adjust for fixed tfoot action. 2016-03-10 09:29:42 +08:00
wangyidong
61fb9e38ba Merge branch 'master' of github.com:easysoft/zentaopms 2016-03-09 17:36:40 +08:00
wangyidong
2e7698db31 * change for framework. 2016-03-09 17:36:02 +08:00
wangyidong
4569039d98 * fix style for selectButton. 2016-03-09 17:35:26 +08:00
wangyidong
7da16e22ca * change index name for db. 2016-03-09 17:35:11 +08:00
chenfeiCF
140a15b0be * change the dao property name for task #2458. 2016-03-09 16:50:36 +08:00
chenfeiCF
7a1eb61efd Merge branch 'master' of github.com:easysoft/zentaopms 2016-03-09 13:15:25 +08:00
chenfeiCF
40a300031e * adjust code for story module. 2016-03-09 13:14:36 +08:00
wangyidong
12bdd87463 * fix bug. 2016-03-09 13:13:50 +08:00
wangyidong
6f673a06ed Merge branch 'master' of github.com:easysoft/zentaopms 2016-03-09 13:13:13 +08:00
chenfeiCF
80b9d18d73 * add link story method when edit a story. 2016-03-09 13:03:06 +08:00
wangyidong
81375e9147 * adjust code for fixed table. 2016-03-09 09:32:19 +08:00
wangyidong
a04db8bc49 * change for upgrade. 2016-03-08 16:27:47 +08:00
wangyidong
4f7b7266f4 * adjust code for custom lang. 2016-03-08 15:37:13 +08:00
wangyidong
3525fe15bc * fix error. 2016-03-08 13:50:09 +08:00
wangyidong
152ad148e6 Merge branch 'master' of github.com:easysoft/zentaopms 2016-03-08 11:34:12 +08:00
wangyidong
df85f2625e * finish task #2474 and fix bug. 2016-03-08 11:32:48 +08:00
Catouse
454d7d4942 * change style in default theme for datatable. 2016-03-08 09:15:43 +08:00
wangyidong
26d831d0b6 Merge branch 'master' of github.com:easysoft/zentaopms 2016-03-08 09:10:18 +08:00
Catouse
8c05dd59f4 * improve UI of forms for create action. 2016-03-07 14:07:49 +08:00
Catouse
18f97e6478 * change UI of buttons in table footer. 2016-03-07 13:35:13 +08:00
chenfeiCF
d97d22c0db * add story files and comments for task view. 2016-03-07 13:16:51 +08:00
wangyidong
5722d28e77 * fix bug #785. 2016-03-07 11:15:58 +08:00
wangyidong
fb65e3660b * finish task #2494. 2016-03-07 10:06:20 +08:00
Catouse
b3583677de * change style of priority icon. 2016-03-04 17:30:45 +08:00
Catouse
8c911f45da Merge branch 'master' of https://github.com/easysoft/zentaopms 2016-03-04 17:17:55 +08:00
Catouse
dad0b0395d * change UI for create forms. 2016-03-04 17:17:42 +08:00
wangyidong
4017b1ae75 * set time limit to 7200. 2016-03-04 15:21:18 +08:00
wangyidong
7603866e92 * merge in db and adjust code. 2016-03-04 14:50:48 +08:00
wangyidong
0d47f23a19 Merge branch 'master' of github.com:easysoft/zentaopms 2016-03-04 14:43:21 +08:00
chenfeiCF
3e19bde847 * merge the update8.0.1.sql. 2016-03-04 14:40:51 +08:00
wangyidong
f6186e949c * adjust code for dao check. 2016-03-04 14:15:01 +08:00
wangyidong
f36272ed99 * fix bug #772. 2016-03-04 14:14:15 +08:00
wangyidong
401e2c0ac1 * fix bug #789. 2016-03-04 13:50:01 +08:00
wangyidong
9cc1a9e055 * adjust code. 2016-03-04 13:36:33 +08:00
wangyidong
051e6530d8 * fix bug #795. 2016-03-04 13:36:09 +08:00
wangyidong
833d40aba6 Merge branch 'master' of github.com:easysoft/zentaopms 2016-03-04 13:08:31 +08:00
wangyidong
8bb0290077 * fix bug #801. 2016-03-04 13:07:20 +08:00
Catouse
51d75e71a2 * add method to init priority selectors. 2016-03-04 13:01:28 +08:00
Catouse
0dafbb66dd Merge branch 'master' of https://github.com/easysoft/zentaopms
Conflicts:
	www/js/my.full.js
2016-03-04 12:20:20 +08:00
Catouse
f1454d2d99 * create new UI for priority selectors. 2016-03-04 12:18:42 +08:00
Catouse
f4980f8377 * add css helpers. 2016-03-04 12:17:53 +08:00
Catouse
2fc659447f * add white space to button and link in login form. 2016-03-04 12:17:23 +08:00
Catouse
4f9fd70b9e * improve UI of story/create view. 2016-03-04 12:17:03 +08:00
wangyidong
59c99c29f3 * adjust code for bug #792. 2016-03-04 11:36:21 +08:00
wangyidong
d9e1606b2e * fix bug #792. 2016-03-04 11:33:54 +08:00
wangyidong
bc18f5d692 * fix bug #796. 2016-03-04 10:36:18 +08:00
wangyidong
a8089272bc Merge branch 'master' of github.com:easysoft/zentaopms 2016-03-03 15:42:19 +08:00
wangyidong
59917d3a0a * finish task #2424. 2016-03-03 15:41:00 +08:00