Commit Graph
11429 Commits
Author SHA1 Message Date
wangyidong 4985646652 * adjust for btn-icon class. 2018-05-09 08:59:25 +08:00
wangyidong 495822efd4 * adjust for doc. 2018-05-08 16:45:07 +08:00
Catouse abec53a54d Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-05-08 16:18:28 +08:00
Catouse c91ca33cb7 * change common views. 2018-05-08 16:18:20 +08:00
Catouse f3d0efab57 * adjust style of products block. 2018-05-08 16:18:11 +08:00
Catouse 67f123fb2e * change todo/batchcreate view. 2018-05-08 16:16:11 +08:00
Catouse 1f144cf5af * update zui files. 2018-05-08 16:15:37 +08:00
daitingting 1fd774b083 * Rewrite view page of doc. 2018-05-08 16:03:34 +08:00
daitingting 0aa7f60012 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-05-08 14:17:23 +08:00
daitingting bba8b0ed1d * Add highlight for sidemenu. 2018-05-08 14:16:55 +08:00
Catouse de33978595 * change front helper class to output better js code. 2018-05-08 14:00:10 +08:00
Catouse c6f29e2242 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-05-08 13:44:42 +08:00
Catouse 12f865ad71 * improve batchcreate form UI. 2018-05-08 13:44:35 +08:00
daitingting 9ef57f3cfe Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-05-08 13:24:50 +08:00
daitingting b1c8712db3 * Adjust title for search. 2018-05-08 13:24:26 +08:00
chenfeiCF 061f8819c9 * Adjust fourth menu for some views of user module. 2018-05-08 13:22:07 +08:00
Catouse e5f168d1ea * improve UI. 2018-05-08 11:44:47 +08:00
Catouse 7405fe8fa4 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-05-08 11:31:32 +08:00
Catouse 0f29586d94 * update zui css file. 2018-05-08 11:31:21 +08:00
daitingting 328e622028 * Add pager for alllibs page. 2018-05-08 11:16:53 +08:00
daitingting 04259632cd Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-05-08 11:06:08 +08:00
daitingting 63246110ac * Adjust codes. 2018-05-08 11:05:54 +08:00
Catouse a992b48ee4 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-05-08 10:58:26 +08:00
Catouse eee114b4d6 * update zui files. 2018-05-08 10:58:19 +08:00
Catouse dda5c7977f * remove unused files. 2018-05-08 10:57:42 +08:00
daitingting 3110b8c5fb * Adjust codes. 2018-05-08 10:52:13 +08:00
daitingting 30df486fea * Adjust icon. 2018-05-08 10:43:19 +08:00
daitingting 29dc19bf16 * Adjust icon. 2018-05-08 10:37:05 +08:00
daitingting ff03083f16 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-05-08 10:28:48 +08:00
daitingting 2799d50d7f * Add pager for doc. 2018-05-08 10:18:38 +08:00
Catouse bfe6c7f85e * update zui. 2018-05-08 09:55:32 +08:00
chenfeiCF decff416f9 * Adjust some view file of user module. 2018-05-07 19:06:52 +08:00
daitingting c4eb4ee453 * Merge it. 2018-05-07 17:33:12 +08:00
daitingting ea560955d9 * Merge it. 2018-05-07 17:30:05 +08:00
daitingting 511e67f579 Merge branch 'master' of https://github.com/easysoft/zentaopms
Conflicts:
	db/update9.8.1.sql
	module/doc/css/common.css
	module/doc/view/browse.html.php
2018-05-07 17:28:29 +08:00
daitingting 42c6502b0f * Rewrite allLibs, objectLibs and browse pages of doc. 2018-05-07 17:27:12 +08:00
滔哥 f6289cc53c Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-05-07 17:08:09 +08:00
滔哥 edb2689262 * Format code. 2018-05-07 16:54:52 +08:00
wangyidong ec493368ee Merge branch 'master' of git://github.com/easysoft/zentaopms 2018-05-07 16:50:15 +08:00
wangyidong 56489075b0 Merge branch 'zentaopms_9.8' 2018-05-07 16:48:59 +08:00
滔哥 427afd5674 * Task#3921 2018-05-07 15:07:31 +08:00
滔哥 27466d9cd8 * Task#3921 2018-05-07 15:04:28 +08:00
liugang 414282d005 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-05-07 11:55:18 +08:00
liugang 70dcc23aca * Refact testtask page of project. 2018-05-07 11:54:54 +08:00
chenfeiCF 5bf160432b Merge branch 'master' of github.com:easysoft/zentaopms 2018-05-07 09:24:34 +08:00
chenfeiCF 433b28e7c1 * Adjust user todo and story view file. 2018-05-07 09:23:42 +08:00
daitingting b38b38365a * Update zui. 2018-05-07 09:23:36 +08:00
wangyidong 83a6c78c3b Merge branch 'master' of github.com:easysoft/zentaopms 2018-05-04 15:14:03 +08:00
wangyidong 55c68b611d * finish task #3936. 2018-05-04 15:13:22 +08:00
daitingting 52adf369e9 * Finish search function. 2018-05-04 09:15:25 +08:00