fernando/luos
1
0
Fork 0
Code Releases Activity

Merged in release/3.2 (pull request #5647)

Browse Source 
Updating branch release/3.2.1 (6º merge)

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
This commit is contained in:
Julio Cesar Laura Avendaño
2017-05-02 13:20:41 +00:00
parent 3bf28da76d 0242efa6b0
commit 8bb0ba0884
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
workflow/engine/src/ProcessMaker/Services/Api/Project/OutputDocuments.php
View File

@@ -78,10 +78,10 @@ class OutputDocuments extends Api
*
* @param string $prjUid {@min 32} {@max 32}
* @param string $outputDocumentUid {@min 32} {@max 32}
* @param OutputDocumentStructure $request_data
* @param array $request_data
*
*/
public function doPutProjectOutputDocument($prjUid, $outputDocumentUid, OutputDocumentStructure $request_data)
public function doPutProjectOutputDocument($prjUid, $outputDocumentUid, $request_data)
{
try {
$request_data = (array)($request_data);

4
workflow/engine/templates/services/login_getStarted.html
View File

@@ -44,6 +44,7 @@
span.cMargLeft { padding-left: 20; }
.cell2 {
vertical-align: middle;
font-size: 13px;
background: #fff;
border-right: #fff 1px solid;
@@ -95,8 +96,7 @@
</td>
<td class="cell2" valign="top" align="left">
<p><b><span class="cLow">Welcome to ProcessMaker</span></b></p><br/>
<p style="text-align: justify;"><span class="cLow-min">This new version features a new process designer based upon the Business Process Management Notation 2 standard. It offers a new form designer with flexible layouts for desktops, tablets and cellphones and a new REST API to remotely access ProcessMaker.</span></p>
<p style="text-align: justify;"><span class="cLow-min">To get started, log in using the following credentials. You can change them later:</span></p>
<p style="text-align: justify;"><span class="cLow-min">To get started log in using the following credentials:</span></p>
<span class="cNeg">Username:</span><span class="cLow"> {name}</span><br>
<span class="cNeg">Password:</span><span class="cLow"> {pass}</span><br><br>
<p style="text-align: justify;"><span class="cLow-min">We suggest you follow our 7 easy videos to automate your workflow. You can see a demo of each step at <a target="_blank" href="http://www.processmaker.com/tutorials">http://www.processmaker.com/tutorials/</a></span></p>