 daitingting
|
6d2d35bff0
|
* Adjust status when the old status is done.
|
2018-07-09 09:56:07 +08:00 |
|
|
daitingting
|
29371f8b70
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2018-07-05 17:55:49 +08:00 |
|
|
daitingting
|
0817ec73cc
|
* Optimize text.
|
2018-07-05 17:55:30 +08:00 |
|
|
daitingting
|
0ff9dc27d4
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2018-07-05 16:23:35 +08:00 |
|
|
daitingting
|
3bd73f1111
|
* Adjust codes.
|
2018-07-05 16:23:20 +08:00 |
|
|
daitingting
|
e612d79e04
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2018-07-05 15:39:08 +08:00 |
|
|
daitingting
|
5d4b235a62
|
* Compute begin and end for parent task by his children, finish task #4627.
|
2018-07-05 15:37:42 +08:00 |
|
|
daitingting
|
812c4e98fb
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2018-07-05 13:36:23 +08:00 |
|
|
daitingting
|
6e71477c5c
|
* Unset todos those finished by me.
|
2018-07-05 13:35:09 +08:00 |
|
|
daitingting
|
a886e98b26
|
* Set word wrap.
|
2018-07-04 17:23:19 +08:00 |
|
|
daitingting
|
5a79ac1a3d
|
* Get group pairs order by id.
|
2018-07-04 17:15:27 +08:00 |
|
|
daitingting
|
4a85831bea
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2018-07-04 15:21:08 +08:00 |
|
|
daitingting
|
ddea3afd97
|
* Set build field word-wrap.
|
2018-07-04 15:20:06 +08:00 |
|
|
daitingting
|
ce9cf8a0c7
|
* Add 10.0 upgrade sql.
|
2018-07-04 13:28:04 +08:00 |
|
|
daitingting
|
9889775cc7
|
* Set assignedTo as closed when close todo.
|
2018-07-04 13:24:09 +08:00 |
|
|
daitingting
|
a596142ec5
|
* Remove useless file.
|
2018-07-04 11:08:11 +08:00 |
|
|
daitingting
|
8a63d0de58
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2018-07-04 11:05:33 +08:00 |
|
|
daitingting
|
31a7f1f9a2
|
* Adjust size for ranzhi logo.
|
2018-07-04 11:05:01 +08:00 |
|
|
daitingting
|
cb65bcbc12
|
* Set nowrap for modal header.
|
2018-07-04 09:22:34 +08:00 |
|
|
daitingting
|
bf4ccf3bbf
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2018-07-03 16:27:07 +08:00 |
|
|
daitingting
|
537699060f
|
* Adjust codes.
|
2018-07-03 16:26:44 +08:00 |
|
|
daitingting
|
7712dd4eab
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2018-07-03 14:16:41 +08:00 |
|
|
daitingting
|
ac36781aa5
|
* Set the name nowrap.
|
2018-07-03 14:13:40 +08:00 |
|
|
daitingting
|
634d483f97
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2018-07-03 13:48:27 +08:00 |
|
|
daitingting
|
7c3c36c0d7
|
* Adjust computeHours4Multiple function to fix bug #1921.
|
2018-07-03 13:47:04 +08:00 |
|
|
daitingting
|
3c59b7eb6f
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2018-07-03 10:38:52 +08:00 |
|
|
daitingting
|
1dfefe355b
|
* Only compute the hours of parent task.
* Do not compute the hours of canceled tasks.
|
2018-07-03 10:35:33 +08:00 |
|
|
daitingting
|
c7164b95b0
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2018-07-03 09:41:46 +08:00 |
|
|
daitingting
|
fd2754f293
|
* Remove fixedTableHead for these reports.
|
2018-07-03 09:41:10 +08:00 |
|
|
daitingting
|
c136414e39
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2018-07-02 16:23:18 +08:00 |
|
|
daitingting
|
2efaf689f5
|
* Hidden product or project by different flow.
|
2018-07-02 16:22:25 +08:00 |
|
|
daitingting
|
f0adb5ad13
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2018-07-02 15:14:14 +08:00 |
|
|
daitingting
|
bd4603ee73
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2018-07-02 15:05:12 +08:00 |
|
|
daitingting
|
2b4a58c118
|
* Adjust width for product name.
|
2018-07-02 15:04:53 +08:00 |
|
|
daitingting
|
c9f0751c8a
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2018-07-02 14:46:13 +08:00 |
|
|
daitingting
|
20943b8585
|
* Adjust params for showLink.
|
2018-07-02 14:37:22 +08:00 |
|
|
daitingting
|
60551c3540
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2018-07-02 14:13:47 +08:00 |
|
|
daitingting
|
7c33439d00
|
* Adjust plan link.
|
2018-07-02 14:13:27 +08:00 |
|
|
daitingting
|
ea34c73c9b
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2018-07-02 13:43:20 +08:00 |
|
|
daitingting
|
6892137d99
|
* Display menu that can link by bug.
|
2018-07-02 13:42:13 +08:00 |
|
|
daitingting
|
a4ab3d9a51
|
* Set forceSync as true.
|
2018-06-28 17:56:56 +08:00 |
|
|
daitingting
|
df5f5ddfa3
|
* Remove useless file.
|
2018-06-28 16:54:38 +08:00 |
|
|
daitingting
|
c58e5c134a
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2018-06-28 16:27:28 +08:00 |
|
|
daitingting
|
eced83d13a
|
* Adjust $config => $this->config.
|
2018-06-28 16:25:48 +08:00 |
|
|
daitingting
|
e8120ff55c
|
* LoadCustomFromDB when version > 4.3.beta/pro.2.3.beta/biz.
|
2018-06-26 17:42:43 +08:00 |
|
|
daitingting
|
05156a4e1d
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2018-06-26 15:46:31 +08:00 |
|
|
daitingting
|
44e40eda66
|
* Adjust version.
|
2018-06-26 15:46:13 +08:00 |
|
|
daitingting
|
de0f38f3f5
|
* Adjust codes.
|
2018-06-26 15:17:50 +08:00 |
|
|
daitingting
|
e70b502673
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2018-06-26 15:09:37 +08:00 |
|
|
daitingting
|
2046bb4fd9
|
* Locate to index page when there is no projects.
|
2018-06-26 15:08:53 +08:00 |
|
|
daitingting
|
acab920f41
|
* Add all params for dept managers.
|
2018-06-25 10:27:43 +08:00 |
|
|
daitingting
|
ee3c030f80
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2018-06-25 09:58:21 +08:00 |
|
|
daitingting
|
1b669c7d7e
|
* If feedbackView is true, hide side-col.
|
2018-06-25 09:57:25 +08:00 |
|
|
daitingting
|
e0986c8883
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2018-06-21 15:15:26 +08:00 |
|
|
daitingting
|
dc7073ac3a
|
* Adjust form to left.
|
2018-06-21 15:15:09 +08:00 |
|
|
daitingting
|
62862bc6cf
|
* Adjust form to left.
|
2018-06-21 15:01:31 +08:00 |
|
|
daitingting
|
0d6a3975e5
|
* Adjust form to left.
|
2018-06-21 14:52:02 +08:00 |
|
|
daitingting
|
78e898258a
|
* Format codes.
|
2018-06-21 14:37:28 +08:00 |
|
|
daitingting
|
2341927a79
|
* Adjust conflict.
|
2018-06-20 14:49:26 +08:00 |
|
|
daitingting
|
2594c5691c
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
Conflicts:
module/bug/model.php
module/product/model.php
module/testcase/model.php
module/testsuite/model.php
module/testtask/model.php
|
2018-06-20 14:26:46 +08:00 |
|
|
daitingting
|
e0fed55401
|
* Adjust modulePageNav for mobile page.
|
2018-06-20 14:24:22 +08:00 |
|
|
daitingting
|
97d82a4d76
|
* Adjust version.
|
2018-06-01 15:11:42 +08:00 |
|
|
daitingting
|
1bec81e2c3
|
* Add 10.0.beta sql.
|
2018-06-01 15:09:24 +08:00 |
|
|
daitingting
|
884eda8221
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2018-06-01 15:04:30 +08:00 |
|
|
daitingting
|
f0c0b51f4c
|
* Adjust version.
* Add tw lang.
|
2018-06-01 15:04:06 +08:00 |
|
|
daitingting
|
af1b568009
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2018-06-01 13:30:00 +08:00 |
|
|
daitingting
|
c284d78905
|
* Set nowrap for them.
|
2018-06-01 13:29:29 +08:00 |
|
|
daitingting
|
d581f97ec4
|
* Set nowrap for objectName.
|
2018-06-01 10:42:47 +08:00 |
|
|
daitingting
|
c327146ab1
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2018-06-01 09:17:48 +08:00 |
|
|
daitingting
|
6abc28119a
|
* Adjust codes.
|
2018-05-31 17:43:48 +08:00 |
|
|
daitingting
|
4643931d3c
|
* Adjust codes.
|
2018-05-31 16:22:40 +08:00 |
|
|
daitingting
|
485ad8d170
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2018-05-31 16:21:47 +08:00 |
|
|
daitingting
|
568402d9bc
|
* Do not display divider if the menu is the last.
|
2018-05-31 16:21:01 +08:00 |
|
|
daitingting
|
7777c806fd
|
* Add link for company name.
|
2018-05-31 14:59:54 +08:00 |
|
|
daitingting
|
8d2814b017
|
* Remove viewLink for webhook.
|
2018-05-31 14:35:17 +08:00 |
|
|
daitingting
|
deff59e707
|
* Adjust codes.
|
2018-05-31 14:34:33 +08:00 |
|
|
daitingting
|
a10b598a2a
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2018-05-31 14:27:50 +08:00 |
|
|
daitingting
|
2b984e6630
|
* Adjust acls of user.
|
2018-05-31 14:27:24 +08:00 |
|
|
daitingting
|
6ec03cae6f
|
* Adjust align for some fields.
|
2018-05-31 13:34:52 +08:00 |
|
|
daitingting
|
8ca09a065c
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2018-05-31 13:10:07 +08:00 |
|
|
daitingting
|
b1de85895c
|
* Adjust codes.
|
2018-05-31 13:09:40 +08:00 |
|
|
daitingting
|
31f9ee5201
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2018-05-31 10:47:33 +08:00 |
|
|
daitingting
|
560a272c4d
|
* Display actions button when report is not deleted.
|
2018-05-31 10:47:00 +08:00 |
|
|
daitingting
|
99bb895557
|
* Adjust codes.
|
2018-05-31 09:47:15 +08:00 |
|
|
daitingting
|
2aeb32ea39
|
* Adjust codes.
|
2018-05-30 17:17:21 +08:00 |
|
|
daitingting
|
e9f1f3b184
|
* Fix bug #1819.
|
2018-05-30 17:08:14 +08:00 |
|
|
daitingting
|
800ae9129d
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2018-05-29 16:38:06 +08:00 |
|
|
daitingting
|
e699db14d4
|
* Adjust codes.
|
2018-05-29 16:35:43 +08:00 |
|
|
daitingting
|
d6d30af418
|
* Adjust direction for chosen.
|
2018-05-29 09:47:34 +08:00 |
|
|
daitingting
|
c16e2c2bd2
|
* Check is the super admin or not by admins of company when user's admin field is empty.
|
2018-05-29 09:21:51 +08:00 |
|
|
daitingting
|
47d3681b4d
|
* Display the actions directly.
|
2018-05-28 16:34:29 +08:00 |
|
|
daitingting
|
8d3458ce62
|
* Adjust height for modal.
|
2018-05-28 16:08:22 +08:00 |
|
|
daitingting
|
1649d8cfc6
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2018-05-28 15:59:09 +08:00 |
|
|
daitingting
|
0864c1093e
|
* Adjust style when mode is create.
|
2018-05-28 15:58:39 +08:00 |
|
|
daitingting
|
d84374c618
|
* Adjust space between btn.
|
2018-05-28 14:38:47 +08:00 |
|
|
daitingting
|
6aab48e304
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2018-05-28 14:21:11 +08:00 |
|
|
daitingting
|
e03ecf66f7
|
* Adjust major action.
|
2018-05-28 14:20:52 +08:00 |
|
|
daitingting
|
cfe4c79a95
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2018-05-28 13:21:34 +08:00 |
|
|
daitingting
|
a9e3f1dfae
|
* Adjust logo image.
|
2018-05-28 13:21:14 +08:00 |
|
|
daitingting
|
a1c30c420d
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2018-05-28 10:16:20 +08:00 |
|