Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
12,210 Commits 2 Branches 292 Tags
b1c2675439401075e5bc2aaf5d732979c6ed35e8
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
xia0ta0 a94f44416c * adjust language of dev. 2015-03-05 09:38:03 +08:00
xia0ta0 ab274a4ff8 Merge branch 'master' of github.com:easysoft/zentaopms 
Conflicts:
	module/dev/lang/en.php
 2015-03-05 09:20:44 +08:00
xia0ta0 22f0a7fb22 + add api css. 2015-03-05 09:11:11 +08:00
xia0ta0 37cfad323c + add english. 
* adjust style.
 2015-03-05 09:03:13 +08:00
xia0ta0 8e2899f62b - remove editor from extension. 2015-02-27 08:40:37 +08:00
xia0ta0 5b7075f444 * adjust menuOrder of admin. 2015-02-27 08:38:28 +08:00
xia0ta0 b34318a028 + add dev module. 2015-02-26 16:19:57 +08:00
xia0ta0 6efa9f6768 * move editor from extension to dev. 2015-02-26 16:16:46 +08:00
xia0ta0 fc495455bf * adjust submenu of admin. 2015-02-26 16:11:35 +08:00
xia0ta0 adde00fd9e * move notice() to callback. 2015-01-29 14:00:35 +08:00
xia0ta0 1d5557f545 * use notice() for scan builds. 2015-01-29 13:02:13 +08:00
xia0ta0 7f38bf0dfa - remove create and refresh link. 2015-01-29 13:00:27 +08:00
xia0ta0 4834ab8ae7 + add style. 2014-12-12 14:52:40 +08:00
xia0ta0 1acfbb2fdb + add title of testtask. 2014-12-12 14:51:18 +08:00
xia0ta0 c34d2e4a3b * code for task#2155. 2014-12-12 14:36:07 +08:00
xia0ta0 65dd7aada9 * code for task#2162. 2014-12-12 12:13:38 +08:00
xia0ta0 c39c589b83 * code for task#2162. 2014-12-12 12:13:04 +08:00
xia0ta0 da076dc5eb * code for task#2163. 2014-12-12 11:06:39 +08:00
xia0ta0 1228ad8b1f * code for task#2146. 2014-12-12 10:27:43 +08:00
xia0ta0 118d2e9a22 * code for task#2172. 2014-12-12 09:36:14 +08:00
xia0ta0 b6c6ff304b * code for task#658. 2014-12-12 09:32:06 +08:00
xia0ta0 0d194bfec0 * code for task#658. 2014-12-12 09:22:25 +08:00
xia0ta0 54c49e2340 * code for task#2154. 2014-12-11 17:40:06 +08:00
xia0ta0 f67741ebcf * code for task#2154. 2014-12-11 17:34:18 +08:00
xia0ta0 6fec0feae6 * code for task#1302. 2014-12-11 16:38:04 +08:00
xia0ta0 c4f4e10717 Merge branch 'master' of github.com:easysoft/zentaopms 2014-12-11 15:58:27 +08:00
xia0ta0 b3e936ba9e * code for task#1302: adjust link style. 2014-12-11 15:57:34 +08:00
xia0ta0 26b399bf40 * code for task#1302. 2014-12-11 15:55:46 +08:00
xia0ta0 1cf0e89af6 * code for task#2160. 2014-12-11 09:32:11 +08:00
xia0ta0 df54dbdde6 * code for task#2171. 2014-12-10 17:39:41 +08:00
xia0ta0 0d0e5e387c Merge branch 'master' of github.com:easysoft/zentaopms 2014-12-10 17:37:20 +08:00
xia0ta0 571770ea9b * code for task#2171. 2014-12-10 17:36:45 +08:00
xia0ta0 08359a0bfd * code for task#2171. 2014-12-10 16:32:01 +08:00
xia0ta0 e421f17225 * code for task#2166. 2014-12-10 14:03:58 +08:00
xia0ta0 2677c5086a * code for task#2173. 2014-12-10 13:37:17 +08:00
xia0ta0 3477298ca4 Merge branch 'master' of github.com:easysoft/zentaopms 2014-12-10 11:32:38 +08:00
xia0ta0 0399ee3358 * fix bug#647. 2014-12-10 11:27:55 +08:00
xia0ta0 9431e4792e Merge branch 'master' of github.com:easysoft/zentaopms 2014-12-09 15:23:28 +08:00
xia0ta0 08995fda1d - remove default date. 2014-12-09 15:23:02 +08:00
xia0ta0 f22b980c23 * add ignore for iconv. 2014-11-25 10:40:19 +08:00
xia0ta0 97d20d77c7 Merge branch 'master' of github.com:easysoft/zentaopms 2014-10-30 14:51:39 +08:00
xia0ta0 f5b311cd0f * fix bug: get stories of custom child module error. 2014-10-30 14:50:06 +08:00
xia0ta0 4fedcd4234 * fix bug of fixModulePath. 2014-10-15 15:20:35 +08:00
xia0ta0 e432ebcdd5 * fix warning of convert. 2014-09-16 14:39:05 +08:00
xia0ta0 19238caba0 * fix warning of convert. 2014-09-16 14:27:42 +08:00
xia0ta0 225a5eb413 * fix '&para'. 2014-09-02 10:08:08 +08:00
xia0ta0 66a91d13c4 * fix word error. 2014-09-01 10:00:35 +08:00
xia0ta0 aa2f1f4874 * format jsRoot. 2014-08-20 10:56:21 +08:00
xia0ta0 41c3ffae4f Merge branch 'master' of github.com:easysoft/zentaopms 
Conflicts:
	module/search/view/buildform.html.php
 2014-08-20 10:54:50 +08:00
xia0ta0 86adf69f6e * fix warning: jsRoot is not defined. 2014-08-20 10:48:02 +08:00
xia0ta0 5dfcdd1661 - remove passwordMD5 of user. 2014-07-10 15:34:58 +08:00
xia0ta0 4610b92469 * correct wrong word: build. 2014-06-27 10:49:41 +08:00
xia0ta0 c3dac010d7 Merge branch 'master' of github.com:easysoft/zentaopms 2014-06-25 11:38:38 +08:00
xia0ta0 60bcd3bdef * adjust local image upload to tab1. 2014-06-25 11:37:06 +08:00
xia0ta0 2917c23ffc Merge branch 'master' of github.com:easysoft/zentaopms 2014-06-25 09:01:23 +08:00
xia0ta0 6572e1c2d3 - remove the danger color. 2014-06-25 09:00:43 +08:00
xia0ta0 6525e86598 * fix error of check.php. 2014-06-24 16:14:33 +08:00
xia0ta0 4f15887eb1 * adjust zh-tw. 2014-06-24 15:33:20 +08:00
xia0ta0 f62491ccff Merge branch 'master' of github.com:easysoft/zentaopms 2014-06-24 14:44:22 +08:00
xia0ta0 daaaade2d4 + add changelog of version6.0.statble. 2014-06-24 14:40:56 +08:00
xia0ta0 6c57a180fb * adjust style. 2014-06-24 10:50:07 +08:00
xia0ta0 e4ce0bfd72 * add fixed style. 2014-06-24 10:16:05 +08:00
xia0ta0 fbed456baa * change type of hours from tinyint to float. 2014-06-24 10:07:47 +08:00
xia0ta0 6d9c9061c0 * format. 2014-06-24 09:56:41 +08:00
xia0ta0 d6cb7e64ba * fix bug#600. 2014-06-24 09:53:45 +08:00
xia0ta0 1df7ace94f * change version to 6.0 2014-06-24 09:38:04 +08:00
xia0ta0 d9b1e3183e + add updateVersion 6.0.beta1. 2014-06-23 15:27:52 +08:00
xia0ta0 23ac86e209 * code for task#1899. 2014-06-23 14:36:25 +08:00
xia0ta0 c5f387b238 Merge branch 'master' of github.com:easysoft/zentaopms 2014-06-23 14:08:07 +08:00
xia0ta0 b62a302b84 * code for task#1903. 2014-06-23 14:07:32 +08:00
xia0ta0 f30cfb9a70 * add fixed style to my module. 2014-06-23 10:17:57 +08:00
xia0ta0 bd2feb579a * code for task#1902. 2014-06-23 10:14:11 +08:00
xia0ta0 b55044252f * code for task#1906, fix QQMail. 2014-06-23 10:10:49 +08:00
xia0ta0 def3baca15 * code for task#1915. 2014-06-20 14:24:32 +08:00
xia0ta0 d358657499 Merge branch 'master' of github.com:easysoft/zentaopms 2014-06-20 10:04:47 +08:00
xia0ta0 78534a9e00 * code for task#1892. 2014-06-20 10:02:09 +08:00
xia0ta0 a410db00ca * code for task#1873. 2014-06-20 09:18:07 +08: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
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
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
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
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
xia0ta0 24fb051e6d * fix. 2014-06-03 14:24:24 +08:00
xia0ta0 43402acc05 * fix. 2014-06-03 14:04:10 +08:00
xia0ta0 6583eb6a90 * delete empty lines. 2014-06-03 11:09:04 +08:00
xia0ta0 a7f3f9019c * adjust position of import and export. 2014-05-29 16:11:10 +08:00
xia0ta0 eb7bb6cf9d Merge branch 'master' of github.com:easysoft/zentaopms 2014-05-29 16:04:25 +08:00
xia0ta0 e18e307352 * fix. 2014-05-29 16:04:07 +08:00
xia0ta0 7ce3733f52 * fix bug: chosen when select project. 2014-05-27 09:31:21 +08:00
xia0ta0 3343c88fb1 * adjust minifyfront. 2014-04-30 16:08:20 +08:00
xia0ta0 438ab7982c Merge branch 'master' of github.com:easysoft/zentaopms 2014-04-30 15:11:27 +08:00