Commit Graph
1073 Commits
Author SHA1 Message Date
Catouse 3663f341e9 * refactor code. 2016-04-21 15:43:36 +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 c4c5f942e8 * change model motheds for menus. 2016-04-20 08:41:42 +08:00
Catouse b52947ed27 * code for task #2518. 2016-04-19 17:50:02 +08:00
Catouse b356e65732 * finish task #2552. 2016-04-18 18:45:58 +08:00
Catouse 62f35f1a18 Merge branch 'master' of https://github.com/easysoft/zentaopms
Conflicts:
	module/project/view/taskheader.html.php
2016-04-18 16:38:37 +08:00
Catouse ba2eff3f57 * code for task #2552. 2016-04-18 16:35:50 +08:00
wangyidong d22230a546 * change for custom menu. 2016-04-18 16:27:15 +08:00
Catouse 8c013e9c26 * fix button style in datatable. 2016-04-15 16:43:27 +08:00
Catouse bb35bbd4a9 * finish task #2517. 2016-04-15 14:19:49 +08:00
Catouse 54a3ededff Merge branch 'master' of https://github.com/easysoft/zentaopms 2016-04-15 11:43:26 +08:00
Catouse 687b30412d - delete datatable resource files: datatable is include in zui. 2016-04-15 11:43:16 +08:00
wangyidong 8fd1ffd129 * change for english. 2016-04-15 11:37:08 +08:00
wangyidong c5dcca79bf * set homepage for product/project/qa. 2016-04-15 11:32:46 +08:00
Catouse 23e76dfc28 * main menu support sort by drag and drop. 2016-04-14 13:37:19 +08:00
Catouse 47628c8d3a Merge branch 'master' of https://github.com/easysoft/zentaopms 2016-04-12 13:40:39 +08:00
Catouse 6b5f1228c8 * finish task #2576. 2016-04-12 13:32:54 +08:00
wangyidong cb5d368c48 * finish task #2524. 2016-04-12 11:23:05 +08:00
chenfeiCF b1e147fec3 * code for task #2528. 2016-04-12 08:28:42 +08:00
wangyidong bfeaca5fa3 * change for browse in mobile. 2016-04-11 10:14:46 +08:00
wangyidong ceb50edff9 * code for task #2527. 2016-04-08 13:28:33 +08:00
wangyidong ea7aabdd3e * add function sort and delete block. 2016-04-08 11:01:24 +08:00
wangyidong c50c181700 * code for task #2529. 2016-04-08 10:41:20 +08:00
Catouse 9b6328ec35 -delete zui.sortable.js: the code is already include in zui. 2016-04-07 15:40:02 +08:00
Catouse b441b18b57 * code for task #2564. 2016-04-07 15:21:41 +08:00
wangyidong ee0ace3c75 * finish task #2559. 2016-04-05 14:29:21 +08:00
wangyidong 511978cd0c * adjust for task #2545,2547. 2016-03-31 11:28:36 +08:00
wangyidong dff1bfb1ae * finish task #2542. 2016-03-31 10:06:54 +08:00
wangyidong b549b7d862 * code for task #2547. 2016-03-30 13:07:16 +08:00
wangyidong b053ec972f * finish task #2545. 2016-03-30 10:55:00 +08:00
wangyidong 92d8ffe16a * finish task #2580. 2016-03-29 15:12:22 +08:00
wangyidong a6a61d7e1f * finish task #2573. 2016-03-29 10:50:33 +08:00
chenfeiCF a0d62eea86 * finish task #2557. 2016-03-28 13:51:43 +08:00
wangyidong be07c40bf7 * code for task #2561. 2016-03-28 09:27:09 +08:00
wangyidong 3430178900 * change for zh-tw. 2016-03-23 13:49:29 +08:00
wangyidong f3e552f275 * fix sprintf with %branch%. 2016-03-23 13:45:08 +08:00
wangyidong 7bda21cac4 * fix bug for pro. 2016-03-23 13:12:46 +08:00
wangyidong b57e0ba64f * change for zh-tw lang. 2016-03-15 11:06:21 +08:00
wangyidong 0b3ef6fba1 Merge branch 'master' of github.com:easysoft/zentaopms 2016-03-15 09:57:51 +08:00
wangyidong 0e7c551027 * fix zget function and fix error. 2016-03-15 09:57:03 +08:00
wangyidong 7f2c61c891 * change for browse notice. 2016-03-15 09:56:33 +08:00
chenfeiCF c6d21eec38 * add confirmBug action icon for zentao mobile web. 2016-03-15 09:51:05 +08:00
chenfeiCF b2d49204b8 * move checkIP method to common model from user model. 2016-03-14 11:31:02 +08:00
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