Commit Graph
6346 Commits
Author SHA1 Message Date
wangyidong eee2645fdb * finish task #1893. 2014-06-20 02:18:08 +00:00
wangyidong e28cfa8efc Merge branch 'master' of github.com:easysoft/zentaopms 2014-06-19 06:26:59 +00:00
wangyidong b1c8b7953a * finish task #1904. 2014-06-19 06:26:31 +00:00
wangyidong 3237bbba18 * finish task #1905. 2014-06-19 06:26:06 +00:00
Catouse fa9fe66c6e * fixed style of article content by update zui. 2014-06-19 14:23:35 +08:00
wangyidong 44ca8ae708 Merge branch 'master' of github.com:easysoft/zentaopms 2014-06-19 02:29:25 +00:00
wangyidong d4fd617924 * finish task #1901. 2014-06-19 02:28:53 +00:00
Catouse 193ac6b956 * removed test data. 2014-06-18 20:08:30 +08:00
Catouse 02854685b1 * changed sparkline to chartjs.
* ajusted style of progressbar.
2014-06-18 19:01:19 +08:00
wangyidong 97bd6b4a0a Merge branch 'master' of github.com:easysoft/zentaopms 2014-06-18 09:21:15 +00:00
wangyidong c7f978a69a * fix a bug. 2014-06-18 09:20:55 +00:00
xia0ta0 af1628ebc3 Merge branch 'master' of github.com:easysoft/zentaopms 2014-06-18 16:34:17 +08:00
xia0ta0 4b79bfcd2c * code for task#1886. 2014-06-18 16:33:45 +08:00
wangyidong 83710606cc Merge branch 'master' of github.com:easysoft/zentaopms
Conflicts:
	module/task/view/create.html.php
2014-06-18 08:31:39 +00:00
wangyidong 7d67d5da39 * finish task #1897. 2014-06-18 08:13:54 +00:00
xia0ta0 59027f67bd Merge branch 'master' of github.com:easysoft/zentaopms 2014-06-18 15:43:42 +08:00
xia0ta0 78ea03f55c * code for task #1894. 2014-06-18 15:40:15 +08:00
wangyidong d8e24edd3c Merge branch 'master' of github.com:easysoft/zentaopms 2014-06-18 06:54:15 +00:00
wangyidong 1a0837a9a0 * finish task #1881. 2014-06-18 06:53:46 +00:00
xia0ta0 80d47537f3 - code for task#1915: remove custom fields of bugs. 2014-06-18 14:09:56 +08:00
xia0ta0 f38a2dee54 Merge branch 'master' of github.com:easysoft/zentaopms 2014-06-18 13:36:35 +08:00
xia0ta0 2bc26e6bf5 * code for task#1896. 2014-06-18 13:36:12 +08:00
wangyidong 5030a42ad7 Merge branch 'master' of github.com:easysoft/zentaopms 2014-06-18 03:23:52 +00:00
wangyidong d1431b9ddb * finish task #1876. 2014-06-18 03:22:13 +00:00
Catouse bb51c37bfe * changed icon of create task action.
* fixed style of story for ie8.
 * updated zui.
2014-06-18 11:17:32 +08:00
Catouse daf87b209f * fixed ui of file form. 2014-06-18 11:16:25 +08:00
xia0ta0 697e1b5967 Merge branch 'master' of github.com:easysoft/zentaopms 2014-06-18 11:13:21 +08:00
xia0ta0 578c4620c4 * code for task#1916. 2014-06-18 11:12:48 +08:00
wangyidong ff1f4191a5 Merge branch 'master' of github.com:easysoft/zentaopms 2014-06-18 03:03:47 +00:00
wangyidong af5f8653ab * finish task #1874. 2014-06-18 02:53:33 +00:00
xia0ta0 fca6253f87 * fix bug: cannot get mulitiple git logs. 2014-06-18 10:02:16 +08:00
xia0ta0 0337b3337f * code for task#1894. 2014-06-18 09:37:01 +08:00
xia0ta0 9b7eb2f9c4 * code for task#1889. 2014-06-17 17:19:15 +08:00
xia0ta0 6b2601d870 Merge branch 'master' of github.com:easysoft/zentaopms 2014-06-17 15:27:15 +08:00
xia0ta0 6696901714 * code for task#1888. 2014-06-17 15:26:05 +08:00
wangyidong 1b4c382463 * finish task #1913. 2014-06-17 07:08:30 +00:00
wangyidong db8fc4ba8d * finish task #1912. 2014-06-17 06:40:02 +00:00
wangyidong 0355d9e18e * finish task #1914. 2014-06-17 06:35:41 +00:00
wangyidong c2f16c22cb * finish task #1918. 2014-06-17 06:03:27 +00:00
Catouse 17838c114a * fixed an bug in my.js. 2014-06-11 17:36:07 +08:00
Catouse 8830c79df0 * fixed an error in my.js. 2014-06-10 11:52:03 +08:00
Catouse 369d48a45f * fixed outer height for ie8. 2014-06-10 11:44:13 +08:00
Catouse d7b48b0733 * added option(waittime) to limit the loading of iframe modal.
* fixed style for ie 11.
 * ajusted code format.
2014-06-10 11:43:44 +08:00
Catouse 5fe5b91ba4 * fixed function 'setModal4List' in my.js. 2014-06-09 16:49:58 +08:00
Catouse bade5dfd2c * fixed a bug: page not reload when close modal on story/view. 2014-06-09 16:16:39 +08:00
Catouse 3b854e6224 * updated zui. 2014-06-09 15:32:52 +08:00
Catouse df0cc53224 * optimized style for mobile devices.
* ajsuted style of pager.
2014-06-09 15:02:53 +08:00
Catouse 489d815e8a * fixed my.js. 2014-06-06 16:15:53 +08:00
Catouse e47aa188ae * added default options to datepicker.
* ajusted style of todo/bachcreate opened with modal.
 * added method to jquery object to open iframe modal.
2014-06-06 11:51:11 +08:00
Catouse ef4a98a4e1 * updated zui.
* fixed an error in my.js.
2014-06-05 10:27:27 +08:00