 wyd621
|
d460fad520
|
Merge branch 'master' of git@github.com:easysoft/zentaopms
Conflicts:
module/my/view/todo.html.php
module/my/view/todolist.html.php
|
2013-07-31 11:07:27 +08:00 |
|
|
wyd621
|
52df5c7003
|
* adjust setModal4List.
|
2013-07-31 10:49:27 +08:00 |
|
|
wyd621
|
5254926952
|
Merge branch 'master' of git@github.com:easysoft/zentaopms
|
2013-07-31 08:28:35 +08:00 |
|
|
wyd621
|
22de2ae12e
|
* finish task #1616.
|
2013-07-30 17:10:45 +08:00 |
|
|
wyd621
|
88913cad8c
|
Merge branch 'master' of git@github.com:easysoft/zentaopms
|
2013-07-30 16:24:34 +08:00 |
|
|
wyd621
|
6191995428
|
* finish task #1626.
|
2013-07-30 16:23:32 +08:00 |
|
|
wyd621
|
de0a6190a9
|
* finish task #1638.
|
2013-07-30 15:26:05 +08:00 |
|
|
wyd621
|
3a4e56ced5
|
* finish task #1641.
|
2013-07-30 15:13:41 +08:00 |
|
|
wyd621
|
1a7d780ad5
|
* finish task #1650.
|
2013-07-30 14:02:51 +08:00 |
|
|
wyd621
|
d47e601cf9
|
* fix a bug.
|
2013-07-30 13:38:26 +08:00 |
|
|
wyd621
|
60d4a104a0
|
Merge branch 'master' of git@github.com:easysoft/zentaopms
|
2013-07-30 10:12:54 +08:00 |
|
|
wyd621
|
dd36fdd3a4
|
* finish task #1660.
|
2013-07-30 10:11:41 +08:00 |
|
|
wyd621
|
6ff5e9aa1b
|
Merge branch 'master' of git@github.com:easysoft/zentaopms
|
2013-07-30 09:29:24 +08:00 |
|
|
wyd621
|
dc260d66f5
|
* finish task #1664.
|
2013-07-30 09:21:24 +08:00 |
|
|
wyd621
|
609fb57c65
|
* fix a bug for no csv header.
|
2013-07-30 08:18:16 +08:00 |
|
|
wyd621
|
9ad07920aa
|
Merge branch 'master' of git@github.com:easysoft/zentaopms
|
2013-07-30 08:15:29 +08:00 |
|
|
wyd621
|
2fb8262d78
|
* change for import csv.
|
2013-07-30 08:13:58 +08:00 |
|
|
wyd621
|
35cbd8aa6e
|
* add resloveBy for build.
|
2013-07-29 16:31:48 +08:00 |
|
|
wyd621
|
7fc3ecfb54
|
Merge branch 'master' of git@github.com:easysoft/zentaopms
|
2013-07-29 15:12:12 +08:00 |
|
|
wyd621
|
fb95de9777
|
+ add view file for exportTemplet.
|
2013-07-29 15:11:26 +08:00 |
|
|
wyd621
|
779b0d9bad
|
* add lastRunResult lang.
|
2013-07-29 15:08:26 +08:00 |
|
|
wyd621
|
f7119600f5
|
Merge branch 'master' of git@github.com:easysoft/zentaopms
|
2013-07-29 14:57:52 +08:00 |
|
|
wyd621
|
fa8937eff4
|
* fix the error of pcre.backtrack_limit for preg_match.
|
2013-07-29 14:56:38 +08:00 |
|
|
wyd621
|
fb1b8520a3
|
* fix app->error to app->triggerError.
|
2013-07-29 14:05:29 +08:00 |
|
|
wyd621
|
90966238f5
|
* remove deleted case.
|
2013-07-29 14:04:09 +08:00 |
|
|
wyd621
|
e372173a70
|
* change for upgrade.
|
2013-07-29 14:03:31 +08:00 |
|
|
wyd621
|
882a119c7c
|
* code for task #1607.
|
2013-07-26 12:41:10 +08:00 |
|
|
wyd621
|
945de935d0
|
Merge branch 'master' of git@github.com:easysoft/zentaopms
|
2013-07-26 09:58:02 +08:00 |
|
|
wyd621
|
e20ef0e1c0
|
* code for task #1607.
|
2013-07-26 09:57:19 +08:00 |
|
|
wyd621
|
fa39edb4bc
|
* finish task #1607.
|
2013-07-25 17:05:46 +08:00 |
|
|
wyd621
|
24723cf1f0
|
Merge branch 'master' of git@github.com:easysoft/zentaopms
|
2013-07-25 15:29:04 +08:00 |
|
|
wyd621
|
f700350e83
|
* code for task #1591.
|
2013-07-25 15:21:04 +08:00 |
|
|
wyd621
|
778c835bbc
|
Merge branch 'master' of git@github.com:easysoft/zentaopms
|
2013-07-25 13:47:32 +08:00 |
|
|
wyd621
|
4c3ebc9cc7
|
* finish task #1591 1590.
|
2013-07-25 13:46:02 +08:00 |
|
|
wyd621
|
3b01727bfe
|
Merge branch 'master' of git@github.com:easysoft/zentaopms
|
2013-07-23 17:07:29 +08:00 |
|
|
wyd621
|
abad7c0939
|
* finish task #1595.
|
2013-07-23 16:46:36 +08:00 |
|
|
wyd621
|
fd4a36dc8c
|
* finish task #1601.
|
2013-07-23 15:49:47 +08:00 |
|
|
wyd621
|
3e40581431
|
Merge branch 'master' of git@github.com:easysoft/zentaopms
|
2013-07-23 14:52:19 +08:00 |
|
|
wyd621
|
be31e48b7f
|
* finish task #1600.
|
2013-07-23 14:50:08 +08:00 |
|
|
wyd621
|
692fc5f9f4
|
* fix a bug for import icon.
|
2013-07-23 10:45:18 +08:00 |
|
|
wyd621
|
169626cc18
|
* finish task #1608.
|
2013-07-23 10:43:17 +08:00 |
|
|
wyd621
|
9469cb457d
|
* finish task #1593.
|
2013-07-23 08:41:28 +08:00 |
|
|
wyd621
|
68608781c8
|
Merge branch 'master' of git@github.com:easysoft/zentaopms
|
2013-07-22 15:32:29 +08:00 |
|
|
wyd621
|
d1c69f8217
|
* finish task #1586.
|
2013-07-22 15:25:09 +08:00 |
|
|
wyd621
|
995d7a3088
|
Merge branch 'master' of git@github.com:easysoft/zentaopms
|
2013-07-22 14:17:48 +08:00 |
|
|
wyd621
|
9d5aae6edc
|
* finish task #1585.
|
2013-07-22 14:16:11 +08:00 |
|
|
wyd621
|
4063cbad13
|
Merge branch 'master' of git@github.com:easysoft/zentaopms
|
2013-07-22 08:40:41 +08:00 |
|
|
wyd621
|
042df2c813
|
* finish task #1577.
|
2013-07-19 14:02:48 +08:00 |
|
|
wyd621
|
307eb8832a
|
* finish task #1463.
|
2013-07-19 09:13:37 +08:00 |
|
|
wyd621
|
c0e50a82cd
|
* fix a bug for change pms.
|
2013-07-19 08:22:21 +08:00 |
|
|
wyd621
|
aae95743f9
|
* finish task #1571.
|
2013-07-18 16:48:06 +08:00 |
|
|
wyd621
|
67fd654b2e
|
* code for task #1579.
|
2013-07-18 14:52:01 +08:00 |
|
|
wyd621
|
87b50d246e
|
Merge branch 'master' of git@github.com:easysoft/zentaopms
|
2013-07-18 14:19:21 +08:00 |
|
|
wyd621
|
e521a8fef3
|
* finish task #1579.
|
2013-07-18 14:17:45 +08:00 |
|
|
wyd621
|
012b5381ba
|
* finish task #1578.
|
2013-07-18 14:17:06 +08:00 |
|
|
wyd621
|
337eadde8e
|
* adjust code.
|
2013-07-18 14:16:37 +08:00 |
|
|
wyd621
|
4038b40e74
|
* finish task #1576.
|
2013-07-18 08:30:14 +08:00 |
|
|
wyd621
|
c920eeb60f
|
* finish task #1575.
|
2013-07-17 11:05:28 +08:00 |
|
|
wyd621
|
d31842a4c8
|
* revert right config.
|
2013-07-17 10:16:04 +08:00 |
|
|
wyd621
|
ec50ddf69d
|
* commit for different.
|
2013-07-17 10:05:00 +08:00 |
|
|
wyd621
|
1aa58c8895
|
Merge branch 'master' of git@github.com:easysoft/zentaopms
|
2013-07-17 10:04:22 +08:00 |
|
|
wyd621
|
890ca7d02f
|
* adjust for pager from api.
|
2013-07-17 09:44:56 +08:00 |
|
|
wyd621
|
09a9872a14
|
* finish task #1573.
|
2013-07-17 09:41:40 +08:00 |
|
|
wyd621
|
648c28140d
|
* finish task #1568.
|
2013-07-17 09:40:41 +08:00 |
|
|
wyd621
|
1be844dbea
|
* finish task #1569.
|
2013-07-17 09:39:29 +08:00 |
|