 daitingting
|
c4a752478c
|
* Use ajaxFrom submit it.
|
2018-07-24 15:39:37 +08:00 |
|
|
daitingting
|
afd1728913
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2018-07-24 15:34:43 +08:00 |
|
|
daitingting
|
362c20a22f
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2018-07-24 14:49:28 +08:00 |
|
|
daitingting
|
6840ad7613
|
* Adjust codes.
|
2018-07-24 14:48:39 +08:00 |
|
|
daitingting
|
a56ab4ec35
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2018-07-19 15:30:28 +08:00 |
|
|
daitingting
|
323e4f80ad
|
* Add space.
|
2018-07-19 15:29:34 +08:00 |
|
|
daitingting
|
95cfa5c880
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2018-07-18 17:13:59 +08:00 |
|
|
daitingting
|
db8632234f
|
* Use html for link in mail, fix bug #1235.
|
2018-07-18 17:12:43 +08:00 |
|
|
daitingting
|
3caa486af2
|
* Add required mark when module is setted required.
|
2018-07-13 15:05:05 +08:00 |
|
|
daitingting
|
0b35405187
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2018-07-13 14:06:26 +08:00 |
|
|
daitingting
|
cb6495a63a
|
* When creating a project with plan, multi-platform product need to display option of all platform if there is no platform.
|
2018-07-13 14:01:42 +08:00 |
|
|
daitingting
|
6f3ae89b82
|
* Add empty file for updated users.
|
2018-07-13 11:23:14 +08:00 |
|
|
daitingting
|
d7a106f0bd
|
* Disabled autoComplate function.
|
2018-07-13 11:18:33 +08:00 |
|
|
daitingting
|
526f392155
|
* Compute hours for grouptasks like as browse page.
|
2018-07-13 10:22:57 +08:00 |
|
|
daitingting
|
157aac7269
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2018-07-13 10:22:12 +08:00 |
|
|
daitingting
|
f663c7e309
|
* Compute the estimated and consumed hours of all status tasks.
* Compute the left hours without canceled tasks.
|
2018-07-13 10:18:05 +08:00 |
|
|
daitingting
|
d9b17a23f4
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2018-07-12 14:38:51 +08:00 |
|
|
daitingting
|
73c335b3de
|
* Adjust style.
|
2018-07-12 14:38:36 +08:00 |
|
|
daitingting
|
bafb11cc5c
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2018-07-12 14:15:28 +08:00 |
|
|
daitingting
|
2e39603dae
|
* Adjust codes.
|
2018-07-12 14:15:04 +08:00 |
|
|
daitingting
|
51ce3062dd
|
* Delete done status of project.
* Update data.
|
2018-07-12 10:57:06 +08:00 |
|
|
daitingting
|
4e26d81591
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2018-07-12 10:43:48 +08:00 |
|
|
daitingting
|
b9e042dc56
|
* Adjust computeHours4Multiple function.
|
2018-07-12 10:43:17 +08:00 |
|
|
daitingting
|
a8f1f63101
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2018-07-10 17:30:07 +08:00 |
|
|
daitingting
|
5b09738c95
|
* Adjust ajaxmenu style for hidden dropdown menu.
|
2018-07-10 17:29:19 +08:00 |
|
|
daitingting
|
06a1e11532
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2018-07-10 15:43:38 +08:00 |
|
|
daitingting
|
f0958e21e2
|
* Use can not edit and delete file if he has no rights with file's object, fix bug #1521.
|
2018-07-10 15:41:56 +08:00 |
|
|
daitingting
|
d048bfbedc
|
* Add treeTask and treeStory in group.
|
2018-07-10 15:04:00 +08:00 |
|
|
daitingting
|
cac62ee5cc
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2018-07-10 15:00:46 +08:00 |
|
|
daitingting
|
9387fd1a91
|
* Adjust codes.
|
2018-07-10 15:00:23 +08:00 |
|
|
daitingting
|
c4d6d94d61
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2018-07-10 11:24:40 +08:00 |
|
|
daitingting
|
4398a6f814
|
* Add link for platform products.
|
2018-07-10 11:18:33 +08:00 |
|
|
daitingting
|
5c294a5d0b
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2018-07-10 10:08:08 +08:00 |
|
|
daitingting
|
231e3ab334
|
* Hidden project when flow is onlyTest.
|
2018-07-10 10:07:37 +08:00 |
|
|
daitingting
|
9a3ce4325f
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2018-07-09 17:32:28 +08:00 |
|
|
daitingting
|
de5866a8cd
|
* Adjust codes.
|
2018-07-09 17:32:15 +08:00 |
|
|
daitingting
|
45b449e475
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2018-07-09 16:54:43 +08:00 |
|
|
daitingting
|
bb0fada456
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2018-07-09 16:51:20 +08:00 |
|
|
daitingting
|
c40bfab493
|
* If the member is not the last, can not finish task, fix bug #1939.
|
2018-07-09 16:48:29 +08:00 |
|
|
daitingting
|
5df4cbd69f
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2018-07-09 16:02:40 +08:00 |
|
|
daitingting
|
a03c5b953e
|
* Finish task #4621.
|
2018-07-09 16:01:07 +08:00 |
|
|
daitingting
|
765942f3c4
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2018-07-09 14:57:15 +08:00 |
|
|
daitingting
|
e9edde159c
|
* Fix bug for finish multiple task, fix bug #1872.
|
2018-07-09 14:56:28 +08:00 |
|
|
daitingting
|
f0e022127d
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2018-07-09 09:56:55 +08:00 |
|
|
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 |
|